diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-07 10:51:59 -0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2017-05-09 13:42:20 +0200 |
| commit | cfd25488bf35123bdd38ecbe1107a21df2e03c2f (patch) | |
| tree | 544a492d0ff0420cc68f30038a2c787ecd91a4d2 /libavcodec/hevc_sei.c | |
| parent | 648a0b450387d535567a1569cabb9e3dbe08a3e5 (diff) | |
| download | ffmpeg-cfd25488bf35123bdd38ecbe1107a21df2e03c2f.tar.gz | |
hevcdec: move SEI message parsing into a separate header
It doesn't depend on hevcdec anymore.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/hevc_sei.c')
| -rw-r--r-- | libavcodec/hevc_sei.c | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index b2a0d67882..153d211b4b 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -23,35 +23,8 @@ */ #include "golomb_legacy.h" -#include "hevcdec.h" - -enum HEVC_SEI_TYPE { - SEI_TYPE_BUFFERING_PERIOD = 0, - SEI_TYPE_PICTURE_TIMING = 1, - SEI_TYPE_PAN_SCAN_RECT = 2, - SEI_TYPE_FILLER_PAYLOAD = 3, - SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35 = 4, - SEI_TYPE_USER_DATA_UNREGISTERED = 5, - SEI_TYPE_RECOVERY_POINT = 6, - SEI_TYPE_SCENE_INFO = 9, - SEI_TYPE_FULL_FRAME_SNAPSHOT = 15, - SEI_TYPE_PROGRESSIVE_REFINEMENT_SEGMENT_START = 16, - SEI_TYPE_PROGRESSIVE_REFINEMENT_SEGMENT_END = 17, - SEI_TYPE_FILM_GRAIN_CHARACTERISTICS = 19, - SEI_TYPE_POST_FILTER_HINT = 22, - SEI_TYPE_TONE_MAPPING_INFO = 23, - SEI_TYPE_FRAME_PACKING = 45, - SEI_TYPE_DISPLAY_ORIENTATION = 47, - SEI_TYPE_SOP_DESCRIPTION = 128, - SEI_TYPE_ACTIVE_PARAMETER_SETS = 129, - SEI_TYPE_DECODING_UNIT_INFO = 130, - SEI_TYPE_TEMPORAL_LEVEL0_INDEX = 131, - SEI_TYPE_DECODED_PICTURE_HASH = 132, - SEI_TYPE_SCALABLE_NESTING = 133, - SEI_TYPE_REGION_REFRESH_INFO = 134, - SEI_TYPE_MASTERING_DISPLAY_INFO = 137, - SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO = 144, -}; +#include "hevc.h" +#include "hevc_sei.h" static int decode_nal_sei_decoded_picture_hash(HEVCSEIPictureHash *s, GetBitContext *gb) { @@ -119,9 +92,9 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, switch (type) { case 256: // Mismatched value from HM 8.1 return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb); - case SEI_TYPE_FRAME_PACKING: + case HEVC_SEI_TYPE_FRAME_PACKING: return decode_nal_sei_frame_packing_arrangement(&s->frame_packing, gb); - case SEI_TYPE_DISPLAY_ORIENTATION: + case HEVC_SEI_TYPE_DISPLAY_ORIENTATION: return decode_nal_sei_display_orientation(&s->display_orientation, gb); default: av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type); @@ -134,7 +107,7 @@ static int decode_nal_sei_suffix(GetBitContext *gb, void *logctx, HEVCSEI *s, int type, int size) { switch (type) { - case SEI_TYPE_DECODED_PICTURE_HASH: + case HEVC_SEI_TYPE_DECODED_PICTURE_HASH: return decode_nal_sei_decoded_picture_hash(&s->picture_hash, gb); default: av_log(logctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", type); |