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

Commit b9f2ba2d authored by Alex Spradlin's avatar Alex Spradlin Committed by Automerger Merge Worker
Browse files

Unstick AM am: ed6bccd8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13676294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie70ddb083af27ba195a2309d0fe41b050500c562
parents de616ef9 ed6bccd8

media/libmedia/IMediaPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ status_t BnMediaPlayer::onTransact( 
        }

        case SET_DATA_SOURCE_RTP: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            const String8& rtpParams = data.readString8();

            String8 rtpParams = data.readString8();

            reply->writeInt32(setDataSource(rtpParams));

            return NO_ERROR;

        }

media/libmedia/include/media/mediaplayer.h

+4 −1
Original line number Diff line number Diff line
@@ -180,7 +180,10 @@ enum media_parameter_keys { 
    KEY_PARAMETER_PLAYBACK_RATE_PERMILLE = 1300,                // set only



    // Set a Parcel containing the value of a parcelled Java AudioAttribute instance

    KEY_PARAMETER_AUDIO_ATTRIBUTES = 1400                       // set only

    KEY_PARAMETER_AUDIO_ATTRIBUTES = 1400,                       // set only



    // Set a Parcel containing the values of RTP attribute

    KEY_PARAMETER_RTP_ATTRIBUTES = 2000                       // set only

};



// Keep INVOKE_ID_* in sync with MediaPlayer.java.

media/libmedia/include/media/mediarecorder.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ private: 
    Mutex                       mLock;

    Mutex                       mNotifyLock;



    int                         mOutputFormat;

    output_format               mOutputFormat;

};



};  // namespace android

media/libmedia/mediarecorder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ status_t MediaRecorder::setOutputFormat(int of) 
        mCurrentState = MEDIA_RECORDER_ERROR;

        return ret;

    }

    mOutputFormat = of;

    mOutputFormat = (output_format)of;

    mCurrentState = MEDIA_RECORDER_DATASOURCE_CONFIGURED;

    return ret;

}
@@ -745,7 +745,7 @@ void MediaRecorder::doCleanUp() 
    mIsAudioEncoderSet = false;

    mIsVideoEncoderSet = false;

    mIsOutputFileSet   = false;

    mOutputFormat      = 0;

    mOutputFormat      = OUTPUT_FORMAT_DEFAULT;

}



// Release should be OK in any state

media/libmediaplayerservice/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ cc_library { 
        "android.hardware.media.c2@1.0",

        "android.hardware.media.omx@1.0",

        "libbase",

        "libandroid_net",

        "libaudioclient",

        "libbinder",

        "libcamera_client",