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

Commit 4520fef5 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Move AudioPlayer to test commands" 

am: 4426ce8d

Change-Id: I570df166245cecace59955fac8b667d99167d591
parents 87e6db67 4426ce8d

cmds/stagefright/Android.mk

+8 −5
Original line number Diff line number Diff line
@@ -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 \

media/libstagefright/AudioPlayer.cpp→cmds/stagefright/AudioPlayer.cpp

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

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

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

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>



#include "AudioPlayer.h"



namespace android {



AudioPlayer::AudioPlayer(

cmds/stagefright/audioloop.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 
#include <media/stagefright/foundation/ADebug.h>

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

#include <media/stagefright/AMRWriter.h>

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/AudioSource.h>

#include <media/stagefright/MediaCodecSource.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/SimpleDecodingSource.h>

#include "AudioPlayer.h"

#include "SineSource.h"



using namespace android;

cmds/stagefright/record.cpp

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#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/MediaBufferGroup.h>

#include <media/stagefright/MediaDefs.h>
@@ -33,6 +32,8 @@ 
#include <media/stagefright/SimpleDecodingSource.h>

#include <media/MediaPlayerInterface.h>



#include "AudioPlayer.h"



using namespace android;



static const int32_t kAudioBitRate = 12200;