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

Commit 2c66f89f authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Completely remove Metadata from MediaPlayer2. 

deprecated Metadata class has dependency on libbinder, so this change
removes Metadata usage from MediaPlayer2 completely.

Test: make libmedia2_jni
Bug: 112766913
Change-Id: I32b0ae618c524a32afee07a21e950dbfad3e5750
parent c186a6f9

media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Interface.h

+0 −13
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <media/AudioSystem.h>

#include <media/AudioTimestamp.h>

#include <media/BufferingSettings.h>

#include <media/Metadata.h>

#include <media/stagefright/foundation/AHandler.h>

#include <mediaplayer2/MediaPlayer2Types.h>
@@ -224,18 +223,6 @@ public: 
    // @return OK if the call was successful.

    virtual status_t invoke(const PlayerMessage &request, PlayerMessage *reply) = 0;



    // The Client in the MetadataPlayerService calls this method on

    // the native player to retrieve all or a subset of metadata.

    //

    // @param ids SortedList of metadata ID to be fetch. If empty, all

    //            the known metadata should be returned.

    // @param[inout] records Parcel where the player appends its metadata.

    // @return OK if the call was successful.

    virtual status_t getMetadata(const media::Metadata::Filter& /* ids */,

                                 Parcel* /* records */) {

        return INVALID_OPERATION;

    };



    void setListener(const sp<MediaPlayer2InterfaceListener> &listener) {

        Mutex::Autolock autoLock(mListenerLock);

        mListener = listener;

media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <media/AVSyncSettings.h>

#include <media/AudioResamplerPublic.h>

#include <media/BufferingSettings.h>

#include <media/Metadata.h>

#include <media/mediaplayer_common.h>

#include <mediaplayer2/MediaPlayer2Interface.h>

#include <mediaplayer2/MediaPlayer2Types.h>

media/libmediaplayer2/mediaplayer2.cpp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <media/DataSourceDesc.h>

#include <media/MediaAnalyticsItem.h>

#include <media/MemoryLeakTrackUtil.h>

#include <media/Metadata.h>

#include <media/NdkWrapper.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/ALooperRoster.h>

media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp

+0 −27
Original line number Diff line number Diff line
@@ -662,33 +662,6 @@ status_t NuPlayer2Driver::getParameter(int key, Parcel *reply) { 
    return INVALID_OPERATION;

}



status_t NuPlayer2Driver::getMetadata(

        const media::Metadata::Filter& /* ids */, Parcel *records) {

    Mutex::Autolock autoLock(mLock);



    using media::Metadata;



    Metadata meta(records);



    meta.appendBool(

            Metadata::kPauseAvailable,

            mPlayerFlags & NuPlayer2::Source::FLAG_CAN_PAUSE);



    meta.appendBool(

            Metadata::kSeekBackwardAvailable,

            mPlayerFlags & NuPlayer2::Source::FLAG_CAN_SEEK_BACKWARD);



    meta.appendBool(

            Metadata::kSeekForwardAvailable,

            mPlayerFlags & NuPlayer2::Source::FLAG_CAN_SEEK_FORWARD);



    meta.appendBool(

            Metadata::kSeekAvailable,

            mPlayerFlags & NuPlayer2::Source::FLAG_CAN_SEEK);



    return OK;

}



void NuPlayer2Driver::notifyResetComplete(int64_t /* srcId */) {

    ALOGD("notifyResetComplete(%p)", this);

    Mutex::Autolock autoLock(mLock);

media/libmediaplayer2/nuplayer2/NuPlayer2Driver.h

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ struct NuPlayer2Driver : public MediaPlayer2Interface { 
    virtual status_t setParameter(int key, const Parcel &request) override;

    virtual status_t getParameter(int key, Parcel *reply) override;



    virtual status_t getMetadata(

            const media::Metadata::Filter& ids, Parcel *records) override;



    virtual status_t dump(int fd, const Vector<String16> &args) const override;



    virtual void onMessageReceived(const sp<AMessage> &msg) override;