mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: be stricter when detecting interlaced video

Browse source 
There are broken(?) mjpeg videos that are incorrectly detected as
interlaced. This happens because 'info.height > height' (e.g. 1088 > 1080).

In the interlaced case info.height is approximately 'height * 2' but not
exactly because height is a multiple of DCTSIZE. Make the check more
restrictive but take the rounding effect into account.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4696>
This commit is contained in:
Michael Olbrich 2020-08-31 16:38:48 +02:00 committed by GStreamer Marge Bot
parent 59290feca4
commit 285811e7a7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
View file

@ -1406,8 +1406,8 @@ gst_jpeg_dec_handle_frame (GstVideoDecoder * bdec, GstVideoCodecFrame * frame)
/* is it interlaced MJPEG? (we really don't want to scan the jpeg data /* is it interlaced MJPEG? (we really don't want to scan the jpeg data
* to see if there are two SOF markers in the packet to detect this) */ * to see if there are two SOF markers in the packet to detect this) */
if (gst_video_decoder_get_packetized (bdec) && if (gst_video_decoder_get_packetized (bdec) &&
dec->input_state && dec->input_state && height > DCTSIZE &&
dec->input_state->info.height > height && dec->input_state->info.height > (2 * (height - DCTSIZE)) &&
dec->input_state->info.height <= (height * 2) dec->input_state->info.height <= (height * 2)
&& dec->input_state->info.width == width) { && dec->input_state->info.width == width) {
GST_LOG_OBJECT (dec, GST_LOG_OBJECT (dec,