Revert "Changes required to accommodate OpenCORE 2.0"
This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.
Conflicts:
media/libmediaplayerservice/Android.mk
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 50c2bcd..98a5326 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -12,16 +12,15 @@
android_media_ResampleInputStream.cpp
LOCAL_SHARED_LIBRARIES := \
- libopencore_player \
- libopencore_author \
+ libopencoreplayer \
+ libopencoreauthor \
libandroid_runtime \
libnativehelper \
libcutils \
libutils \
libmedia \
libsgl \
- libui \
- libomx_amrenc_sharedlibrary
+ libui
LOCAL_STATIC_LIBRARIES :=
diff --git a/media/jni/android_media_AmrInputStream.cpp b/media/jni/android_media_AmrInputStream.cpp
index 51cb6c7..978c110 100644
--- a/media/jni/android_media_AmrInputStream.cpp
+++ b/media/jni/android_media_AmrInputStream.cpp
@@ -74,7 +74,7 @@
encodeProps.iInNumChannels = 1;
encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR;
encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2;
- encodeProps.iBitStreamFormat = false;
+ encodeProps.iBitStreamFormatIf2 = false;
encodeProps.iAudioObjectType = 0;
encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate;
encodeProps.iOutNumChannels = encodeProps.iInNumChannels;
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index c45eb3d..0478234 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -31,8 +31,8 @@
ifneq ($(BUILD_WITHOUT_PV),true)
LOCAL_SHARED_LIBRARIES += \
- libopencore_player \
- libopencore_author
+ libopencoreplayer \
+ libopencoreauthor
endif
LOCAL_C_INCLUDES := external/tremor/Tremor \
