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

Commit a3cd8681 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "mp2_fix32" 

* changes:
  Revert "Revert "Fix MediaPlayer2Test on 32bit mode""
  Remove libbinder dependency from libmedia2_jni.
parents 00174ae6 f707b406

apex/Android.bp

+25 −15
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ apex { 
    name: "com.android.media",

    manifest: "manifest.json",

    java_libs: ["updatable-media"],

    compile_multilib: "both",

    multilib: {

        first: {

            // Extractor process runs only with the primary ABI.

            native_shared_libs: [

                // Extractor plugins

                "libaacextractor",
@@ -28,9 +32,15 @@ apex { 
                "libmpeg2extractor",

                "liboggextractor",

                "libwavextractor",

            ],

        },

        both: {

            native_shared_libs: [

                // MediaPlayer2

                "libmedia2_jni",

            ],

        },

    },

    key: "com.android.media.key",

}

media/libmedia/BufferingSettings.cpp

+0 −20
Original line number Diff line number Diff line
@@ -27,26 +27,6 @@ BufferingSettings::BufferingSettings() 
        : mInitialMarkMs(kNoMark),

          mResumePlaybackMarkMs(kNoMark) { }



status_t BufferingSettings::readFromParcel(const Parcel* parcel) {

    if (parcel == nullptr) {

        return BAD_VALUE;

    }

    mInitialMarkMs = parcel->readInt32();

    mResumePlaybackMarkMs = parcel->readInt32();



    return OK;

}



status_t BufferingSettings::writeToParcel(Parcel* parcel) const {

    if (parcel == nullptr) {

        return BAD_VALUE;

    }

    parcel->writeInt32(mInitialMarkMs);

    parcel->writeInt32(mResumePlaybackMarkMs);



    return OK;

}



String8 BufferingSettings::toString() const {

    String8 s;

    s.appendFormat(

media/libmedia/IMediaPlayer.cpp

+8 −4
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ public: 
    {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());

        buffering.writeToParcel(&data);

        data.writeInt32(buffering.mInitialMarkMs);

        data.writeInt32(buffering.mResumePlaybackMarkMs);

        remote()->transact(SET_BUFFERING_SETTINGS, data, &reply);

        return reply.readInt32();

    }
@@ -194,7 +195,8 @@ public: 
        remote()->transact(GET_BUFFERING_SETTINGS, data, &reply);

        status_t err = reply.readInt32();

        if (err == OK) {

            err = buffering->readFromParcel(&reply);

            buffering->mInitialMarkMs = reply.readInt32();

            buffering->mResumePlaybackMarkMs = reply.readInt32();

        }

        return err;

    }
@@ -696,7 +698,8 @@ status_t BnMediaPlayer::onTransact( 
        case SET_BUFFERING_SETTINGS: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            BufferingSettings buffering;

            buffering.readFromParcel(&data);

            buffering.mInitialMarkMs = data.readInt32();

            buffering.mResumePlaybackMarkMs = data.readInt32();

            reply->writeInt32(setBufferingSettings(buffering));

            return NO_ERROR;

        } break;
@@ -706,7 +709,8 @@ status_t BnMediaPlayer::onTransact( 
            status_t err = getBufferingSettings(&buffering);

            reply->writeInt32(err);

            if (err == OK) {

                buffering.writeToParcel(reply);

                reply->writeInt32(buffering.mInitialMarkMs);

                reply->writeInt32(buffering.mResumePlaybackMarkMs);

            }

            return NO_ERROR;

        } break;

media/libmedia/include/media/BufferingSettings.h

+2 −5
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
#ifndef ANDROID_BUFFERING_SETTINGS_H

#define ANDROID_BUFFERING_SETTINGS_H



#include <binder/Parcelable.h>

#include <utils/String8.h>



namespace android {



struct BufferingSettings : public Parcelable {

struct BufferingSettings {

    static const int kNoMark = -1;



    int mInitialMarkMs;
@@ -32,9 +32,6 @@ struct BufferingSettings : public Parcelable { 


    BufferingSettings();



    status_t writeToParcel(Parcel* parcel) const override;

    status_t readFromParcel(const Parcel* parcel) override;



    String8 toString() const;

};

media/libmediaplayer2/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ cc_library_static { 
        "libgui",

        "liblog",

        "libmedia_omx",

        "libstagefright_foundation",

        "libui",

        "libutils",
@@ -55,6 +54,7 @@ cc_library_static { 
        "libmediaplayer2-protos",

        "libmedia_player2_util",

        "libprotobuf-cpp-lite",

        "libstagefright_foundation_without_imemory",

        "libstagefright_nuplayer2",

        "libstagefright_player2",

        "libstagefright_rtsp",