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

5
media/jni/Android.mk
View File

@@ -11,8 +11,9 @@ LOCAL_SRC_FILES:= \
android_media_ResampleInputStream.cpp android_media_ResampleInputStream.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libopencoreplayer \ libopencore_player \
libopencoreauthor \ libopencore_author \
libomx_amrenc_sharedlibrary \
libandroid_runtime \ libandroid_runtime \
libnativehelper \ libnativehelper \
libcutils \ libcutils \

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;

4
media/libmediaplayerservice/Android.mk
View File

@@ -22,8 +22,8 @@ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
libvorbisidec \ libvorbisidec \
libsonivox \ libsonivox \
libopencoreplayer \ libopencore_player \
libopencoreauthor \ libopencore_author \
libmedia \ libmedia \
libandroid_runtime libandroid_runtime