On Tue, 3 Oct 2017 09:26:39 -0400
Vittorio Giovara <vittorio.giov...@gmail.com> wrote:
> Implement detection in h264 and hevc and insertion in framepack filter.
>
> Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
> ---
> doc/APIchanges | 3 +++
> libavcodec/h264_sei.c | 7 ++++---
> libavcodec/h264_sei.h | 1 +
> libavcodec/h264_slice.c | 7 +++++++
> libavcodec/hevc_sei.c | 9 +++++----
> libavcodec/hevc_sei.h | 1 +
> libavcodec/hevcdec.c | 7 +++++++
> libavfilter/vf_framepack.c | 2 ++
> libavutil/stereo3d.h | 24 ++++++++++++++++++++++++
> libavutil/version.h | 2 +-
> 10 files changed, 55 insertions(+), 8 deletions(-)
>
> diff --git a/doc/APIchanges b/doc/APIchanges
> index fa27007f44..b518b6307f 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -13,6 +13,9 @@ libavutil: 2017-03-23
>
> API changes, most recent first:
>
> +2017-xx-xx - xxxxxxx - lavu 56.7.0 - stereo3d.h
> + Add view field to AVStereo3D structure and AVStereo3DView enum.
> +
> 2017-xx-xx - xxxxxxx - lavu 56.6.0 - pixdesc.h
> Add av_color_range_from_name(), av_color_primaries_from_name(),
> av_color_transfer_from_name(), av_color_space_from_name(), and
> diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
> index 03fca9017f..da5d33c36c 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 f6ac6034da..c3a19dd831 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 5dd01d836e..1b968ebd50 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 0a5d4440bf..2bf170601d 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 e4aeac1fbe..8d4f5df69f 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 a1619cf4bd..f1d1c77497 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 &&
> diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c
> index fd0c1897d5..64457b4501 100644
> --- a/libavfilter/vf_framepack.c
> +++ b/libavfilter/vf_framepack.c
> @@ -310,6 +310,8 @@ static int request_frame(AVFilterLink *outlink)
> if (!stereo)
> return AVERROR(ENOMEM);
> stereo->type = s->format;
> + stereo->view = i == LEFT ? AV_STEREO3D_VIEW_LEFT
> + : AV_STEREO3D_VIEW_RIGHT;
>
> // filter the frame and immediately relinquish its pointer
> ret = ff_filter_frame(outlink, s->input_views[i]);
> diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h
> index 0fa9f63a2c..2d7cb8d4aa 100644
> --- a/libavutil/stereo3d.h
> +++ b/libavutil/stereo3d.h
> @@ -141,6 +141,25 @@ enum AVStereo3DType {
> AV_STEREO3D_COLUMNS,
> };
>
> +/**
> + * List of possible view types.
> + */
> +enum AVStereo3DView {
> + /**
> + * Frame contains two packed views.
> + */
> + AV_STEREO3D_VIEW_PACKED,
> +
> + /**
> + * Frame contains only the left view.
> + */
> + AV_STEREO3D_VIEW_LEFT,
> +
> + /**
> + * Frame contains only the right view.
> + */
> + AV_STEREO3D_VIEW_RIGHT,
> +};
>
> /**
> * Inverted views, Right/Bottom represents the left view.
> @@ -164,6 +183,11 @@ typedef struct AVStereo3D {
> * Additional information about the frame packing.
> */
> int flags;
> +
> + /**
> + * Determines which views are packed.
> + */
> + enum AVStereo3DView view;
> } AVStereo3D;
>
> /**
> diff --git a/libavutil/version.h b/libavutil/version.h
> index c258968b8e..4a9fffef43 100644
> --- a/libavutil/version.h
> +++ b/libavutil/version.h
> @@ -54,7 +54,7 @@
> */
>
> #define LIBAVUTIL_VERSION_MAJOR 56
> -#define LIBAVUTIL_VERSION_MINOR 6
> +#define LIBAVUTIL_VERSION_MINOR 7
> #define LIBAVUTIL_VERSION_MICRO 0
>
> #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
This seems pretty ok.
BUT
I know elenril wants to add MVC soon. Would it be better to make this
side data type more "generic" so that it can accommodate appropriate
MVC per-frame metadata? Like the view number or similar, I suppose.
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
