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

Commit 0d843fdc authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev

parents 61378ccb 63141c43

include/ndk/NdkMediaCodec.h

+0 −11
Original line number 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(

        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 {

    AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,

include/ndk/NdkMediaExtractor.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int AMediaExtractor_getSampleTrackIndex(AMediaExtractor*); 
 * Returns the current sample's presentation time in microseconds.

 * or -1 if no more samples are available.

 */

int64_t AMediaExtractor_getSampletime(AMediaExtractor*);

int64_t AMediaExtractor_getSampleTime(AMediaExtractor*);



/**

 * Advance to the next sample. Returns false if no more sample data

media/ndk/NdkMediaCodec.cpp

+4 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0

#define LOG_TAG "NdkMediaCodec"



#include "NdkMediaCodec.h"
@@ -61,6 +61,8 @@ public: 
    virtual void onMessageReceived(const sp<AMessage> &msg);

};



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



struct AMediaCodec {

    sp<android::MediaCodec> mCodec;

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

}



EXPORT

//EXPORT

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

    mData->mCallback = callback;

    mData->mCallbackUserData = userdata;

media/ndk/NdkMediaCrypto.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0

#define LOG_TAG "NdkMediaCrypto"

media/ndk/NdkMediaDrm.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0

#define LOG_TAG "NdkMediaDrm"



#include "NdkMediaDrm.h"