diff options
| author | Marco Nelissen <marcone@google.com> | 2014-06-04 00:27:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-04 00:27:02 +0000 |
| commit | 0d843fdc91c98d447c3c3e357020d07b783c7bc0 (patch) | |
| tree | b105aa72b713eeba23620777b51607cbceb43ea6 /media | |
| parent | 61378ccba48bb826988cdc585b264fdd999e1e6a (diff) | |
| parent | 63141c4356b4f885d3926247df508df3515e41a7 (diff) | |
| download | frameworks_av-0d843fdc91c98d447c3c3e357020d07b783c7bc0.zip frameworks_av-0d843fdc91c98d447c3c3e357020d07b783c7bc0.tar.gz frameworks_av-0d843fdc91c98d447c3c3e357020d07b783c7bc0.tar.bz2 | |
Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/ndk/NdkMediaCodec.cpp | 6 | ||||
| -rw-r--r-- | media/ndk/NdkMediaCrypto.cpp | 2 | ||||
| -rw-r--r-- | media/ndk/NdkMediaDrm.cpp | 2 | ||||
| -rw-r--r-- | media/ndk/NdkMediaExtractor.cpp | 4 | ||||
| -rw-r--r-- | media/ndk/NdkMediaFormat.cpp | 2 | ||||
| -rw-r--r-- | media/ndk/NdkMediaMuxer.cpp | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index bd2541f..c5d8858 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -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; diff --git a/media/ndk/NdkMediaCrypto.cpp b/media/ndk/NdkMediaCrypto.cpp index cbadea5..1cc2f1a 100644 --- a/media/ndk/NdkMediaCrypto.cpp +++ b/media/ndk/NdkMediaCrypto.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "NdkMediaCrypto" diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp index a0cbb70..7a1048c 100644 --- a/media/ndk/NdkMediaDrm.cpp +++ b/media/ndk/NdkMediaDrm.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "NdkMediaDrm" #include "NdkMediaDrm.h" diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp index b0a9590..492e002 100644 --- a/media/ndk/NdkMediaExtractor.cpp +++ b/media/ndk/NdkMediaExtractor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "NdkMediaExtractor" @@ -205,7 +205,7 @@ int AMediaExtractor_getSampleTrackIndex(AMediaExtractor *mData) { } EXPORT -int64_t AMediaExtractor_getSampletime(AMediaExtractor *mData) { +int64_t AMediaExtractor_getSampleTime(AMediaExtractor *mData) { int64_t time; if (mData->mImpl->getSampleTime(&time) != OK) { return -1; diff --git a/media/ndk/NdkMediaFormat.cpp b/media/ndk/NdkMediaFormat.cpp index 77018ec..67dc2c2 100644 --- a/media/ndk/NdkMediaFormat.cpp +++ b/media/ndk/NdkMediaFormat.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "NdkMediaFormat" diff --git a/media/ndk/NdkMediaMuxer.cpp b/media/ndk/NdkMediaMuxer.cpp index 50fc336..b1b0362 100644 --- a/media/ndk/NdkMediaMuxer.cpp +++ b/media/ndk/NdkMediaMuxer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "NdkMediaMuxer" |