commit bb6d61d78d2a488dd36de7c8cd0c7038732ddd1f
author Wonsik Kim <wonsik@google.com> Sat Feb 16 00:56:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 16 00:56:44 2019 +0000
tree 33f6bcfea834dca75e7d4b1bb2d934314d5a3da6
parent 4c2ca73b9c97adef6fb31a9a02ae686c1a8a0513
parent c548458d0e2a0a0ef32d0498397498a4b210d363

Merge "ACodec: don't enable B frames for AVC by default"

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 52cb5fa..9c46659 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -4431,9 +4431,9 @@
         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;
+        // disable B-frames until we have explicit settings for enabling the feature.
+        h264type.nRefFrames = 1;
+        h264type.nBFrames = 0;
 
         h264type.nPFrames = setPFramesSpacing(iFrameInterval, frameRate, h264type.nBFrames);
         h264type.nAllowedPictureTypes =