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

Commit bb038d16 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Revert "Changes required to accommodate OpenCORE 2.0" 

This reverts commit ea780b68.

Conflicts:

	media/libmediaplayerservice/Android.mk
parent ae267f9d

media/jni/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -12,16 +12,15 @@ LOCAL_SRC_FILES:= \ 
	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 :=

media/jni/android_media_AmrInputStream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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.iBitStreamFormat = false;

    encodeProps.iBitStreamFormatIf2 = false;

    encodeProps.iAudioObjectType = 0;

    encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate;

    encodeProps.iOutNumChannels = encodeProps.iInNumChannels;

media/libmediaplayerservice/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ LOCAL_SHARED_LIBRARIES := \ 


ifneq ($(BUILD_WITHOUT_PV),true)

LOCAL_SHARED_LIBRARIES += \

	libopencore_player \

	libopencore_author

	libopencoreplayer \

	libopencoreauthor

endif



LOCAL_C_INCLUDES := external/tremor/Tremor \