diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 01:25:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 01:25:38 +0400 |
| commit | 31a52a60c9778e3e39631a9722d4b7db931dc377 (patch) | |
| tree | 20b9bcdd19d1bc3570937308744aca43c24b2e3d /libavcodec/hevc_sei.c | |
| parent | 33dfddf65324dcb28114ea6907071605c2c3857b (diff) | |
| parent | acb77dff6af036192f6064c84f9cccc48582989e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information
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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index af8cb7d60e..2804ef1a9c 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -52,14 +52,14 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; - int cancel, type, quincunx; + int cancel, type, quincunx, content; get_ue_golomb(gb); // frame_packing_arrangement_id cancel = get_bits1(gb); // frame_packing_cancel_flag if (cancel == 0) { type = get_bits(gb, 7); // frame_packing_arrangement_type quincunx = get_bits1(gb); // quincunx_sampling_flag - skip_bits(gb, 6); // content_interpretation_type + content = get_bits(gb, 6); // content_interpretation_type // the following skips spatial_flipping_flag frame0_flipped_flag // field_views_flag current_frame_is_frame0_flag @@ -72,6 +72,11 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) skip_bits1(gb); // frame_packing_arrangement_persistance_flag } skip_bits1(gb); // upsampled_aspect_ratio_flag + + s->sei_frame_packing_present = (cancel == 0); + s->frame_packing_arrangement_type = type; + s->content_interpretation_type = content; + s->quincunx_subsampling = quincunx; } static int decode_pic_timing(HEVCContext *s) |