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

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

Merge "Move MediaDefs from libmedia to libstagefright_foundation"

parents b45a3c22 e7a8a637

media/extractors/mp4/ItemTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
#define LOG_TAG "ItemTable"



#include <ItemTable.h>

#include <media/MediaDefs.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MediaErrors.h>

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

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

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

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

#include <utils/Log.h>



namespace android {

media/libmedia/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ cc_defaults { 
        "IOMXStore.cpp",

        "MediaCodecBuffer.cpp",

        "MediaCodecInfo.cpp",

        "MediaDefs.cpp",

        "OMXBuffer.cpp",

        "omx/1.0/WGraphicBufferSource.cpp",

        "omx/1.0/WOmx.cpp",

media/libstagefright/MediaCodecList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#include <media/IMediaPlayerService.h>

#include <media/IMediaCodecService.h>

#include <media/MediaCodecInfo.h>

#include <media/MediaDefs.h>



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

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

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

#include <media/stagefright/MediaCodecList.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/OmxInfoBuilder.h>

media/libstagefright/OmxInfoBuilder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <binder/IServiceManager.h>

#include <media/IMediaCodecService.h>

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

#include <media/stagefright/OmxInfoBuilder.h>

#include <media/stagefright/ACodec.h>
@@ -36,7 +37,6 @@ 


#include <media/IOMXStore.h>

#include <media/IOMX.h>

#include <media/MediaDefs.h>

#include <media/omx/1.0/WOmx.h>



#include <media/openmax/OMX_Index.h>

media/libstagefright/codecs/avcdec/Android.bp

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



    shared_libs: [

        "libmedia_omx",

        "libstagefright_omx",

        "libstagefright_foundation",

        "libutils",