diff options
| author | Andreas Huber <andih@google.com> | 2009-08-19 09:29:34 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-08-19 09:37:46 -0700 |
| commit | 4f5e602e1773a2990bb1f34f09875bd5cd057e5a (patch) | |
| tree | 24aa72024747f1d7e90729d7fa79ee67fa61d72e /include | |
| parent | a659744041d0b74b4243fdd448a5fa302a581278 (diff) | |
| download | frameworks_base-4f5e602e1773a2990bb1f34f09875bd5cd057e5a.zip frameworks_base-4f5e602e1773a2990bb1f34f09875bd5cd057e5a.tar.gz frameworks_base-4f5e602e1773a2990bb1f34f09875bd5cd057e5a.tar.bz2 | |
The PV AVC software decoder expects each fragment of a NAL unit to be handed to the decoder unframed.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 34 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/OMXDecoder.h | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 2d5b8d8..6ce2581 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -28,23 +28,23 @@ namespace android { enum { - kKeyMIMEType = 'mime', - kKeyWidth = 'widt', - kKeyHeight = 'heig', - kKeyChannelCount = '#chn', - kKeySampleRate = 'srte', - kKeyBitRate = 'brte', - kKeyESDS = 'esds', - kKeyAVCC = 'avcc', - kKeyTimeUnits = '#tim', - kKeyTimeScale = 'scal', - kKeyNeedsNALFraming = 'NALf', - kKeyIsSyncFrame = 'sync', - kKeyDuration = 'dura', - kKeyColorFormat = 'colf', - kKeyPlatformPrivate = 'priv', - kKeyDecoderComponent = 'decC', - kKeyBufferID = 'bfID', + kKeyMIMEType = 'mime', + kKeyWidth = 'widt', + kKeyHeight = 'heig', + kKeyChannelCount = '#chn', + kKeySampleRate = 'srte', + kKeyBitRate = 'brte', + kKeyESDS = 'esds', + kKeyAVCC = 'avcc', + kKeyTimeUnits = '#tim', + kKeyTimeScale = 'scal', + kKeyWantsNALFragments = 'NALf', + kKeyIsSyncFrame = 'sync', + kKeyDuration = 'dura', + kKeyColorFormat = 'colf', + kKeyPlatformPrivate = 'priv', + kKeyDecoderComponent = 'decC', + kKeyBufferID = 'bfID', }; enum { diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index d4ae349..c8ee255 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -79,7 +79,7 @@ private: enum Quirks { kNeedsFlushBeforeDisable = 1, - kWantsRawNALFrames = 2, + kWantsNALFragments = 2, kRequiresLoadedToIdleAfterAllocation = 4, kRequiresAllocateBufferOnInputPorts = 8, }; diff --git a/include/media/stagefright/OMXDecoder.h b/include/media/stagefright/OMXDecoder.h index 0abc5a6..99d803a 100644 --- a/include/media/stagefright/OMXDecoder.h +++ b/include/media/stagefright/OMXDecoder.h @@ -76,7 +76,7 @@ private: }; enum Quirks { - kWantsRawNALFrames = 1, + kWantsNALFragments = 1, kDoesntReturnBuffersOnDisable = 2, kDoesntFlushOnExecutingToIdle = 4, kDoesntProperlyFlushAllPortsAtOnce = 8, |