summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaCodec.cpp
diff options
context:
space:
mode:
authorRay Essick <essick@google.com>2019-12-07 06:24:59 -0800
committerRay Essick <essick@google.com>2019-12-16 20:05:00 -0800
commit81fbc5b6a9ed21f3d04b34a05c874543b0a884a8 (patch)
treef716552aa1d8c979549a52e89e75065e72a73338 /media/jni/android_media_MediaCodec.cpp
parent10f905e1dee616f3a4286419af28fd33ed33e9c9 (diff)
Naming consistency: MediaAnalytics to MediaMetrics
Bug: 145780674 Test: build, boot, dumpsys media.metrics Test: atest mediametrics_tests CtsNativeMediaMetricsTestCases Change-Id: Id0b6b2e37dfa986623e127a9dbc3c7e4483b2de3
Diffstat (limited to 'media/jni/android_media_MediaCodec.cpp')
-rw-r--r--media/jni/android_media_MediaCodec.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 05aaa82f8ac8..20980a90e9fe 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -742,11 +742,11 @@ status_t JMediaCodec::getCodecInfo(JNIEnv *env, jobject *codecInfoObject) const
return OK;
}
-status_t JMediaCodec::getMetrics(JNIEnv *, MediaAnalyticsItem * &reply) const {
- mediametrics_handle_t reply2 = MediaAnalyticsItem::convert(reply);
+status_t JMediaCodec::getMetrics(JNIEnv *, mediametrics::Item * &reply) const {
+ mediametrics_handle_t reply2 = mediametrics::Item::convert(reply);
status_t status = mCodec->getMetrics(reply2);
// getMetrics() updates reply2, pass the converted update along to our caller.
- reply = MediaAnalyticsItem::convert(reply2);
+ reply = mediametrics::Item::convert(reply2);
return status;
}
@@ -1850,7 +1850,7 @@ android_media_MediaCodec_native_getMetrics(JNIEnv *env, jobject thiz)
}
// get what we have for the metrics from the codec
- MediaAnalyticsItem *item = 0;
+ mediametrics::Item *item = 0;
status_t err = codec->getMetrics(env, item);
if (err != OK) {