diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:15:34 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:19:43 +0200 |
commit | efc66d69bfb622e874d883e0b304cf18b12e41bd (patch) | |
tree | 01adc68c2448e4f1950c37348db09790b092f875 /libavcodec/hevc_sei.c | |
parent | cd0dc88751db969964e7b40c4d4b5fd446ac1589 (diff) | |
parent | 0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50 (diff) | |
download | ffmpeg-efc66d69bfb622e874d883e0b304cf18b12e41bd.tar.gz |
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
hevc: parse display orientation SEI message
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_sei.c')
-rw-r--r-- | libavcodec/hevc_sei.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 29e76ab972..6dfe69d57e 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -74,6 +74,21 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) skip_bits1(gb); // upsampled_aspect_ratio_flag } +static void decode_nal_sei_display_orientation(HEVCContext *s) +{ + GetBitContext *gb = &s->HEVClc->gb; + + s->sei_display_orientation_present = !get_bits1(gb); + + if (s->sei_display_orientation_present) { + s->sei_hflip = get_bits1(gb); // hor_flip + s->sei_vflip = get_bits1(gb); // ver_flip + + s->sei_anticlockwise_rotation = get_bits(gb, 16); + skip_bits1(gb); // display_orientation_persistence_flag + } +} + static int decode_pic_timing(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; @@ -149,6 +164,9 @@ static int decode_nal_sei_message(HEVCContext *s) } else if (payload_type == 45) { decode_nal_sei_frame_packing_arrangement(s); return 1; + } else if (payload_type == 47) { + decode_nal_sei_display_orientation(s); + return 1; } else if (payload_type == 1){ int ret = decode_pic_timing(s); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); |