Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mediacodec to use C interface to mediametrics"

Browse Source
This commit is contained in:
Marco Nelissen
2020-01-06 23:42:33 +00:00
committed by Gerrit Code Review
parent 13beb87783 e981a55d0c
commit 3f51e53b12
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/jni/android_media_MediaCodec.cpp
View File

@@ -743,8 +743,10 @@ status_t JMediaCodec::getCodecInfo(JNIEnv *env, jobject *codecInfoObject) const
} }
status_t JMediaCodec::getMetrics(JNIEnv *, MediaAnalyticsItem * &reply) const { status_t JMediaCodec::getMetrics(JNIEnv *, MediaAnalyticsItem * &reply) const {
mediametrics_handle_t reply2 = MediaAnalyticsItem::convert(reply);
status_t status = mCodec->getMetrics(reply); status_t status = mCodec->getMetrics(reply2);
// getMetrics() updates reply2, pass the converted update along to our caller.
reply = MediaAnalyticsItem::convert(reply2);
return status; 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 // get what we have for the metrics from the codec
MediaAnalyticsItem *item = NULL; MediaAnalyticsItem *item = 0;
status_t err = codec->getMetrics(env, item); status_t err = codec->getMetrics(env, item);
if (err != OK) { if (err != OK) {
@@ -1860,7 +1862,7 @@ android_media_MediaCodec_native_getMetrics(JNIEnv *env, jobject thiz)
// housekeeping // housekeeping
delete item; delete item;
item = NULL; item = 0;
return mybundle; return mybundle;
} }