Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93743cb5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6740034 from e0327643 to rvc-qpr1-release 

Change-Id: Ib463748037e4c657c54fa30b36d8b413770752ac
parents 00b0d6e3 e0327643

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2774,7 +2774,7 @@ status_t MPEG4Writer::Track::start(MetaData *params) { 
        // even if the file is well-formed and the primary picture is correct.



        // Reserve item ids for samples + grid

        size_t numItemsToReserve = mNumTiles + (mNumTiles > 1);

        size_t numItemsToReserve = mNumTiles + (mNumTiles > 0);

        status_t err = mOwner->reserveItemId_l(numItemsToReserve, &mItemIdBase);

        if (err != OK) {

            return err;

services/audiopolicy/engine/common/src/EngineDefaultConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ const engineConfig::ProductStrategies gOrderedSystemStrategies = { 
    {"rerouting",

     {

         {"", AUDIO_STREAM_REROUTING, "AUDIO_STREAM_REROUTING",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_UNKNOWN, AUDIO_SOURCE_DEFAULT, 0, ""}}

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_VIRTUAL_SOURCE, AUDIO_SOURCE_DEFAULT, 0, ""}}

         }

     },

    },