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

Commit 8886f787 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to r_aml_300802400 for mainline module file: apex/manifest_codec.json 

Change-Id: Ic42646a1a3e4e01c452968ad2bb4ea938ff2d7c7
parents 5450e727 ef9afe81

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line 
[Hook Scripts]

mainline_hook = tools/mainline_hook.sh ${PREUPLOAD_COMMIT} "."
 
mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO_ROOT} ${PREUPLOAD_FILES}

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 300802300

  "version": 300802400

}

apex/manifest_codec.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media.swcodec",

  "version": 300802300

  "version": 300802400

}

media/libstagefright/data/media_codecs_sw.xml

+4 −4
Original line number Diff line number Diff line
@@ -295,12 +295,12 @@ 
            <Feature name="bitrate-modes" value="VBR,CBR" />

        </MediaCodec>

        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" variant="!slow-cpu">

            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->

            <Limit name="size" min="2x2" max="512x512" />

            <!-- profiles and levels:  ProfileMain : MainTierLevel3 -->

            <Limit name="size" min="2x2" max="960x544" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="8x8" />

            <Limit name="block-count" range="1-4096" /> <!-- max 512x512 -->

            <Limit name="blocks-per-second" range="1-122880" />

            <Limit name="block-count" range="1-8160" /> <!-- max 960x544 -->

            <Limit name="blocks-per-second" range="1-244880" />

            <Limit name="frame-rate" range="1-120" />

            <Limit name="bitrate" range="1-10000000" />

            <Limit name="complexity" range="0-10"  default="0" />

services/audioflinger/Tracks.cpp

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ status_t AudioFlinger::PlaybackThread::Track::getNextBuffer(AudioBufferProvider: 
    status_t status = mServerProxy->obtainBuffer(&buf);

    buffer->frameCount = buf.mFrameCount;

    buffer->raw = buf.mRaw;

    if (buf.mFrameCount == 0 && !isStopping() && !isStopped() && !isPaused()) {

    if (buf.mFrameCount == 0 && !isStopping() && !isStopped() && !isPaused() && !isOffloaded()) {

        ALOGV("%s(%d): underrun,  framesReady(%zu) < framesDesired(%zd), state: %d",

                __func__, mId, buf.mFrameCount, desiredFrames, mState);

        mAudioTrackServerProxy->tallyUnderrunFrames(desiredFrames);