francesco/fml13v01-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v4l2test: Do not show the remains frame from last DRM display process

Browse Source 
Signed-off-by: Kevin.xie <kevin.xie@starfivetech.com>
This commit is contained in:
Kevin.xie
2022-07-25 14:13:56 +08:00
parent 520be2db62
commit 29d0679078
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/starfive/v4l2_test/stf_drm.c
-11
View File
@@ -384,17 +384,6 @@ LOG(STF_LEVEL_INFO, "width=%d,height=%d,pitch=%d,bo_handle=%d,fb_id=%d\n",
dev->saved_crtc = drmModeGetCrtc(fd, dev->crtc_id); /* must store crtc data */ dev->saved_crtc = drmModeGetCrtc(fd, dev->crtc_id); /* must store crtc data */
/* First buffer to DRM */
if (drmModeSetCrtc(fd, dev->crtc_id, dev->bufs[0].fb_id, 0, 0,
&dev->conn_id, 1, &dev->mode)) {
fatal("drmModeSetCrtc() failed");
}
/* First flip */
drmModePageFlip(fd, dev->crtc_id,
dev->bufs[0].fb_id, DRM_MODE_PAGE_FLIP_EVENT,
dev);
LOG(STF_LEVEL_TRACE, "Exit\n"); LOG(STF_LEVEL_TRACE, "Exit\n");
} }
package/starfive/v4l2_test/v4l2_test.c
+34 -1
View File
@@ -419,6 +419,7 @@ static int frameRead(void)
switch (pv4l2_param->io_mthd) { switch (pv4l2_param->io_mthd) {
case IO_METHOD_READ: case IO_METHOD_READ:
{
if (-1 == v4l2_read(pv4l2_param->fd, pv4l2_param->pBuffers[0].start, if (-1 == v4l2_read(pv4l2_param->fd, pv4l2_param->pBuffers[0].start,
pv4l2_param->pBuffers[0].length)) { pv4l2_param->pBuffers[0].length)) {
switch (errno) { switch (errno) {
@@ -438,7 +439,7 @@ static int frameRead(void)
timestamp.tv_usec = ts.tv_nsec/1000; timestamp.tv_usec = ts.tv_nsec/1000;
imageProcess((uint8_t *)(pv4l2_param->pBuffers[0].start), dst, timestamp); imageProcess((uint8_t *)(pv4l2_param->pBuffers[0].start), dst, timestamp);
break; break;
}
case IO_METHOD_MMAP: case IO_METHOD_MMAP:
{ {
stf_v4l2_dequeue_buffer(pv4l2_param, &buf); stf_v4l2_dequeue_buffer(pv4l2_param, &buf);
@@ -447,16 +448,33 @@ static int frameRead(void)
imageProcess((uint8_t *)(pv4l2_param->pBuffers[buf.index].start), dst, buf.timestamp); imageProcess((uint8_t *)(pv4l2_param->pBuffers[buf.index].start), dst, buf.timestamp);
if (STF_DISP_DRM == gp_cfg_param->disp_type) { if (STF_DISP_DRM == gp_cfg_param->disp_type) {
drm_buf_id = next_index; // Move background buffer to foreground drm_buf_id = next_index; // Move background buffer to foreground
static int first_frame = 1;
if(first_frame) {
drm_dev_t* dev = gp_cfg_param->drm_param.dev_head;
/* First buffer to DRM */
if (drmModeSetCrtc(gp_cfg_param->drm_param.fd,
dev->crtc_id, dev->bufs[drm_buf_id].fb_id,
0, 0, &dev->conn_id, 1, &dev->mode)) {
fatal("drmModeSetCrtc() failed");
}
/* First flip */
drmModePageFlip(gp_cfg_param->drm_param.fd,
dev->crtc_id, dev->bufs[drm_buf_id].fb_id,
DRM_MODE_PAGE_FLIP_EVENT, dev);
first_frame = 0;
}
} }
stf_v4l2_queue_buffer(pv4l2_param, buf.index); stf_v4l2_queue_buffer(pv4l2_param, buf.index);
LOG(STF_LEVEL_LOG, "buf.index: %d, buf.bytesused=%d\n", buf.index, buf.bytesused); LOG(STF_LEVEL_LOG, "buf.index: %d, buf.bytesused=%d\n", buf.index, buf.bytesused);
break; break;
} }
case IO_METHOD_USERPTR: case IO_METHOD_USERPTR:
{
stf_v4l2_dequeue_buffer(pv4l2_param, &buf); stf_v4l2_dequeue_buffer(pv4l2_param, &buf);
imageProcess((uint8_t *)(buf.m.userptr), dst, buf.timestamp); imageProcess((uint8_t *)(buf.m.userptr), dst, buf.timestamp);
stf_v4l2_queue_buffer(pv4l2_param, buf.index); stf_v4l2_queue_buffer(pv4l2_param, buf.index);
break; break;
}
case IO_METHOD_DMABUF: case IO_METHOD_DMABUF:
default: default:
break; break;
@@ -640,6 +658,21 @@ static void mainloop()
if (fds[0].revents & POLLIN) { if (fds[0].revents & POLLIN) {
int dequeued = stf_v4l2_dequeue_buffer(&gp_cfg_param->v4l2_param, &buf); int dequeued = stf_v4l2_dequeue_buffer(&gp_cfg_param->v4l2_param, &buf);
if (dequeued) { if (dequeued) {
static int first_frame = 1;
if(first_frame) {
drm_dev_t* dev = gp_cfg_param->drm_param.dev_head;
/* First buffer to DRM */
if (drmModeSetCrtc(gp_cfg_param->drm_param.fd,
dev->crtc_id, dev->bufs[buf.index].fb_id,
0, 0, &dev->conn_id, 1, &dev->mode)) {
fatal("drmModeSetCrtc() failed");
}
/* First flip */
drmModePageFlip(gp_cfg_param->drm_param.fd,
dev->crtc_id, dev->bufs[buf.index].fb_id,
DRM_MODE_PAGE_FLIP_EVENT, dev);
first_frame = 0;
}
g_drm_buf_next_idx = buf.index; g_drm_buf_next_idx = buf.index;
frameRead(); // TODO: add support for save file later frameRead(); // TODO: add support for save file later
calc_frame_fps(); calc_frame_fps();