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

Commit e117ff6e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 860 into donut 

* changes:
  Change 79 in git master branch
parents 75e44a1c c02cac48

media/jni/Android.mk

+20 −19
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ LOCAL_SRC_FILES:= \ 
    android_media_ResampleInputStream.cpp



LOCAL_SHARED_LIBRARIES := \

	libopencoreplayer \

	libopencoreauthor \

    libopencore_player \

    libopencore_author \

    libomx_amrenc_sharedlibrary \

    libandroid_runtime \

    libnativehelper \

    libcutils \

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.iBitStreamFormatIf2 = false;

    encodeProps.iBitStreamFormat = false;

    encodeProps.iAudioObjectType = 0;

    encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate;

    encodeProps.iOutNumChannels = encodeProps.iInNumChannels;

media/libmediaplayerservice/Android.mk

+14 −14
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libvorbisidec \

    libsonivox \

	libopencoreplayer \

	libopencoreauthor \

    libopencore_player \

    libopencore_author \

    libmedia \

    libandroid_runtime