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

Commit b7798a01 authored by Pawin Vongmasa's avatar Pawin Vongmasa
Browse files

Remove OMX dependency from MediaPlayerService 

Also, convert Android.mk files to Android.bp.

Test: make cts -j123 && cts-tradefed run cts \
-m CtsMediaTestCases \
-t android.media.cts.MediaPlayerTest

Bug: 67652488
Change-Id: I7172d1a2513826a5dafbe51245af11d863f50585
parent 284aa301

media/libmedia/IMediaPlayerService.cpp

+0 −14
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ enum { 
    CREATE = IBinder::FIRST_CALL_TRANSACTION,

    CREATE_MEDIA_RECORDER,

    CREATE_METADATA_RETRIEVER,

    GET_OMX,

    ADD_BATTERY_DATA,

    PULL_BATTERY_DATA,

    LISTEN_FOR_REMOTE_DISPLAY,
@@ -81,13 +80,6 @@ public: 
        return interface_cast<IMediaRecorder>(reply.readStrongBinder());

    }



    virtual sp<IOMX> getOMX() {

        Parcel data, reply;

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

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

        return interface_cast<IOMX>(reply.readStrongBinder());

    }



    virtual void addBatteryData(uint32_t params) {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
@@ -151,12 +143,6 @@ status_t BnMediaPlayerService::onTransact( 
            reply->writeStrongBinder(IInterface::asBinder(retriever));

            return NO_ERROR;

        } break;

        case GET_OMX: {

            CHECK_INTERFACE(IMediaPlayerService, data, reply);

            sp<IOMX> omx = getOMX();

            reply->writeStrongBinder(IInterface::asBinder(omx));

            return NO_ERROR;

        } break;

        case ADD_BATTERY_DATA: {

            CHECK_INTERFACE(IMediaPlayerService, data, reply);

            uint32_t params = data.readInt32();

media/libmedia/include/media/IMediaPlayerService.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ public: 
    virtual sp<IMediaMetadataRetriever> createMetadataRetriever() = 0;

    virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client,

            audio_session_t audioSessionId = AUDIO_SESSION_ALLOCATE) = 0;

    virtual sp<IOMX>            getOMX() = 0;

    virtual sp<IMediaCodecList> getCodecList() const = 0;



    // Connects to a remote display.

media/libmediaplayerservice/Android.bp

0 → 100644
+76 −0
Original line number Diff line number Diff line 
cc_library_shared {



    srcs: [

        "ActivityManager.cpp",

        "MediaPlayerFactory.cpp",

        "MediaPlayerService.cpp",

        "MediaRecorderClient.cpp",

        "MetadataRetrieverClient.cpp",

        "StagefrightRecorder.cpp",

        "TestPlayerStub.cpp",

    ],



    shared_libs: [

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

        "libaudioclient",

        "libbinder",

        "libcamera_client",

        "libcrypto",

        "libcutils",

        "libdl",

        "libgui",

        "libhidlbase",

        "libhidlmemory",

        "liblog",

        "libmedia",

        "libmediadrm",

        "libmediametrics",

        "libmediautils",

        "libmemunreachable",

        "libpowermanager",

        "libstagefright",

        "libstagefright_foundation",

        "libstagefright_httplive",

        "libutils",

    ],



    header_libs: [

        "media_plugin_headers",

    ],



    static_libs: [

        "libstagefright_nuplayer",

        "libstagefright_rtsp",

        "libstagefright_timedtext",

    ],



    export_shared_lib_headers: ["libmedia"],



    include_dirs: [

        "frameworks/av/media/libstagefright/rtsp",

        "frameworks/av/media/libstagefright/webm",

    ],



    local_include_dirs: ["include"],



    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],



    name: "libmediaplayerservice",



    compile_multilib: "32",



    sanitize: {

        cfi: true,

        diag: {

            cfi: true,

        },

    },



}



subdirs = ["*"]

media/libmediaplayerservice/Android.mk

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



#

# libmediaplayerservice

#



include $(CLEAR_VARS)



LOCAL_SRC_FILES:=               \

    ActivityManager.cpp         \

    MediaPlayerFactory.cpp      \

    MediaPlayerService.cpp      \

    MediaRecorderClient.cpp     \

    MetadataRetrieverClient.cpp \

    StagefrightRecorder.cpp     \

    TestPlayerStub.cpp          \



LOCAL_SHARED_LIBRARIES :=       \

    libbinder                   \

    libcrypto                   \

    libcutils                   \

    liblog                      \

    libdl                       \

    libgui                      \

    libaudioclient              \

    libmedia                    \

    libmediametrics             \

    libmediadrm                 \

    libmediautils               \

    libmemunreachable           \

    libpowermanager             \

    libstagefright              \

    libstagefright_foundation   \

    libstagefright_httplive     \

    libstagefright_omx          \

    libutils                    \

    libhidlbase                 \

    libhidlmemory               \

    android.hardware.media.omx@1.0 \



LOCAL_STATIC_LIBRARIES :=       \

    libstagefright_nuplayer     \

    libstagefright_rtsp         \

    libstagefright_timedtext    \



LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia



LOCAL_C_INCLUDES :=                                                 \

    frameworks/av/media/libstagefright/include               \

    frameworks/av/media/libstagefright/rtsp                  \

    frameworks/av/media/libstagefright/webm                  \

    $(LOCAL_PATH)/include/media                              \

    frameworks/av/include/camera                             \

    frameworks/native/include/media/openmax                  \

    frameworks/native/include/media/hardware                 \

    external/tremolo/Tremolo                                 \



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall



LOCAL_MODULE:= libmediaplayerservice



LOCAL_32_BIT_ONLY := true



LOCAL_SANITIZE := cfi integer_overflow

LOCAL_SANITIZE_DIAG := cfi



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

media/libmediaplayerservice/MediaPlayerService.cpp

+0 −13
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ 
#include "TestPlayerStub.h"

#include "nuplayer/NuPlayerDriver.h"



#include <media/stagefright/omx/OMX.h>



#include "HTTPBase.h"



static const int kDumpLockRetries = 50;
@@ -336,17 +334,6 @@ sp<IMediaCodecList> MediaPlayerService::getCodecList() const { 
    return MediaCodecList::getLocalInstance();

}



sp<IOMX> MediaPlayerService::getOMX() {

    ALOGI("MediaPlayerService::getOMX");

    Mutex::Autolock autoLock(mLock);



    if (mOMX.get() == NULL) {

        mOMX = new OMX;

    }



    return mOMX;

}



sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay(

        const String16 &/*opPackageName*/,

        const sp<IRemoteDisplayClient>& /*client*/,