diff options
| author | James Dong <jdong@google.com> | 2010-06-08 11:58:53 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2010-06-08 12:30:58 -0700 |
| commit | ddcc4a66d848deef6fb4689e64e30cd9bd2684fe (patch) | |
| tree | e34375b6ca52818e02b45af527e68e4b42c92be1 /include | |
| parent | 365a963142093a1cd8efdcea76b5f65096a5b115 (diff) | |
| download | frameworks_av-ddcc4a66d848deef6fb4689e64e30cd9bd2684fe.zip frameworks_av-ddcc4a66d848deef6fb4689e64e30cd9bd2684fe.tar.gz frameworks_av-ddcc4a66d848deef6fb4689e64e30cd9bd2684fe.tar.bz2 | |
Remove some hard-coded encoding parameters
Change-Id: I7a8ccd5d57891a6a585c8da2ee53acb094955913
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 11 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index dc2bd50..6a20602 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -30,10 +30,13 @@ namespace android { // The following keys map to int32_t data unless indicated otherwise. enum { kKeyMIMEType = 'mime', // cstring - kKeyWidth = 'widt', - kKeyHeight = 'heig', - kKeyChannelCount = '#chn', - kKeySampleRate = 'srte', + kKeyWidth = 'widt', // int32_t + kKeyHeight = 'heig', // int32_t + kKeyIFramesInterval = 'ifiv', // int32_t + kKeyStride = 'strd', // int32_t + kKeySliceHeight = 'slht', // int32_t + kKeyChannelCount = '#chn', // int32_t + kKeySampleRate = 'srte', // int32_t kKeyBitRate = 'brte', // int32_t (bps) kKeyESDS = 'esds', // raw data kKeyAVCC = 'avcc', // raw data diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index aceeab8..3fbb469 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -166,11 +166,10 @@ private: OMX_COLOR_FORMATTYPE colorFormat); void setVideoInputFormat( - const char *mime, OMX_U32 width, OMX_U32 height, - OMX_U32 frameRate, OMX_U32 bitRate); + const char *mime, const sp<MetaData>& meta); - status_t setupMPEG4EncoderParameters(); - status_t setupAVCEncoderParameters(); + status_t setupMPEG4EncoderParameters(const sp<MetaData>& meta); + status_t setupAVCEncoderParameters(const sp<MetaData>& meta); status_t setVideoOutputFormat( const char *mime, OMX_U32 width, OMX_U32 height); |