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

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

Merge "MediaPlayer2: move MediaPlayer2 native code to libmediaplayer2"

parents d5b1f00d 51b6956b

media/libmedia/Android.bp

+0 −75
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ cc_library { 
        "IMediaExtractor.cpp",

        "IMediaExtractorService.cpp",

        "IMediaSource.cpp",

        "IStreamSource.cpp",

        "MediaCodecBuffer.cpp",

        "MediaUtils.cpp",

        "Metadata.cpp",
@@ -313,77 +312,3 @@ cc_library { 
        },

    },

}
 


cc_library {

    name: "libmedia_player2",



    srcs: [

        "JAudioTrack.cpp",

        "MediaPlayer2Manager.cpp",

        "mediaplayer2.cpp",

    ],



    shared_libs: [

        "libandroid_runtime",

        "libaudioclient",

        "libbinder",

        "libcutils",

        "libgui",

        "liblog",

        "libmedia_omx",

        "libmedia_player2_util",

        "libmediaextractor",

        "libstagefright_foundation",

        "libui",

        "libutils",



        "libcrypto",

        "libmediadrm",

        "libmediametrics",

        "libmediandk",

        "libmediautils",

        "libmemunreachable",

        "libnativewindow",

        "libpowermanager",

        "libstagefright_httplive",

        "libstagefright_player2",

    ],



    export_shared_lib_headers: [

        "libaudioclient",

        "libbinder",

        "libmedia_omx",

    ],



    header_libs: [

        "media_plugin_headers",

    ],



    static_libs: [

        "libmedia_helper",

        "libstagefright_nuplayer2",

        "libstagefright_rtsp",

        "libstagefright_timedtext",

    ],



    export_include_dirs: [

        "include",

    ],



    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

    },

}

media/libmediaplayer2/Android.bp

0 → 100644
+79 −0
Original line number Diff line number Diff line 
cc_library_headers {

    name: "libmediaplayer2_headers",

    vendor_available: true,

    export_include_dirs: ["include"],

}



cc_library {

    name: "libmediaplayer2",



    srcs: [

        "JAudioTrack.cpp",

        "MediaPlayer2Manager.cpp",

        "mediaplayer2.cpp",

    ],



    shared_libs: [

        "libandroid_runtime",

        "libaudioclient",

        "libbinder",

        "libcutils",

        "libgui",

        "liblog",

        "libmedia_omx",

        "libmedia_player2_util",

        "libmediaextractor",

        "libstagefright_foundation",

        "libui",

        "libutils",



        "libcrypto",

        "libmediadrm",

        "libmediametrics",

        "libmediandk",

        "libmediautils",

        "libmemunreachable",

        "libnativewindow",

        "libpowermanager",

        "libstagefright_httplive",

        "libstagefright_player2",

    ],



    export_shared_lib_headers: [

        "libaudioclient",

        "libbinder",

        "libmedia_omx",

    ],



    header_libs: [

        "media_plugin_headers",

    ],



    static_libs: [

        "libmedia_helper",

        "libstagefright_nuplayer2",

        "libstagefright_rtsp",

        "libstagefright_timedtext",

    ],



    export_include_dirs: [

        "include",

    ],



    cflags: [

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],



    sanitize: {

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

        cfi: true,

        diag: {

            cfi: true,

        },

    },

}

media/libmedia/JAudioTrack.cpp→media/libmediaplayer2/JAudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include "media/JAudioAttributes.h"

#include "media/JAudioFormat.h"

#include "media/JAudioTrack.h"

#include "mediaplayer2/JAudioTrack.h"



#include <android_media_AudioErrors.h>

#include <android_runtime/AndroidRuntime.h>

media/libmedia/MediaPlayer2Manager.cpp→media/libmediaplayer2/MediaPlayer2Manager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ 
#include <media/AudioPolicyHelper.h>

#include <media/DataSourceDesc.h>

#include <media/MediaHTTPService.h>

#include <media/MediaPlayer2EngineClient.h>

#include <media/MediaPlayer2Interface.h>

#include <media/Metadata.h>

#include <media/AudioTrack.h>

#include <media/MemoryLeakTrackUtil.h>
@@ -63,6 +61,9 @@ 
#include <media/stagefright/SurfaceUtils.h>

#include <mediautils/BatteryNotifier.h>



#include <mediaplayer2/MediaPlayer2EngineClient.h>

#include <mediaplayer2/MediaPlayer2Interface.h>



#include <memunreachable/memunreachable.h>

#include <system/audio.h>

#include <system/window.h>

media/libmedia/MediaPlayer2Manager.h→media/libmediaplayer2/MediaPlayer2Manager.h

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#include <utils/String8.h>

#include <utils/Vector.h>



#include <media/MediaPlayer2Engine.h>

#include <media/MediaPlayer2Interface.h>

#include <media/Metadata.h>

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

#include <mediaplayer2/MediaPlayer2Engine.h>

#include <mediaplayer2/MediaPlayer2Interface.h>



#include <system/audio.h>