diff options
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/Android.mk | 39 | ||||
| -rw-r--r-- | media/jni/android_media_AmrInputStream.cpp | 2 |
2 files changed, 21 insertions, 20 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 3620494..8ee0cbd 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -3,31 +3,32 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - android_media_MediaPlayer.cpp \ - android_media_MediaRecorder.cpp \ - android_media_MediaScanner.cpp \ - android_media_MediaMetadataRetriever.cpp \ - android_media_AmrInputStream.cpp \ - android_media_ResampleInputStream.cpp + android_media_MediaPlayer.cpp \ + android_media_MediaRecorder.cpp \ + android_media_MediaScanner.cpp \ + android_media_MediaMetadataRetriever.cpp \ + android_media_AmrInputStream.cpp \ + android_media_ResampleInputStream.cpp LOCAL_SHARED_LIBRARIES := \ - libopencoreplayer \ - libopencoreauthor \ - libandroid_runtime \ - libnativehelper \ - libcutils \ - libutils \ - libmedia \ - libsgl \ - libui + libopencore_player \ + libopencore_author \ + libomx_amrenc_sharedlibrary \ + libandroid_runtime \ + libnativehelper \ + libcutils \ + libutils \ + libmedia \ + libsgl \ + libui LOCAL_STATIC_LIBRARIES := LOCAL_C_INCLUDES += \ - external/tremor/Tremor \ - $(PV_INCLUDES) \ - $(JNI_H_INCLUDE) \ - $(call include-path-for, corecg graphics) + external/tremor/Tremor \ + $(PV_INCLUDES) \ + $(JNI_H_INCLUDE) \ + $(call include-path-for, corecg graphics) LOCAL_CFLAGS += diff --git a/media/jni/android_media_AmrInputStream.cpp b/media/jni/android_media_AmrInputStream.cpp index 978c110..51cb6c7 100644 --- a/media/jni/android_media_AmrInputStream.cpp +++ b/media/jni/android_media_AmrInputStream.cpp @@ -74,7 +74,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize encodeProps.iInNumChannels = 1; encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR; encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2; - encodeProps.iBitStreamFormatIf2 = false; + encodeProps.iBitStreamFormat = false; encodeProps.iAudioObjectType = 0; encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate; encodeProps.iOutNumChannels = encodeProps.iInNumChannels; |