commit f238bd3c57632b7f4eeb6b1a6a9542058e911a5b
author Lajos Molnar <lajos@google.com> Fri Sep 01 21:11:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 01 21:11:22 2017 +0000
tree 579fe5f4e9b9ca1d359822e033cf9411334ce856
parent b4fea95b996a1ac94fa1b57ee82f66187bc01286
parent 9600c9d070cd6b44462c08e29f29ec0774dc62c7

Merge "stagefright: disable B-frames" into oc-mr1-dev am: fe5f909f2a
am: 9600c9d070

Change-Id: I7891810fff2c53c09592a2c77106dec7ad169337

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 0e60b2e..ec48561 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -4322,9 +4322,14 @@
         h264type.bUseHadamard = OMX_TRUE;
         h264type.nRefFrames = 2;
         h264type.nBFrames = mLatency == 0 ? 1 : std::min(1U, mLatency - 1);
+
+        // disable B-frames until MPEG4Writer can guarantee finalizing files with B-frames
+        h264type.nRefFrames = 1;
+        h264type.nBFrames = 0;
+
         h264type.nPFrames = setPFramesSpacing(iFrameInterval, frameRate, h264type.nBFrames);
         h264type.nAllowedPictureTypes =
-            OMX_VIDEO_PictureTypeI | OMX_VIDEO_PictureTypeP | OMX_VIDEO_PictureTypeB;
+            OMX_VIDEO_PictureTypeI | OMX_VIDEO_PictureTypeP;
         h264type.nRefIdx10ActiveMinus1 = 0;
         h264type.nRefIdx11ActiveMinus1 = 0;
         h264type.bEntropyCodingCABAC = OMX_TRUE;