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

Commit d35a9c75 authored by Ray Essick's avatar Ray Essick
Browse files

mediaplayer2 uses the new mediametrics C apis 

cut mediaplayer2 over to use the new mediametrics C apis to support
updateable components.

Bug: 112555455
Test: boot
Change-Id: I35150dc5445b6597fce739395d0132bcd29366b4
parent c535a55c

media/jni/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ cc_library_shared { 
        "libhidlbase",

        "libhidlmemory",



        "libmediametrics_stable",

        "libmediametrics",	// until player2 starts calling the stable interface

        "libmediametrics",

        "libbinder",  // Used by JWakeLock and MediaMetrics.



        "libutils",  // Have to use shared lib to make libandroid_runtime behave correctly.

media/jni/android_media_MediaPlayer2.cpp

+5 −10
Original line number Diff line number Diff line
@@ -786,22 +786,17 @@ android_media_MediaPlayer2_native_getMetrics(JNIEnv *env, jobject thiz) 
        return 0;

    }



    Parcel p;

    int key = FOURCC('m','t','r','X');

    status_t status = mp->getParameter(key, &p);

    char *buffer = NULL;

    size_t length = 0;

    status_t status = mp->getMetrics(&buffer, &length);

    if (status != OK) {

        ALOGD("getMetrics() failed: %d", status);

        return (jobject) NULL;

    }



    p.setDataPosition(0);

    MediaAnalyticsItem *item = new MediaAnalyticsItem;

    item->readFromParcel(p);

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

    jobject mybundle = MediaMetricsJNI::writeAttributesToBundle(env, NULL, buffer, length);



    // housekeeping

    delete item;

    item = NULL;

    free(buffer);



    return mybundle;

}