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

Commit 0bab538b authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Mediacodec to use C interface to mediametrics"

parents d7fad5f8 fc0a4731

media/codec2/sfplugin/CCodecBufferChannel.cpp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <android/hardware/cas/native/1.0/IDescrambler.h>

#include <android-base/stringprintf.h>

#include <binder/MemoryDealer.h>

#include <cutils/properties.h>

#include <gui/Surface.h>

#include <media/openmax/OMX_Core.h>

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

media/libmediametrics/MediaAnalyticsItem.cpp

+10 −0
Original line number Diff line number Diff line
@@ -64,6 +64,16 @@ MediaAnalyticsItem *MediaAnalyticsItem::create(MediaAnalyticsItem::Key key) 
    return item;

}



MediaAnalyticsItem* MediaAnalyticsItem::convert(mediametrics_handle_t handle) {

    MediaAnalyticsItem *item = (android::MediaAnalyticsItem *) handle;

    return item;

}



mediametrics_handle_t MediaAnalyticsItem::convert(MediaAnalyticsItem *item ) {

    mediametrics_handle_t handle = (mediametrics_handle_t) item;

    return handle;

}



// access functions for the class

MediaAnalyticsItem::MediaAnalyticsItem()

    : mPid(-1),

media/libmediametrics/MediaMetrics.cpp

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ bool mediametrics_selfRecord(mediametrics_handle_t handle) { 
    return item->selfrecord();

}



mediametrics_handle_t mediametrics_dup(mediametrics_handle_t handle) {

    android::MediaAnalyticsItem *item = (android::MediaAnalyticsItem *) handle;

    if (item == NULL) return android::MediaAnalyticsItem::convert(item);

    return android::MediaAnalyticsItem::convert(item->dup());

}



const char *mediametrics_readable(mediametrics_handle_t handle) {

    android::MediaAnalyticsItem *item = (android::MediaAnalyticsItem *) handle;

media/libmediametrics/include/MediaAnalyticsItem.h

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef ANDROID_MEDIA_MEDIAANALYTICSITEM_H

#define ANDROID_MEDIA_MEDIAANALYTICSITEM_H



#include "MediaMetrics.h"



#include <string>

#include <sys/types.h>
@@ -94,6 +96,9 @@ class MediaAnalyticsItem { 
        static MediaAnalyticsItem* create(Key key);

        static MediaAnalyticsItem* create();



        static MediaAnalyticsItem* convert(mediametrics_handle_t);

        static mediametrics_handle_t convert(MediaAnalyticsItem *);



        // access functions for the class

        ~MediaAnalyticsItem();

media/libmediametrics/include/MediaMetrics.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ void mediametrics_freeCString(char *value); 
// # of attributes set within this record.

int32_t mediametrics_count(mediametrics_handle_t handle);



mediametrics_handle_t mediametrics_dup(mediametrics_handle_t handle);

bool mediametrics_selfRecord(mediametrics_handle_t handle);



const char *mediametrics_readable(mediametrics_handle_t handle);