diff options
| author | Andreas Huber <andih@google.com> | 2010-10-07 14:02:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 14:02:26 -0700 |
| commit | bb70837397e3fb437b7b4443b37d7a83c11e6e43 (patch) | |
| tree | c99194c9284fffd07e07f8cf7f8daf2adef5692e /include | |
| parent | 51501aa8703c15c6156ba14774f3ff41cde31700 (diff) | |
| parent | 949f7d9066e09768e570686a5695aaba4a1dafd0 (diff) | |
| download | frameworks_base-bb70837397e3fb437b7b4443b37d7a83c11e6e43.zip frameworks_base-bb70837397e3fb437b7b4443b37d7a83c11e6e43.tar.gz frameworks_base-bb70837397e3fb437b7b4443b37d7a83c11e6e43.tar.bz2 | |
am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp
* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h index 73d0f77..e44122d 100644 --- a/include/media/stagefright/MediaErrors.h +++ b/include/media/stagefright/MediaErrors.h @@ -39,6 +39,7 @@ enum { // Not technically an error. INFO_FORMAT_CHANGED = MEDIA_ERROR_BASE - 12, + INFO_DISCONTINUITY = MEDIA_ERROR_BASE - 13, }; } // namespace android diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 9badf92..2bb7783 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -32,7 +32,8 @@ struct CodecProfileLevel; struct OMXCodec : public MediaSource, public MediaBufferObserver { enum CreationFlags { - kPreferSoftwareCodecs = 1, + kPreferSoftwareCodecs = 1, + kIgnoreCodecSpecificData = 2 }; static sp<MediaSource> Create( const sp<IOMX> &omx, @@ -248,7 +249,7 @@ private: void dumpPortStatus(OMX_U32 portIndex); - status_t configureCodec(const sp<MetaData> &meta); + status_t configureCodec(const sp<MetaData> &meta, uint32_t flags); static uint32_t getComponentQuirks( const char *componentName, bool isEncoder); |