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

Commit 4b90597d authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "Naming consistency: MediaAnalytics to MediaMetrics"

parents 0d52f420 81fbc5b6

core/jni/android_media_AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ android_media_AudioRecord_native_getMetrics(JNIEnv *env, jobject thiz) 
    }



    // get what we have for the metrics from the record session

    MediaAnalyticsItem *item = NULL;

    mediametrics::Item *item = NULL;



    status_t err = lpRecord->getMetrics(item);

    if (err != OK) {

core/jni/android_media_AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ android_media_AudioTrack_native_getMetrics(JNIEnv *env, jobject thiz) 
    }



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

    MediaAnalyticsItem *item = NULL;

    mediametrics::Item *item = NULL;



    status_t err = lpTrack->getMetrics(item);

    if (err != OK) {

media/jni/android_media_MediaCodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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) {

media/jni/android_media_MediaCodec.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include "jni.h"



#include <media/MediaAnalyticsItem.h>

#include <media/MediaMetricsItem.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/ABase.h>

#include <media/stagefright/foundation/AHandler.h>
@@ -124,7 +124,7 @@ struct JMediaCodec : public AHandler { 


    status_t getCodecInfo(JNIEnv *env, jobject *codecInfo) const;



    status_t getMetrics(JNIEnv *env, MediaAnalyticsItem * &reply) const;

    status_t getMetrics(JNIEnv *env, mediametrics::Item * &reply) const;



    status_t setParameters(const sp<AMessage> &params);

media/jni/android_media_MediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ android_media_MediaExtractor_native_getMetrics(JNIEnv * env, jobject thiz) 
    }



    // build and return the Bundle

    std::unique_ptr<MediaAnalyticsItem> item(MediaAnalyticsItem::create());

    std::unique_ptr<mediametrics::Item> item(mediametrics::Item::create());

    item->readFromParcel(reply);

    jobject mybundle = MediaMetricsJNI::writeMetricsToBundle(env, item.get(), NULL);