mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 18:35:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpeg2: fix PAR calculation from commit bd11bae.

Browse source 
Invoke gst_mpeg_video_finalise_mpeg2_sequence_header() to get the
correct PAR values. While doing so, require a newer version of the
bitstream parser library.

Note: it may be necessary to also parse the Sequence_Display_Extension()
header.

Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Sreerenj Balachandran 2012-11-08 11:40:47 +02:00 committed by Gwenole Beauchesne
parent ca8b5035de
commit 9367c8ea58
3 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
configure.ac
View file

@ -214,6 +214,30 @@ dnl ... bitstream parsers
PKG_CHECK_MODULES([GST_CODEC_PARSERS], PKG_CHECK_MODULES([GST_CODEC_PARSERS],
[gstreamer-codecparsers-$GST_MAJORMINOR >= gst_plugins_bad_version]) [gstreamer-codecparsers-$GST_MAJORMINOR >= gst_plugins_bad_version])
dnl ... MPEG-2 parser, with the required extensions
AC_CACHE_CHECK([for MPEG-2 parser],
ac_cv_have_gst_mpeg2_parser, [
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
saved_LIBS="$LIBS"
LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <gst/codecparsers/gstmpegvideoparser.h>]],
[[GstMpegVideoSequenceHdr seq_hdr;
GstMpegVideoSequenceExt seq_ext;
GstMpegVideoSequenceDisplayExt seq_dpy;
gst_mpeg_video_finalise_mpeg2_sequence_header(&seq_hdr,
&seq_ext, &seq_dpy);]])],
[ac_cv_have_gst_mpeg2_parser="yes"],
[ac_cv_have_gst_mpeg2_parser="no"]
)
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
])
AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_MPEG2],
[test "$ac_cv_have_gst_mpeg2_parser" != "yes"])
dnl ... H.264 parser, with the required extensions dnl ... H.264 parser, with the required extensions
AC_CACHE_CHECK([for H.264 parser], AC_CACHE_CHECK([for H.264 parser],
ac_cv_have_gst_h264_parser, [ ac_cv_have_gst_h264_parser, [

13
gst-libs/gst/codecparsers/Makefile.am
View file

@ -17,17 +17,22 @@ libgstvaapi_codecparsers_libs = \
$(GST_LIBS) \ $(GST_LIBS) \
$(NULL) $(NULL)
gen_source_c = gen_source_c = parserutils.c
gen_source_h = gen_source_h = parserutils.h
if USE_LOCAL_CODEC_PARSERS_JPEG if USE_LOCAL_CODEC_PARSERS_JPEG
gen_source_c += gstjpegparser.c gen_source_c += gstjpegparser.c
gen_source_h += gstjpegparser.h gen_source_h += gstjpegparser.h
endif endif
if USE_LOCAL_CODEC_PARSERS_MPEG2
gen_source_c += gstmpegvideoparser.c
gen_source_h += gstmpegvideoparser.h
endif
if USE_LOCAL_CODEC_PARSERS_H264 if USE_LOCAL_CODEC_PARSERS_H264
gen_source_c += gsth264parser.c parserutils.c gen_source_c += gsth264parser.c
gen_source_h += gsth264parser.h parserutils.h gen_source_h += gsth264parser.h
endif endif
GENFILES = \ GENFILES = \

14
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
View file

@ -519,11 +519,9 @@ decode_sequence(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
pts_set_framerate(&priv->tsg, priv->fps_n, priv->fps_d); pts_set_framerate(&priv->tsg, priv->fps_n, priv->fps_d);
gst_vaapi_decoder_set_framerate(base_decoder, priv->fps_n, priv->fps_d); gst_vaapi_decoder_set_framerate(base_decoder, priv->fps_n, priv->fps_d);
gst_vaapi_decoder_set_pixel_aspect_ratio( if (gst_mpeg_video_finalise_mpeg2_sequence_header(seq_hdr, NULL, NULL))
base_decoder, gst_vaapi_decoder_set_pixel_aspect_ratio(base_decoder,
seq_hdr->par_w, seq_hdr->par_w, seq_hdr->par_h);
seq_hdr->par_h
);
priv->width = seq_hdr->width; priv->width = seq_hdr->width;
priv->height = seq_hdr->height; priv->height = seq_hdr->height;
@ -539,6 +537,7 @@ decode_sequence_ext(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
{ {
GstVaapiDecoder * const base_decoder = GST_VAAPI_DECODER(decoder); GstVaapiDecoder * const base_decoder = GST_VAAPI_DECODER(decoder);
GstVaapiDecoderMpeg2Private * const priv = decoder->priv; GstVaapiDecoderMpeg2Private * const priv = decoder->priv;
GstMpegVideoSequenceHdr * const seq_hdr = &priv->seq_hdr;
GstMpegVideoSequenceExt * const seq_ext = &priv->seq_ext; GstMpegVideoSequenceExt * const seq_ext = &priv->seq_ext;
GstVaapiProfile profile; GstVaapiProfile profile;
guint width, height; guint width, height;
@ -590,6 +589,11 @@ decode_sequence_ext(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
priv->profile = profile; priv->profile = profile;
priv->profile_changed = TRUE; priv->profile_changed = TRUE;
} }
if (gst_mpeg_video_finalise_mpeg2_sequence_header(seq_hdr, seq_ext, NULL))
gst_vaapi_decoder_set_pixel_aspect_ratio(base_decoder,
seq_hdr->par_w, seq_hdr->par_h);
return GST_VAAPI_DECODER_STATUS_SUCCESS; return GST_VAAPI_DECODER_STATUS_SUCCESS;
} }