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

Commit d989bb63 authored by Jooyung Han's avatar Jooyung Han
Browse files

Extract android_media_Utils.cpp as a lib 

This is a part of job to cut dependency from libmediandk
to libandroid_runtime. As a LL-NDK, libmediandk desn't have
to depend on libandroid_runtime.

dependency: libmediandk -> libmedia_jni -> libandroid_runtime

Libmediandk calls three utility functions defined in
android_media_Utils.cpp. But these functions are independent
from libandroid_runtime.

By extracting those utility functions into its own shared library
(libmedia_jni_utils), the dependency from libmediandk to
libmedia_jni is cut down.

However, some classes and other functions in android_media_Utils.cpp
are moved into new file, android_media_Streams.cpp since they
depend on libandroid_runtime.

Bug: 124268753
Test: m -j
Change-Id: I1e1ea4bc1ff7022d8d9c42785c8c00e3ca153a50
Merged-In: I1e1ea4bc1ff7022d8d9c42785c8c00e3ca153a50
parent a02847ec

media/jni/Android.bp

+32 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ cc_library_shared { 
        "android_media_MediaScanner.cpp",

        "android_media_MediaSync.cpp",

        "android_media_ResampleInputStream.cpp",

        "android_media_Streams.cpp",

        "android_media_SyncParams.cpp",

        "android_media_Utils.cpp",

        "android_mtp_MtpDatabase.cpp",

        "android_mtp_MtpDevice.cpp",

        "android_mtp_MtpServer.cpp",
@@ -36,6 +36,7 @@ cc_library_shared { 
        "libbinder",

        "libmedia",

        "libmediaextractor",

        "libmedia_jni_utils",

        "libmedia_omx",

        "libmediametrics",

        "libmediadrm",
@@ -90,6 +91,36 @@ cc_library_shared { 
    ],

}



cc_library_shared {

    name: "libmedia_jni_utils",

    srcs: [

        "android_media_Utils.cpp",

    ],



    shared_libs: [

        "liblog",

        "libmedia_omx",

        "libnativewindow",

        "libui",

        "libutils",

        "android.hidl.token@1.0-utils",

    ],



    include_dirs: [

        "system/media/camera/include",

    ],



    export_include_dirs: ["."],



    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wunused",

        "-Wunreachable-code",

    ],

}



cc_library_shared {

    name: "libmedia2_jni",

media/jni/android_media_MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "android_media_MediaCrypto.h"

#include "android_media_MediaDescrambler.h"

#include "android_media_MediaMetricsJNI.h"

#include "android_media_Utils.h"

#include "android_media_Streams.h"

#include "android_runtime/AndroidRuntime.h"

#include "android_runtime/android_view_Surface.h"

#include "android_util_Binder.h"

media/jni/android_media_MediaCodecList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "android_runtime/AndroidRuntime.h"

#include "jni.h"

#include <nativehelper/JNIHelp.h>

#include "android_media_Utils.h"

#include "android_media_Streams.h"



using namespace android;

media/jni/android_media_MediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "android_media_MediaDataSource.h"

#include "android_media_MediaExtractor.h"

#include "android_media_MediaMetricsJNI.h"

#include "android_media_Utils.h"

#include "android_media_Streams.h"

#include "android_os_HwRemoteBinder.h"

#include "android_runtime/AndroidRuntime.h"

#include "android_runtime/Log.h"

media/jni/android_media_MediaMetadataRetriever.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "MediaMetadataRetrieverJNI"



#include <cmath>

#include <assert.h>

#include <utils/Log.h>

#include <utils/threads.h>
@@ -32,7 +33,7 @@ 
#include <nativehelper/JNIHelp.h>

#include "android_runtime/AndroidRuntime.h"

#include "android_media_MediaDataSource.h"

#include "android_media_Utils.h"

#include "android_media_Streams.h"

#include "android_util_Binder.h"



#include "android/graphics/GraphicsJNI.h"