From b383ae0fbdaa9d71c7e2ba003711c333d045fce3 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Tue, 24 Feb 2015 18:50:03 +0000 Subject: [PATCH] jpegparse: interlaced doesn't mean progressive scan Removing interlaced variable since it is meant to mean progressive scan and that isn't used. --- gst/jpegformat/gstjpegparse.c | 9 --------- tests/check/elements/jpegparse.c | 8 +++----- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c index 4a792d4afa..d55b84f8dc 100644 --- a/gst/jpegformat/gstjpegparse.c +++ b/gst/jpegformat/gstjpegparse.c @@ -62,7 +62,6 @@ GST_STATIC_PAD_TEMPLATE ("src", "format = (string) { I420, Y41B, UYVY, YV12 }, " "width = (int) [ 0, MAX ]," "height = (int) [ 0, MAX ], " - "interlaced = (boolean) { true, false }, " "framerate = (fraction) [ 0/1, MAX ], " "parsed = (boolean) true") ); @@ -90,9 +89,6 @@ struct _GstJpegParsePrivate /* the parsed frame size */ guint16 width, height; - /* TRUE if the image is interlaced */ - gboolean interlaced; - /* format color space */ const gchar *format; @@ -672,9 +668,6 @@ gst_jpeg_parse_read_header (GstJpegParse * parse, GstMapInfo * map, gint len) goto error; break; - case SOF2: - parse->priv->interlaced = TRUE; - /* fall through */ case SOF0: /* parse Start Of Frame */ if (!gst_jpeg_parse_sof (parse, &reader)) @@ -731,7 +724,6 @@ gst_jpeg_parse_set_new_caps (GstJpegParse * parse, gboolean header_ok) if (header_ok == TRUE) { gst_caps_set_simple (caps, "format", G_TYPE_STRING, parse->priv->format, - "interlaced", G_TYPE_BOOLEAN, parse->priv->interlaced, "width", G_TYPE_INT, parse->priv->width, "height", G_TYPE_INT, parse->priv->height, NULL); } @@ -912,7 +904,6 @@ gst_jpeg_parse_start (GstBaseParse * bparse) parse->priv->has_fps = FALSE; - parse->priv->interlaced = FALSE; parse->priv->width = parse->priv->height = 0; parse->priv->framerate_numerator = 0; parse->priv->framerate_denominator = 1; diff --git a/tests/check/elements/jpegparse.c b/tests/check/elements/jpegparse.c index 392f529ee4..80c26e88de 100644 --- a/tests/check/elements/jpegparse.c +++ b/tests/check/elements/jpegparse.c @@ -137,7 +137,7 @@ guint8 test_data_comment[] = { }; guint8 test_data_sof0[] = { - 0xff, 0xc0, + 0xff, 0xc0, /* baseline dct-based */ 0x00, 0x11, /* size */ 0x08, /* precision */ 0x00, 0x3c, /* width */ @@ -327,8 +327,7 @@ GST_START_TEST (test_parse_app1_exif) caps_out = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE, "framerate", GST_TYPE_FRACTION, 1, 1, "format", G_TYPE_STRING, - "I420", "interlaced", G_TYPE_BOOLEAN, FALSE, - "width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL); + "I420", "width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL); buffer_in = make_my_input_buffer (test_data_app1_exif, sizeof (test_data_app1_exif)); @@ -353,8 +352,7 @@ GST_START_TEST (test_parse_comment) caps_out = gst_caps_new_simple ("image/jpeg", "parsed", G_TYPE_BOOLEAN, TRUE, "framerate", GST_TYPE_FRACTION, 1, 1, "format", G_TYPE_STRING, - "I420", "interlaced", G_TYPE_BOOLEAN, FALSE, - "width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL); + "I420", "width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL); buffer_in = make_my_input_buffer (test_data_comment, sizeof (test_data_comment));