diff options
| author | Ray Essick <essick@google.com> | 2019-08-26 15:34:10 -0700 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2019-08-28 15:00:37 -0700 |
| commit | 8268c417438b949becd26e2f4faf581f9958fc64 (patch) | |
| tree | 6b5a0fa469bad91230efb8d4005d3668aacb1cd0 /media/jni/android_media_MediaCodec.cpp | |
| parent | 72fcdcde4c211d259b7c5c24b373f2c05debc1ff (diff) | |
Mediacodec to use C interface to mediametrics
Use stable C interface instead of C++ interface.
Bug: 123543273
Test: compilation, boot, dumpsys
Diffstat (limited to 'media/jni/android_media_MediaCodec.cpp')
| -rw-r--r-- | media/jni/android_media_MediaCodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 8d420e2c5598..cbc820b6fde0 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -743,8 +743,8 @@ 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); return status; } @@ -1848,7 +1848,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 +1860,7 @@ android_media_MediaCodec_native_getMetrics(JNIEnv *env, jobject thiz) // housekeeping delete item; - item = NULL; + item = 0; return mybundle; } |