From 1edb68c38408d06bf8f97d6884663732b7dbcce2 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Fri, 18 Oct 2019 11:12:30 -0700 Subject: [PATCH] Move AudioPlayer to test commands AudioPlayer was only used by the commandline utilities, so move it out of libstagefright. Test: build, run Change-Id: I561cccd323206de7415bd235b72711194080aaea --- cmds/stagefright/Android.mk | 13 ++++++++----- .../stagefright}/AudioPlayer.cpp | 3 ++- .../media => cmds}/stagefright/AudioPlayer.h | 0 cmds/stagefright/audioloop.cpp | 2 +- cmds/stagefright/record.cpp | 3 ++- cmds/stagefright/recordvideo.cpp | 4 +--- cmds/stagefright/stagefright.cpp | 3 ++- media/libstagefright/Android.bp | 1 - 8 files changed, 16 insertions(+), 13 deletions(-) rename {media/libstagefright => cmds/stagefright}/AudioPlayer.cpp (99%) rename {media/libstagefright/include/media => cmds}/stagefright/AudioPlayer.h (100%) diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index cc43b61612..defc94f8fd 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ + AudioPlayer.cpp \ stagefright.cpp \ jpeg.cpp \ SineSource.cpp @@ -10,7 +11,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright libmedia libmedia_codeclist libutils libbinder \ libstagefright_foundation libjpeg libui libgui libcutils liblog \ - libhidlbase libdatasource \ + libhidlbase libdatasource libaudioclient \ android.hardware.media.omx@1.0 \ LOCAL_C_INCLUDES:= \ @@ -31,12 +32,13 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ + AudioPlayer.cpp \ SineSource.cpp \ record.cpp LOCAL_SHARED_LIBRARIES := \ libstagefright libmedia liblog libutils libbinder \ - libstagefright_foundation libdatasource + libstagefright_foundation libdatasource libaudioclient LOCAL_C_INCLUDES:= \ frameworks/av/camera/include \ @@ -57,12 +59,12 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - SineSource.cpp \ + AudioPlayer.cpp \ recordvideo.cpp LOCAL_SHARED_LIBRARIES := \ libstagefright libmedia liblog libutils libbinder \ - libstagefright_foundation + libstagefright_foundation libaudioclient LOCAL_C_INCLUDES:= \ frameworks/av/media/libstagefright \ @@ -83,12 +85,13 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ + AudioPlayer.cpp \ SineSource.cpp \ audioloop.cpp LOCAL_SHARED_LIBRARIES := \ libstagefright libmedia liblog libutils libbinder \ - libstagefright_foundation + libstagefright_foundation libaudioclient LOCAL_C_INCLUDES:= \ frameworks/av/media/libstagefright \ diff --git a/media/libstagefright/AudioPlayer.cpp b/cmds/stagefright/AudioPlayer.cpp similarity index 99% rename from media/libstagefright/AudioPlayer.cpp rename to cmds/stagefright/AudioPlayer.cpp index 199b57b62c..208713d950 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/cmds/stagefright/AudioPlayer.cpp @@ -28,12 +28,13 @@ #include #include #include -#include #include #include #include #include +#include "AudioPlayer.h" + namespace android { AudioPlayer::AudioPlayer( diff --git a/media/libstagefright/include/media/stagefright/AudioPlayer.h b/cmds/stagefright/AudioPlayer.h similarity index 100% rename from media/libstagefright/include/media/stagefright/AudioPlayer.h rename to cmds/stagefright/AudioPlayer.h diff --git a/cmds/stagefright/audioloop.cpp b/cmds/stagefright/audioloop.cpp index d4f2e8d8d4..bd274d8f67 100644 --- a/cmds/stagefright/audioloop.cpp +++ b/cmds/stagefright/audioloop.cpp @@ -29,11 +29,11 @@ #include #include #include -#include #include #include #include #include +#include "AudioPlayer.h" #include "SineSource.h" using namespace android; diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index 498237de8d..37091c43e1 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -33,6 +32,8 @@ #include #include +#include "AudioPlayer.h" + using namespace android; static const int32_t kAudioBitRate = 12200; diff --git a/cmds/stagefright/recordvideo.cpp b/cmds/stagefright/recordvideo.cpp index a63b9b9984..01a178e6a0 100644 --- a/cmds/stagefright/recordvideo.cpp +++ b/cmds/stagefright/recordvideo.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include "SineSource.h" - #include #include #include @@ -25,8 +23,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index d52541d2df..a1ee90483f 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,8 @@ #include +#include "AudioPlayer.h" + using namespace android; static long gNumRepetitions; diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp index 50d5a6477a..a6dbce3d6b 100644 --- a/media/libstagefright/Android.bp +++ b/media/libstagefright/Android.bp @@ -127,7 +127,6 @@ cc_library { "ACodecBufferChannel.cpp", "AHierarchicalStateMachine.cpp", "AMRWriter.cpp", - "AudioPlayer.cpp", "AudioSource.cpp", "BufferImpl.cpp", "CallbackDataSource.cpp",