diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-09-25 15:09:21 +0200 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-11-28 14:56:51 -0500 |
commit | 99e9697e3a12ab4a6638a36b95edafd6a98f9eaa (patch) | |
tree | 6d25232267e3d7822aa3a1b5e080c06b96d6cce6 /libavcodec | |
parent | 45d7be7f930cf707ead07416e10e2d0e061e99ce (diff) | |
download | ffmpeg-streaming-99e9697e3a12ab4a6638a36b95edafd6a98f9eaa.zip ffmpeg-streaming-99e9697e3a12ab4a6638a36b95edafd6a98f9eaa.tar.gz |
stereo3d: Support view type for frame sequence type
Implement detection in h264 and hevc and insertion in framepack filter.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h264_sei.c | 7 | ||||
-rw-r--r-- | libavcodec/h264_sei.h | 1 | ||||
-rw-r--r-- | libavcodec/h264_slice.c | 7 | ||||
-rw-r--r-- | libavcodec/hevc_sei.c | 9 | ||||
-rw-r--r-- | libavcodec/hevc_sei.h | 1 | ||||
-rw-r--r-- | libavcodec/hevcdec.c | 7 |
6 files changed, 25 insertions, 7 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 03fca90..da5d33c 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -314,10 +314,11 @@ static int decode_frame_packing_arrangement(H264SEIFramePacking *h, h->quincunx_subsampling = get_bits1(gb); h->content_interpretation_type = get_bits(gb, 6); - // the following skips: spatial_flipping_flag, frame0_flipped_flag, - // field_views_flag, current_frame_is_frame0_flag, + // spatial_flipping_flag, frame0_flipped_flag, field_views_flag + skip_bits(gb, 3); + h->current_frame_is_frame0_flag = get_bits1(gb); // frame0_self_contained_flag, frame1_self_contained_flag - skip_bits(gb, 6); + skip_bits(gb, 2); if (!h->quincunx_subsampling && h->arrangement_type != 5) skip_bits(gb, 16); // frame[01]_grid_position_[xy] diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h index f6ac603..c3a19dd 100644 --- a/libavcodec/h264_sei.h +++ b/libavcodec/h264_sei.h @@ -108,6 +108,7 @@ typedef struct H264SEIFramePacking { int arrangement_type; int content_interpretation_type; int quincunx_subsampling; + int current_frame_is_frame0_flag; } H264SEIFramePacking; typedef struct H264SEIDisplayOrientation { diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 5dd01d8..1b968eb 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1112,6 +1112,13 @@ static int h264_export_frame_props(H264Context *h) if (fp->content_interpretation_type == 2) stereo->flags = AV_STEREO3D_FLAG_INVERT; + + if (fp->arrangement_type == 5) { + if (fp->current_frame_is_frame0_flag) + stereo->view = AV_STEREO3D_VIEW_LEFT; + else + stereo->view = AV_STEREO3D_VIEW_RIGHT; + } } if (h->sei.display_orientation.present && diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 0a5d444..2bf1706 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -57,10 +57,11 @@ static int decode_nal_sei_frame_packing_arrangement(HEVCSEIFramePacking *s, GetB s->quincunx_subsampling = get_bits1(gb); s->content_interpretation_type = get_bits(gb, 6); - // the following skips spatial_flipping_flag frame0_flipped_flag - // field_views_flag current_frame_is_frame0_flag - // frame0_self_contained_flag frame1_self_contained_flag - skip_bits(gb, 6); + // spatial_flipping_flag, frame0_flipped_flag, field_views_flag + skip_bits(gb, 3); + s->current_frame_is_frame0_flag = get_bits1(gb); + // frame0_self_contained_flag, frame1_self_contained_flag + skip_bits(gb, 2); if (!s->quincunx_subsampling && s->arrangement_type != 5) skip_bits(gb, 16); // frame[01]_grid_position_[xy] diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index e4aeac1..8d4f5df 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -67,6 +67,7 @@ typedef struct HEVCSEIFramePacking { int arrangement_type; int content_interpretation_type; int quincunx_subsampling; + int current_frame_is_frame0_flag; } HEVCSEIFramePacking; typedef struct HEVCSEIDisplayOrientation { diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index a1619cf..f1d1c77 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2397,6 +2397,13 @@ static int set_side_data(HEVCContext *s) if (s->sei.frame_packing.content_interpretation_type == 2) stereo->flags = AV_STEREO3D_FLAG_INVERT; + + if (s->sei.frame_packing.arrangement_type == 5) { + if (s->sei.frame_packing.current_frame_is_frame0_flag) + stereo->view = AV_STEREO3D_VIEW_LEFT; + else + stereo->view = AV_STEREO3D_VIEW_RIGHT; + } } if (s->sei.display_orientation.present && |