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

Commit a838d46e authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Split datasource out of libstagefright"

parents 8d8c6b72 42057ce1

cmds/stagefright/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libmedia_codeclist libutils libbinder \

        libstagefright_foundation libjpeg libui libgui libcutils liblog \

        libhidlbase \

        libhidlbase libdatasource \

        android.hardware.media.omx@1.0 \



LOCAL_C_INCLUDES:= \
@@ -36,7 +36,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation

        libstagefright_foundation libdatasource



LOCAL_C_INCLUDES:= \

        frameworks/av/camera/include \
@@ -111,7 +111,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright liblog libutils libbinder libui libgui \

        libstagefright_foundation libmedia libcutils

        libstagefright_foundation libmedia libcutils libdatasource



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

cmds/stagefright/record.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
#include "SineSource.h"



#include <binder/ProcessState.h>

#include <datasource/FileSource.h>

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

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

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

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/CameraSource.h>

#include <media/stagefright/FileSource.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaCodecSource.h>

cmds/stagefright/stagefright.cpp

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


#include <binder/IServiceManager.h>

#include <binder/ProcessState.h>

#include <datasource/DataSourceFactory.h>

#include <media/DataSource.h>

#include <media/MediaSource.h>

#include <media/IMediaHTTPService.h>
@@ -39,9 +40,7 @@ 
#include <media/stagefright/foundation/ALooper.h>

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

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

#include "include/NuCachedSource2.h"

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/DataSourceFactory.h>

#include <media/stagefright/JPEGSource.h>

#include <media/stagefright/InterfaceUtils.h>

#include <media/stagefright/MediaCodec.h>

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <binder/ProcessState.h>

#include <cutils/properties.h> // for property_get



#include <datasource/DataSourceFactory.h>

#include <media/DataSource.h>

#include <media/IMediaHTTPService.h>

#include <media/IStreamSource.h>
@@ -28,7 +29,6 @@ 
#include <media/MediaSource.h>

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

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

#include <media/stagefright/DataSourceFactory.h>

#include <media/stagefright/InterfaceUtils.h>

#include <media/stagefright/MPEG2TSWriter.h>

#include <media/stagefright/MediaExtractor.h>

media/codec2/components/cmds/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ cc_binary { 
        "libbase",

        "libbinder",

        "libcutils",

        "libdatasource",

        "libgui",

        "liblog",

        "libstagefright",