Mediacodec to use C interface to mediametrics

Use stable C interface instead of C++ interface.

Bug: 123543273
Bug: 140763926
Test: compilation, boot, dumpsys
Change-Id: Id516998b671e9876567175351ba04959963fee5d
Merged-In: I920b47da1316fb427837795fe3e2f625589f0b4d
This commit is contained in:
Ray Essick
2019-08-26 15:34:10 -07:00
committed by Marco Nelissen
parent c13f012cc5
commit e981a55d0c

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 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;
}