commit 6bc877cbd74a180fd669c26d30c9433acb136f7c
author Qiwei Liu <qiweil@codeaurora.org> Tue Feb 19 11:10:20 2019 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 14 18:17:14 2019 -0800
tree 4d471a37cb36692682119aede56f8047b42eff8d
parent 759c91aeda4f20a11ede00314876d95b733e8005

mm-video-v4l2: venc: disable implicit B-frame when c2d enabled

Native recorder is used in some screenrecord applications,
implicitly enable B-frame may cause MPEG4Writer error due to
timestamp out-of-order in some cases. So disable implicit
B-frame for screenrecord usecase (c2d enabled).

CRs-Fixed: 2400826
Change-Id: I471b6bce367d856421af62a5675675832a83b2c4

mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp

diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
index 139047d..0d2c09a 100755
--- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
@@ -4162,7 +4162,7 @@
     struct v4l2_buffer buf;
     struct v4l2_requestbuffers bufreq;
     struct v4l2_plane plane[VIDEO_MAX_PLANES];
-    int rc = 0, extra_idx;
+    int rc = 0, extra_idx, c2d_enabled = 0;
     bool interlace_flag = false;
     struct OMX_BUFFERHEADERTYPE *bufhdr;
     LEGACY_CAM_METADATA_TYPE * meta_buf = NULL;
@@ -4538,6 +4538,7 @@
                 // color_format == 1 ==> RGBA to YUV Color-converted buffer
                 // Buffers color-converted via C2D have 601-Limited color
                 if (!streaming[OUTPUT_PORT]) {
+                    c2d_enabled = 1;
                     DEBUG_PRINT_HIGH("Setting colorspace 601-L for Color-converted buffer");
                     venc_set_colorspace(MSM_VIDC_BT601_6_625, 0 /*range-limited*/,
                             MSM_VIDC_TRANSFER_601_6_525, MSM_VIDC_MATRIX_601_6_525);
@@ -4559,9 +4560,9 @@
         }
     }
 
-    if (!streaming[OUTPUT_PORT] &&
+    if (!streaming[OUTPUT_PORT] && (c2d_enabled ||
         (m_sVenc_cfg.inputformat != V4L2_PIX_FMT_NV12_TP10_UBWC &&
-         m_sVenc_cfg.inputformat != V4L2_PIX_FMT_NV12_UBWC)) {
+         m_sVenc_cfg.inputformat != V4L2_PIX_FMT_NV12_UBWC))) {
         if (bframe_implicitly_enabled) {
             DEBUG_PRINT_HIGH("Disabling implicitly enabled B-frames");
             intra_period.num_pframes = nPframes_cache;