mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parser: typo fix in enum value

Browse source 
Old value is marked deprecated, new enum with same entry is added. Should be binary compatible.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1318>
This commit is contained in:
Brad Hards 2021-11-07 11:18:15 +11:00 committed by GStreamer Marge Bot
parent d98c78251c
commit 29dd254f7a
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth264parser.h
View file

@ -218,7 +218,8 @@ typedef enum
* @GST_H264_FRAME_PACKING_COLUMN_INTERLEAVING: Column based interleaving * @GST_H264_FRAME_PACKING_COLUMN_INTERLEAVING: Column based interleaving
* @GST_H264_FRAME_PACKING_ROW_INTERLEAVING: Row based interleaving * @GST_H264_FRAME_PACKING_ROW_INTERLEAVING: Row based interleaving
* @GST_H264_FRAME_PACKING_SIDE_BY_SIDE: Side-by-side packing * @GST_H264_FRAME_PACKING_SIDE_BY_SIDE: Side-by-side packing
* @GST_H264_FRMAE_PACKING_TOP_BOTTOM: Top-Bottom packing * @GST_H264_FRMAE_PACKING_TOP_BOTTOM: Deprecated; use GST_H264_FRAME_PACKING_TOP_BOTTOM instead
* @GST_H264_FRAME_PACKING_TOP_BOTTOM: Top-Bottom packing (Since: 1.22)
* @GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING: Temporal interleaving * @GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING: Temporal interleaving
* *
* Frame packing arrangement types. * Frame packing arrangement types.
@ -233,6 +234,7 @@ typedef enum
GST_H264_FRAME_PACKING_ROW_INTERLEAVING = 2, GST_H264_FRAME_PACKING_ROW_INTERLEAVING = 2,
GST_H264_FRAME_PACKING_SIDE_BY_SIDE = 3, GST_H264_FRAME_PACKING_SIDE_BY_SIDE = 3,
GST_H264_FRMAE_PACKING_TOP_BOTTOM = 4, GST_H264_FRMAE_PACKING_TOP_BOTTOM = 4,
GST_H264_FRAME_PACKING_TOP_BOTTOM = 4,
GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING = 5 GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING = 5
} GstH264FramePackingType; } GstH264FramePackingType;

2
subprojects/gst-plugins-bad/sys/msdk/gstmsdkh264enc.c
View file

@ -348,7 +348,7 @@ gst_msdkh264enc_set_format (GstMsdkEnc * encoder)
frame_packing->frame_packing_type = frame_packing->frame_packing_type =
(mode == GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE ? (mode == GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE ?
GST_H264_FRAME_PACKING_SIDE_BY_SIDE : GST_H264_FRAME_PACKING_SIDE_BY_SIDE :
GST_H264_FRMAE_PACKING_TOP_BOTTOM); GST_H264_FRAME_PACKING_TOP_BOTTOM);
/* we don't do this */ /* we don't do this */
frame_packing->quincunx_sampling_flag = 0; frame_packing->quincunx_sampling_flag = 0;
/* 0: unspecified */ /* 0: unspecified */

4
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -2053,7 +2053,7 @@ decode_sei_frame_packing (GstVaapiDecoderH264 * decoder,
priv->stereo_info.mode = GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE; priv->stereo_info.mode = GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE;
} }
break; break;
case GST_H264_FRMAE_PACKING_TOP_BOTTOM: case GST_H264_FRAME_PACKING_TOP_BOTTOM:
priv->stereo_info.mode = GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM; priv->stereo_info.mode = GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM;
break; break;
case GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING: case GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING:
@ -2097,7 +2097,7 @@ decode_sei_frame_packing (GstVaapiDecoderH264 * decoder,
priv->stereo_info.flags |= GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED; priv->stereo_info.flags |= GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED;
} }
} }
if (frame_packing->frame_packing_type == GST_H264_FRMAE_PACKING_TOP_BOTTOM if (frame_packing->frame_packing_type == GST_H264_FRAME_PACKING_TOP_BOTTOM
&& frame_packing->spatial_flipping_flag != && frame_packing->spatial_flipping_flag !=
((priv->stereo_info.flags & ((priv->stereo_info.flags &
GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST) != 0)) { GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST) != 0)) {