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

Commit 35e2d054 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge changes Ibd8ce581,I04cc955d into rvc-dev am: 0081f253 am: b4dfa05d am: 3135110f 

Change-Id: I41f072693e552c6a62ee226f70d15b89ef3edbaf
parents 55660557 3135110f

media/jni/android_media_MediaCodec.cpp

+2 −4
Original line number Diff line number Diff line
@@ -676,8 +676,6 @@ status_t JMediaCodec::getOutputFrame( 
    if (buffer->size() > 0) {

        std::shared_ptr<C2Buffer> c2Buffer = buffer->asC2Buffer();

        if (c2Buffer) {

            // asC2Buffer clears internal reference, so set the reference again.

            buffer->copy(c2Buffer);

            switch (c2Buffer->data().type()) {

                case C2BufferData::LINEAR: {

                    std::unique_ptr<JMediaCodecLinearBlock> context{new JMediaCodecLinearBlock};
@@ -2526,7 +2524,7 @@ static void android_media_MediaCodec_setAudioPresentation( 
    codec->selectAudioPresentation((int32_t)presentationId, (int32_t)programId);

}



static void android_media_MediaCodec_native_init(JNIEnv *env) {

static void android_media_MediaCodec_native_init(JNIEnv *env, jclass) {

    ScopedLocalRef<jclass> clazz(

            env, env->FindClass("android/media/MediaCodec"));

    CHECK(clazz.get() != NULL);
@@ -2983,7 +2981,7 @@ static void android_media_MediaCodec_LinearBlock_native_obtain( 
}



static jboolean android_media_MediaCodec_LinearBlock_checkCompatible(

        JNIEnv *env, jobjectArray codecNames) {

        JNIEnv *env, jclass, jobjectArray codecNames) {

    std::vector<std::string> names;

    PopulateNamesVector(env, codecNames, &names);

    bool isCompatible = false;