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

Commit 7dc218e1 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Move MetaData from foundation to libmediaextractor 

Test: cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg
Change-Id: I2c5e05f83f039813cb4c862e929315e623d5d7fa
CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice
Bug: 67908544
parent 0f826b3e

cmds/stagefright/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libui libgui \

        libstagefright_foundation libmedia libcutils

        libstagefright_foundation libmedia libcutils libmediaextractor



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \
@@ -204,7 +204,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libstagefright_foundation \

        libcutils libc

        libcutils libc libmediaextractor



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

media/extractors/aac/AACExtractor.cpp

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

#include <media/DataSource.h>

#include <media/MediaSourceBase.h>

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

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

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

#include <media/stagefright/foundation/ADebug.h>
@@ -29,6 +28,7 @@ 
#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MetaDataUtils.h>

#include <utils/String8.h>



namespace android {

media/extractors/aac/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ cc_library_shared { 
        "libutils",

    ],



    static_libs: [

        "libstagefright_metadatautils",

    ],



    name: "libaacextractor",

    relative_install_path: "extractors",

media/extractors/mkv/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ cc_library_shared { 


    static_libs: [

        "libstagefright_flacdec",

        "libstagefright_metadatautils",

        "libwebm",

    ],

media/extractors/mkv/MatroskaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ 
#include <media/stagefright/foundation/ABuffer.h>

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

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

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

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

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MetaDataUtils.h>

#include <utils/String8.h>



#include <inttypes.h>