| commit | aa31516ef825095c4af7b27b2e4b6affb4392924 | [log] [tgz] |
|---|---|---|
| author | Andrew Lewis <andrewlewis@google.com> | Thu May 30 15:53:06 2024 +0000 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Jul 01 15:24:27 2024 +0000 |
| tree | 967fbf3ea727057bbab87e22bc2ed1f45f3b0cdc | |
| parent | 1a241bc57dd5e67411d727f3f1aea2194256016d [diff] |
Revert^2 "StagefrightRecoder: Disabling B-frame support" This reverts commit fea6b6fbf57769691d4c6f4333194b2c1602cc91. Reason for revert: To start another ABTD run to find out if the build failure is reproducible. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:61ed373ba34ddad4f7bbb3469981ca0a59ed78a8) Merged-In: I6b722876328a71aa5b3c49b53e487a3af966f998 Change-Id: I6b722876328a71aa5b3c49b53e487a3af966f998 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 3ab32f0..f0e1b9e 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -2119,6 +2119,11 @@ if (tsLayers > 1) { uint32_t bLayers = std::min(2u, tsLayers - 1); // use up-to 2 B-layers + // TODO(b/341121900): Remove this once B frames are handled correctly in screen recorder + // use case in case of mic only + if (mAudioSource == AUDIO_SOURCE_MIC && mVideoSource == VIDEO_SOURCE_SURFACE) { + bLayers = 0; + } uint32_t pLayers = tsLayers - bLayers; format->setString( "ts-schema", AStringPrintf("android.generic.%u+%u", pLayers, bLayers));