Merge "Revert^2 "StagefrightRecoder: Disabling B-frame support"" into main

    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));