Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 860 into donut

Browse Source 
* changes:
  Change 79 in git master branch
This commit is contained in:
Android (Google) Code Review
2009-05-01 14:09:03 -07:00
parent 75e44a1c72 c02cac481c
commit e117ff6e29
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
media/jni/Android.mk
View File

@@ -3,31 +3,32 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
android_media_MediaPlayer.cpp \ android_media_MediaPlayer.cpp \
android_media_MediaRecorder.cpp \ android_media_MediaRecorder.cpp \
android_media_MediaScanner.cpp \ android_media_MediaScanner.cpp \
android_media_MediaMetadataRetriever.cpp \ android_media_MediaMetadataRetriever.cpp \
android_media_AmrInputStream.cpp \ android_media_AmrInputStream.cpp \
android_media_ResampleInputStream.cpp android_media_ResampleInputStream.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libopencoreplayer \ libopencore_player \
libopencoreauthor \ libopencore_author \
libandroid_runtime \ libomx_amrenc_sharedlibrary \
libnativehelper \ libandroid_runtime \
libcutils \ libnativehelper \
libutils \ libcutils \
libmedia \ libutils \
libsgl \ libmedia \
libui libsgl \
libui
LOCAL_STATIC_LIBRARIES := LOCAL_STATIC_LIBRARIES :=
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
external/tremor/Tremor \ external/tremor/Tremor \
$(PV_INCLUDES) \ $(PV_INCLUDES) \
$(JNI_H_INCLUDE) \ $(JNI_H_INCLUDE) \
$(call include-path-for, corecg graphics) $(call include-path-for, corecg graphics)
LOCAL_CFLAGS += LOCAL_CFLAGS +=

2
media/jni/android_media_AmrInputStream.cpp
View File

@@ -74,7 +74,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize
encodeProps.iInNumChannels = 1; encodeProps.iInNumChannels = 1;
encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR; encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR;
encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2; encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2;
encodeProps.iBitStreamFormatIf2 = false; encodeProps.iBitStreamFormat = false;
encodeProps.iAudioObjectType = 0; encodeProps.iAudioObjectType = 0;
encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate; encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate;
encodeProps.iOutNumChannels = encodeProps.iInNumChannels; encodeProps.iOutNumChannels = encodeProps.iInNumChannels;

28
media/libmediaplayerservice/Android.mk
View File

@@ -7,28 +7,28 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
MediaRecorderClient.cpp \ MediaRecorderClient.cpp \
MediaPlayerService.cpp \ MediaPlayerService.cpp \
MetadataRetrieverClient.cpp \ MetadataRetrieverClient.cpp \
VorbisPlayer.cpp \ VorbisPlayer.cpp \
MidiFile.cpp MidiFile.cpp
ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
LOCAL_LDLIBS += -ldl -lpthread LOCAL_LDLIBS += -ldl -lpthread
endif endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
libutils \ libutils \
libvorbisidec \ libvorbisidec \
libsonivox \ libsonivox \
libopencoreplayer \ libopencore_player \
libopencoreauthor \ libopencore_author \
libmedia \ libmedia \
libandroid_runtime libandroid_runtime
LOCAL_C_INCLUDES := external/tremor/Tremor \ LOCAL_C_INCLUDES := external/tremor/Tremor \
$(call include-path-for, graphics corecg) $(call include-path-for, graphics corecg)
LOCAL_MODULE:= libmediaplayerservice LOCAL_MODULE:= libmediaplayerservice