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

Commit ea780b68 authored by Brock Atchison's avatar Brock Atchison
Browse files

Changes required to accommodate OpenCORE 2.0

parent 06323a69

media/jni/Android.mk

+4 −3
Original line number Original line Diff line number Diff line
@@ -11,15 +11,16 @@ LOCAL_SRC_FILES:= \ 
	android_media_ResampleInputStream.cpp

	android_media_ResampleInputStream.cpp





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

	libopencoreplayer \

	libopencore_player \

	libopencoreauthor \

	libopencore_author \

	libandroid_runtime \

	libandroid_runtime \

	libnativehelper \

	libnativehelper \

	libcutils \

	libcutils \

	libutils \

	libutils \

	libmedia \

	libmedia \

	libsgl \

	libsgl \

	libui

	libui \

	libomx_amrenc_sharedlibrary





LOCAL_STATIC_LIBRARIES :=

LOCAL_STATIC_LIBRARIES :=

media/jni/android_media_AmrInputStream.cpp

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

media/libmediaplayerservice/Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -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