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

Commit e22a64b6 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Remove codec callback for now. 

Change-Id: I7ef3c1fc7aa1bfec958e6ea58bf95ae35a575e91
parent 7ac00396

include/ndk/NdkMediaCodec.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -163,17 +163,6 @@ media_status_t AMediaCodec_releaseOutputBuffer(AMediaCodec*, size_t idx, bool re 
media_status_t AMediaCodec_releaseOutputBufferAtTime(

media_status_t AMediaCodec_releaseOutputBufferAtTime(

        AMediaCodec *mData, size_t idx, int64_t timestampNs);

        AMediaCodec *mData, size_t idx, int64_t timestampNs);





typedef void (*OnCodecEvent)(AMediaCodec *codec, void *userdata);



/**

 * Set a callback to be called when a new buffer is available, or there was a format

 * or buffer change.

 * Note that you cannot perform any operations on the mediacodec from within the callback.

 * If you need to perform mediacodec operations, you must do so on a different thread.

 */

media_status_t AMediaCodec_setNotificationCallback(

        AMediaCodec*, OnCodecEvent callback, void *userdata);







typedef enum {

typedef enum {

    AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,

    AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,

media/ndk/NdkMediaCodec.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,8 @@ public: 
    virtual void onMessageReceived(const sp<AMessage> &msg);

    virtual void onMessageReceived(const sp<AMessage> &msg);

};

};





typedef void (*OnCodecEvent)(AMediaCodec *codec, void *userdata);



struct AMediaCodec {

struct AMediaCodec {

    sp<android::MediaCodec> mCodec;

    sp<android::MediaCodec> mCodec;

    sp<ALooper> mLooper;

    sp<ALooper> mLooper;
@@ -347,7 +349,7 @@ media_status_t AMediaCodec_releaseOutputBufferAtTime( 
    return translate_error(mData->mCodec->renderOutputBufferAndRelease(idx, timestampNs));

    return translate_error(mData->mCodec->renderOutputBufferAndRelease(idx, timestampNs));

}

}





EXPORT

//EXPORT

media_status_t AMediaCodec_setNotificationCallback(AMediaCodec *mData, OnCodecEvent callback, void *userdata) {

media_status_t AMediaCodec_setNotificationCallback(AMediaCodec *mData, OnCodecEvent callback, void *userdata) {

    mData->mCallback = callback;

    mData->mCallback = callback;

    mData->mCallbackUserData = userdata;

    mData->mCallbackUserData = userdata;