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

Commit 4c2f8767 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Mediacodec to use C interface to mediametrics" am: 3f51e53b am: 8e7b2b5f 

Change-Id: I16ec671c25b8d2c62f9bd86e0e18a22d783293bb
parents 3db9e958 8e7b2b5f

media/jni/android_media_MediaCodec.cpp

+6 −4
Original line number Diff line number Diff line
@@ -743,8 +743,10 @@ status_t JMediaCodec::getCodecInfo(JNIEnv *env, jobject *codecInfoObject) const 
}



status_t JMediaCodec::getMetrics(JNIEnv *, MediaAnalyticsItem * &reply) const {



    status_t status = mCodec->getMetrics(reply);

    mediametrics_handle_t reply2 = MediaAnalyticsItem::convert(reply);

    status_t status = mCodec->getMetrics(reply2);

    // getMetrics() updates reply2, pass the converted update along to our caller.

    reply = MediaAnalyticsItem::convert(reply2);

    return status;

}
@@ -1848,7 +1850,7 @@ android_media_MediaCodec_native_getMetrics(JNIEnv *env, jobject thiz) 
    }



    // get what we have for the metrics from the codec

    MediaAnalyticsItem *item = NULL;

    MediaAnalyticsItem *item = 0;



    status_t err = codec->getMetrics(env, item);

    if (err != OK) {
@@ -1860,7 +1862,7 @@ android_media_MediaCodec_native_getMetrics(JNIEnv *env, jobject thiz) 


    // housekeeping

    delete item;

    item = NULL;

    item = 0;



    return mybundle;

}