From 0ba57d0b8c88bc595732c97091f50422c89e6ac1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 26 Nov 2017 16:07:13 +0000 Subject: [PATCH] codecparsers: mpegvideoparser: remove API that was deprecated 5 years ago Libraries in -bad are not covered by our API/ABI stability guarantees, and to the best of our knowledge everyone using this API has moved to the replacement APIs ages ago. --- docs/libs/gst-plugins-bad-libs-sections.txt | 16 +- gst-libs/gst/codecparsers/gstmpegvideoparser.c | 225 ------------------------- gst-libs/gst/codecparsers/gstmpegvideoparser.h | 30 ---- win32/common/libgstcodecparsers.def | 7 - 4 files changed, 9 insertions(+), 269 deletions(-) diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt index c0b35e9..a322063 100644 --- a/docs/libs/gst-plugins-bad-libs-sections.txt +++ b/docs/libs/gst-plugins-bad-libs-sections.txt @@ -163,13 +163,15 @@ GstMpegVideoPictureExt GstMpegVideoQuantMatrixExt GstMpegVideoTypeOffsetSize gst_mpeg_video_parse -gst_mpeg_video_parse_sequence_header -gst_mpeg_video_parse_picture_header -gst_mpeg_video_parse_picture_extension -gst_mpeg_video_parse_gop -gst_mpeg_video_parse_sequence_extension -gst_mpeg_video_parse_sequence_display_extension -gst_mpeg_video_parse_quant_matrix_extension +gst_mpeg_video_packet_parse_sequence_header +gst_mpeg_video_packet_parse_sequence_extension +gst_mpeg_video_packet_parse_sequence_display_extension +gst_mpeg_video_packet_parse_sequence_scalable_extension +gst_mpeg_video_packet_parse_picture_header +gst_mpeg_video_packet_parse_picture_extension +gst_mpeg_video_packet_parse_gop +gst_mpeg_video_packet_parse_slice_header +gst_mpeg_video_packet_parse_quant_matrix_extension gst_mpeg_video_finalise_mpeg2_sequence_header gst_mpeg_video_quant_matrix_get_raster_from_zigzag gst_mpeg_video_quant_matrix_get_zigzag_from_raster diff --git a/gst-libs/gst/codecparsers/gstmpegvideoparser.c b/gst-libs/gst/codecparsers/gstmpegvideoparser.c index a9d575f..5d0e6a7 100644 --- a/gst-libs/gst/codecparsers/gstmpegvideoparser.c +++ b/gst-libs/gst/codecparsers/gstmpegvideoparser.c @@ -1060,228 +1060,3 @@ gst_mpeg_video_quant_matrix_get_zigzag_from_raster (guint8 out_quant[64], for (i = 0; i < 64; i++) out_quant[i] = quant[mpeg_zigzag_8x8[i]]; } - -/****** Deprecated API *******/ - -/** - * gst_mpeg_video_parse_sequence_header: - * @seqhdr: (out): The #GstMpegVideoSequenceHdr structure to fill - * @data: The data from which to parse the sequence header - * @size: The size of @data - * @offset: The offset in byte from which to start parsing @data - * - * Parses the @seqhdr Mpeg Video Sequence Header structure members from @data - * - * Returns: %TRUE if the seqhdr could be parsed correctly, %FALSE otherwise. - * - * Deprecated: Use gst_mpeg_video_packet_parse_sequence_header() instead. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_sequence_header (GstMpegVideoSequenceHdr * seqhdr, - const guint8 * data, gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_sequence_header (GstMpegVideoSequenceHdr * seqhdr, - const guint8 * data, gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_SEQUENCE; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_sequence_header (&packet, seqhdr); -} -#endif - -/** - * gst_mpeg_video_parse_sequence_extension: - * @seqext: (out): The #GstMpegVideoSequenceExt structure to fill - * @data: The data from which to parse the sequence extension - * @size: The size of @data - * @offset: The offset in byte from which to start parsing @data - * - * Parses the @seqext Mpeg Video Sequence Extension structure members from @data - * - * Returns: %TRUE if the seqext could be parsed correctly, %FALSE otherwise. - * - * Deprecated: Use gst_mpeg_video_packet_parse_sequence_extension() instead. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_sequence_extension (GstMpegVideoSequenceExt * seqext, - const guint8 * data, gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_sequence_extension (GstMpegVideoSequenceExt * seqext, - const guint8 * data, gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_EXTENSION; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_sequence_extension (&packet, seqext); -} -#endif - -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_sequence_display_extension (GstMpegVideoSequenceDisplayExt - * seqdisplayext, const guint8 * data, gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_sequence_display_extension (GstMpegVideoSequenceDisplayExt - * seqdisplayext, const guint8 * data, gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_EXTENSION; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_sequence_display_extension (&packet, - seqdisplayext); -} -#endif - -/** - * gst_mpeg_video_parse_quant_matrix_extension: - * @quant: (out): The #GstMpegVideoQuantMatrixExt structure to fill - * @data: The data from which to parse the Quantization Matrix extension - * @size: The size of @data - * @offset: The offset in byte from which to start the parsing - * - * Parses the @quant Mpeg Video Quant Matrix Extension structure members from - * @data - * - * Returns: %TRUE if the quant matrix extension could be parsed correctly, - * %FALSE otherwise. - * - * Deprecated: Use gst_mpeg_video_packet_parse_quant_matrix_extension() instead. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_quant_matrix_extension (GstMpegVideoQuantMatrixExt * quant, - const guint8 * data, gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_quant_matrix_extension (GstMpegVideoQuantMatrixExt * quant, - const guint8 * data, gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_EXTENSION; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_quant_matrix_extension (&packet, quant); -} -#endif - -/** - * gst_mpeg_video_parse_picture_header: - * @hdr: (out): The #GstMpegVideoPictureHdr structure to fill - * @data: The data from which to parse the picture header - * @size: The size of @data - * @offset: The offset in byte from which to start the parsing - * - * Parsers the @hdr Mpeg Video Picture Header structure members from @data - * - * Returns: %TRUE if the picture sequence could be parsed correctly, %FALSE - * otherwise. - * - * Deprecated: Use gst_mpeg_video_packet_parse_picture_header() instead. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_picture_header (GstMpegVideoPictureHdr * hdr, - const guint8 * data, gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_picture_header (GstMpegVideoPictureHdr * hdr, - const guint8 * data, gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_PICTURE; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_picture_header (&packet, hdr); -} -#endif - -/** - * gst_mpeg_video_parse_picture_extension: - * @ext: (out): The #GstMpegVideoPictureExt structure to fill - * @data: The data from which to parse the picture extension - * @size: The size of @data - * @offset: The offset in byte from which to start the parsing - * - * Parse the @ext Mpeg Video Picture Extension structure members from @data - * - * Returns: %TRUE if the picture extension could be parsed correctly, - * %FALSE otherwise. - * - * Deprecated: Use gst_mpeg_video_packet_parse_picture_extension() instead. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_picture_extension (GstMpegVideoPictureExt * ext, - const guint8 * data, gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_picture_extension (GstMpegVideoPictureExt * ext, - const guint8 * data, gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_EXTENSION; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_picture_extension (&packet, ext); -} -#endif - -/** - * gst_mpeg_video_parse_gop: - * @gop: (out): The #GstMpegVideoGop structure to fill - * @data: The data from which to parse the gop - * @size: The size of @data - * @offset: The offset in byte from which to start the parsing - * - * Parses the @gop Mpeg Video Group of Picture structure members from @data - * - * Returns: %TRUE if the gop could be parsed correctly, %FALSE otherwise. - * - * Deprecated: Use gst_mpeg_video_packet_parse_gop() instead. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gboolean -gst_mpeg_video_parse_gop (GstMpegVideoGop * gop, const guint8 * data, - gsize size, guint offset); -#endif -gboolean -gst_mpeg_video_parse_gop (GstMpegVideoGop * gop, const guint8 * data, - gsize size, guint offset) -{ - GstMpegVideoPacket packet; - - packet.data = data; - packet.type = GST_MPEG_VIDEO_PACKET_GOP; - packet.offset = offset; - packet.size = size - offset; - return gst_mpeg_video_packet_parse_gop (&packet, gop); -} -#endif diff --git a/gst-libs/gst/codecparsers/gstmpegvideoparser.h b/gst-libs/gst/codecparsers/gstmpegvideoparser.h index d44497c..6a6c56a 100644 --- a/gst-libs/gst/codecparsers/gstmpegvideoparser.h +++ b/gst-libs/gst/codecparsers/gstmpegvideoparser.h @@ -549,36 +549,6 @@ GST_EXPORT gboolean gst_mpeg_video_finalise_mpeg2_sequence_header (GstMpegVideoSequenceHdr *hdr, GstMpegVideoSequenceExt *seqext, GstMpegVideoSequenceDisplayExt *displayext); -#ifndef GST_DISABLE_DEPRECATED -GST_EXPORT -gboolean gst_mpeg_video_parse_picture_header (GstMpegVideoPictureHdr* hdr, - const guint8 * data, gsize size, guint offset); - -GST_EXPORT -gboolean gst_mpeg_video_parse_picture_extension (GstMpegVideoPictureExt *ext, - const guint8 * data, gsize size, guint offset); - -GST_EXPORT -gboolean gst_mpeg_video_parse_gop (GstMpegVideoGop * gop, - const guint8 * data, gsize size, guint offset); - -GST_EXPORT -gboolean gst_mpeg_video_parse_sequence_header (GstMpegVideoSequenceHdr * seqhdr, - const guint8 * data, gsize size, guint offset); - -GST_EXPORT -gboolean gst_mpeg_video_parse_sequence_extension (GstMpegVideoSequenceExt * seqext, - const guint8 * data, gsize size, guint offset); - -GST_EXPORT -gboolean gst_mpeg_video_parse_sequence_display_extension (GstMpegVideoSequenceDisplayExt * seqdisplayext, - const guint8 * data, gsize size, guint offset); - -GST_EXPORT -gboolean gst_mpeg_video_parse_quant_matrix_extension (GstMpegVideoQuantMatrixExt * quant, - const guint8 * data, gsize size, guint offset); -#endif - GST_EXPORT void gst_mpeg_video_quant_matrix_get_raster_from_zigzag (guint8 out_quant[64], const guint8 quant[64]); diff --git a/win32/common/libgstcodecparsers.def b/win32/common/libgstcodecparsers.def index 4e3cfa2..1d9b214 100644 --- a/win32/common/libgstcodecparsers.def +++ b/win32/common/libgstcodecparsers.def @@ -84,13 +84,6 @@ EXPORTS gst_mpeg_video_packet_parse_sequence_scalable_extension gst_mpeg_video_packet_parse_slice_header gst_mpeg_video_parse - gst_mpeg_video_parse_gop - gst_mpeg_video_parse_picture_extension - gst_mpeg_video_parse_picture_header - gst_mpeg_video_parse_quant_matrix_extension - gst_mpeg_video_parse_sequence_display_extension - gst_mpeg_video_parse_sequence_extension - gst_mpeg_video_parse_sequence_header gst_mpeg_video_quant_matrix_get_raster_from_zigzag gst_mpeg_video_quant_matrix_get_zigzag_from_raster gst_vc1_bitplanes_ensure_size -- 2.7.4