diff options
| author | Marco Nelissen <marcone@google.com> | 2014-06-02 15:40:15 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-06-03 17:16:35 -0700 |
| commit | 63141c4356b4f885d3926247df508df3515e41a7 (patch) | |
| tree | 4ee33ccac24f4ae0edc49b0906f0b36b6d9972c8 /include | |
| parent | 62aaabb3905c61bb7acd6037414c206240a31c32 (diff) | |
| download | frameworks_av-63141c4356b4f885d3926247df508df3515e41a7.zip frameworks_av-63141c4356b4f885d3926247df508df3515e41a7.tar.gz frameworks_av-63141c4356b4f885d3926247df508df3515e41a7.tar.bz2 | |
Fix typos, remove callback functions - do not merge
b/15414091
Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ndk/NdkMediaCodec.h | 11 | ||||
| -rw-r--r-- | include/ndk/NdkMediaExtractor.h | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h index 2f000d7..c07f4c9 100644 --- a/include/ndk/NdkMediaCodec.h +++ b/include/ndk/NdkMediaCodec.h @@ -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, diff --git a/include/ndk/NdkMediaExtractor.h b/include/ndk/NdkMediaExtractor.h index 5a319d7..7a4e702 100644 --- a/include/ndk/NdkMediaExtractor.h +++ b/include/ndk/NdkMediaExtractor.h @@ -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 |