From 3eeea114b246466f90cf6807269a31a4bd1ec1b2 Mon Sep 17 00:00:00 2001 From: Sreerenj Balachandran Date: Thu, 8 Nov 2012 11:40:47 +0200 Subject: mpeg2: fix PAR calculation from commit 132922d. 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 Signed-off-by: Gwenole Beauchesne --- gst-libs/gst/codecparsers/Makefile.am | 5 +++++ gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'gst-libs') diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am index 8dd23ef9..9b40eb6a 100644 --- a/gst-libs/gst/codecparsers/Makefile.am +++ b/gst-libs/gst/codecparsers/Makefile.am @@ -29,6 +29,11 @@ gen_source_c += gstjpegparser.c gen_source_h += gstjpegparser.h endif +if USE_LOCAL_CODEC_PARSERS_MPEG2 +gen_source_c += gstmpegvideoparser.c +gen_source_h += gstmpegvideoparser.h +endif + if USE_LOCAL_CODEC_PARSERS_H264 gen_source_c += gsth264parser.c gen_source_h += gsth264parser.h diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c index 7b479057..8bdb13f1 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c @@ -519,11 +519,9 @@ decode_sequence(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size) 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_pixel_aspect_ratio( - base_decoder, - seq_hdr->par_w, - seq_hdr->par_h - ); + if (gst_mpeg_video_finalise_mpeg2_sequence_header(seq_hdr, NULL, NULL)) + gst_vaapi_decoder_set_pixel_aspect_ratio(base_decoder, + seq_hdr->par_w, seq_hdr->par_h); priv->width = seq_hdr->width; 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); GstVaapiDecoderMpeg2Private * const priv = decoder->priv; + GstMpegVideoSequenceHdr * const seq_hdr = &priv->seq_hdr; GstMpegVideoSequenceExt * const seq_ext = &priv->seq_ext; GstVaapiProfile profile; guint width, height; @@ -590,6 +589,11 @@ decode_sequence_ext(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size) priv->profile = profile; 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; } -- cgit v1.2.3