diff options
| author | Lajos Molnar <lajos@google.com> | 2014-06-06 23:03:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 23:03:30 +0000 |
| commit | 62df539321b3079f5ff11bb6aeaaab75ef307d40 (patch) | |
| tree | 91f96fdeb425e00bf7c0d5a6e609315952b2739b /include | |
| parent | e5fc7320c12f353d61b1cf7de1c5ec2b1a1c1055 (diff) | |
| parent | 8a45461198c69e9e15f133c2e11ded47fc4c708b (diff) | |
| download | frameworks_av-62df539321b3079f5ff11bb6aeaaab75ef307d40.zip frameworks_av-62df539321b3079f5ff11bb6aeaaab75ef307d40.tar.gz frameworks_av-62df539321b3079f5ff11bb6aeaaab75ef307d40.tar.bz2 | |
am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev
* commit '8a45461198c69e9e15f133c2e11ded47fc4c708b':
stagefright: added support, and SoftOMX decoder, for HEVC
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index e862ec3..d38d976 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -53,6 +53,7 @@ enum { kKeyESDS = 'esds', // raw data kKeyAACProfile = 'aacp', // int32_t kKeyAVCC = 'avcc', // raw data + kKeyHVCC = 'hvcc', // raw data kKeyD263 = 'd263', // raw data kKeyVorbisInfo = 'vinf', // raw data kKeyVorbisBooks = 'vboo', // raw data @@ -170,6 +171,7 @@ enum { enum { kTypeESDS = 'esds', kTypeAVCC = 'avcc', + kTypeHVCC = 'hvcc', kTypeD263 = 'd263', }; diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 5121c17..5590b60 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -352,6 +352,9 @@ private: int64_t getDecodingTimeUs(); + status_t parseHEVCCodecSpecificData( + const void *data, size_t size, + unsigned *profile, unsigned *level); status_t parseAVCCodecSpecificData( const void *data, size_t size, unsigned *profile, unsigned *level); |