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

Commit 627104d0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6511878 from e658962c to rvc-release 

Change-Id: Ib242bc7f1b89b2f89ad4017e5c02732606390067
parents 471b82ee e658962c

media/libaudioclient/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ status_t AudioRecord::createRecord_l(const Modulo<uint32_t> &epoch, const String 
            // use case 3: obtain/release mode

            (mTransfer == TRANSFER_OBTAIN);

        if (!useCaseAllowed) {

            ALOGW("%s(%d): AUDIO_INPUT_FLAG_FAST denied, incompatible transfer = %s",

            ALOGD("%s(%d): AUDIO_INPUT_FLAG_FAST denied, incompatible transfer = %s",

                  __func__, mPortId,

                  convertTransferToText(mTransfer));

            mFlags = (audio_input_flags_t) (mFlags & ~(AUDIO_INPUT_FLAG_FAST |

media/libaudioclient/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ status_t AudioTrack::createTrack_l() 
                mAwaitBoost = true;

            }

        } else {

            ALOGW("%s(%d): AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu -> %zu",

            ALOGD("%s(%d): AUDIO_OUTPUT_FLAG_FAST denied by server; frameCount %zu -> %zu",

                  __func__, mPortId, mReqFrameCount, mFrameCount);

        }

    }

media/libmediaplayerservice/StagefrightRecorder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,7 @@ void StagefrightRecorder::setupMPEG4orWEBMMetaData(sp<MetaData> *meta) { 
    }

    if (mOutputFormat == OUTPUT_FORMAT_MPEG_4 || mOutputFormat == OUTPUT_FORMAT_THREE_GPP) {

        (*meta)->setInt32(kKeyEmptyTrackMalFormed, true);

        (*meta)->setInt32(kKey4BitTrackIds, true);

    }

}

media/libstagefright/HevcUtils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ status_t HevcParameterSets::addNalUnit(const uint8_t* data, size_t size) { 
    }



    if (err != OK) {

        ALOGE("error parsing VPS or SPS or PPS");

        return err;

    }

media/libstagefright/MPEG4Writer.cpp

+146 −61

File changed.

Preview size limit exceeded, changes collapsed.