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

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

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

Change-Id: Iff98b36ba18063e37490e6e0b4b25040a3ccb119
parents 3d7b4133 26d99dfb

apex/manifest.json

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

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

  "version": 300802800

  "version": 300802900

}

apex/manifest_codec.json

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

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

  "version": 300802800

  "version": 300802900

}

media/codec2/components/aac/C2SoftAacDec.cpp

+0 −1
Original line number Diff line number Diff line
@@ -791,7 +791,6 @@ void C2SoftAacDec::process( 


                // After an error, replace bufferSize with the sum of the

                // decodedSizes to resynchronize the in/out lists.

                inInfo.decodedSizes.pop_back();

                inInfo.bufferSize = std::accumulate(

                        inInfo.decodedSizes.begin(), inInfo.decodedSizes.end(), 0);

media/libaaudio/src/core/AudioStream.cpp

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ aaudio_result_t AudioStream::systemStart() { 
        case AAUDIO_STREAM_STATE_PAUSED:

        case AAUDIO_STREAM_STATE_STOPPING:

        case AAUDIO_STREAM_STATE_STOPPED:

        case AAUDIO_STREAM_STATE_FLUSHING:

        case AAUDIO_STREAM_STATE_FLUSHED:

            break; // Proceed with starting.

media/libaaudio/src/legacy/AudioStreamRecord.cpp

+6 −2
Original line number Diff line number Diff line
@@ -345,13 +345,17 @@ aaudio_result_t AudioStreamRecord::requestStart() 
    // Enable callback before starting AudioRecord to avoid shutting

    // down because of a race condition.

    mCallbackEnabled.store(true);

    aaudio_stream_state_t originalState = getState();

    // Set before starting the callback so that we are in the correct state

    // before updateStateMachine() can be called by the callback.

    setState(AAUDIO_STREAM_STATE_STARTING);

    mFramesWritten.reset32(); // service writes frames

    mTimestampPosition.reset32();

    status_t err = mAudioRecord->start(); // resets position to zero

    if (err != OK) {

        mCallbackEnabled.store(false);

        setState(originalState);

        return AAudioConvert_androidToAAudioResult(err);

    } else {

        setState(AAUDIO_STREAM_STATE_STARTING);

    }

    return AAUDIO_OK;

}