mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 05:28:48 +00:00
Revert "tests: check jpegparse for progressive marker"
This reverts commit 1c77d12ce8
.
"interlaced" in the caps don't mean the same thing as the SOF2 marker in the
JPEG format. This test passes because of broken behaviour.
This commit is contained in:
parent
1c77d12ce8
commit
e45db8ca1e
1 changed files with 7 additions and 52 deletions
|
@ -137,19 +137,7 @@ guint8 test_data_comment[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
guint8 test_data_sof0[] = {
|
guint8 test_data_sof0[] = {
|
||||||
0xff, 0xc0, /* baseline dct-based */
|
0xff, 0xc0,
|
||||||
0x00, 0x11, /* size */
|
|
||||||
0x08, /* precision */
|
|
||||||
0x00, 0x3c, /* width */
|
|
||||||
0x00, 0x50, /* height */
|
|
||||||
0x03, /* number of components */
|
|
||||||
0x01, 0x22, 0x00, /* component 1 */
|
|
||||||
0x02, 0x11, 0x01, /* component 2 */
|
|
||||||
0x03, 0x11, 0x01, /* component 3 */
|
|
||||||
};
|
|
||||||
|
|
||||||
guint8 test_data_sof2[] = {
|
|
||||||
0xff, 0xc2, /* progressive dct-based */
|
|
||||||
0x00, 0x11, /* size */
|
0x00, 0x11, /* size */
|
||||||
0x08, /* precision */
|
0x08, /* precision */
|
||||||
0x00, 0x3c, /* width */
|
0x00, 0x3c, /* width */
|
||||||
|
@ -290,15 +278,14 @@ GST_START_TEST (test_parse_all_in_one_buf)
|
||||||
GST_END_TEST;
|
GST_END_TEST;
|
||||||
|
|
||||||
static inline GstBuffer *
|
static inline GstBuffer *
|
||||||
make_my_input_buffer (guint8 * test_data_header, gsize test_data_size,
|
make_my_input_buffer (guint8 * test_data_header, gsize test_data_size)
|
||||||
gboolean interlaced)
|
|
||||||
{
|
{
|
||||||
GstBuffer *buffer;
|
GstBuffer *buffer;
|
||||||
gsize total_size = 0, offset = 0;
|
gsize total_size = 0, offset = 0;
|
||||||
|
|
||||||
total_size += sizeof (test_data_soi);
|
total_size += sizeof (test_data_soi);
|
||||||
total_size += test_data_size;
|
total_size += test_data_size;
|
||||||
total_size += sizeof (test_data_sof0); /* sof0 and sof2 are the same size */
|
total_size += sizeof (test_data_sof0);
|
||||||
total_size += sizeof (test_data_eoi);
|
total_size += sizeof (test_data_eoi);
|
||||||
|
|
||||||
buffer = gst_buffer_new_and_alloc (total_size);
|
buffer = gst_buffer_new_and_alloc (total_size);
|
||||||
|
@ -307,13 +294,8 @@ make_my_input_buffer (guint8 * test_data_header, gsize test_data_size,
|
||||||
offset += sizeof (test_data_soi);
|
offset += sizeof (test_data_soi);
|
||||||
gst_buffer_fill (buffer, offset, test_data_header, test_data_size);
|
gst_buffer_fill (buffer, offset, test_data_header, test_data_size);
|
||||||
offset += test_data_size;
|
offset += test_data_size;
|
||||||
if (interlaced) {
|
gst_buffer_fill (buffer, offset, test_data_sof0, sizeof (test_data_sof0));
|
||||||
gst_buffer_fill (buffer, offset, test_data_sof2, sizeof (test_data_sof2));
|
offset += sizeof (test_data_sof0);
|
||||||
offset += sizeof (test_data_sof2);
|
|
||||||
} else {
|
|
||||||
gst_buffer_fill (buffer, offset, test_data_sof0, sizeof (test_data_sof0));
|
|
||||||
offset += sizeof (test_data_sof0);
|
|
||||||
}
|
|
||||||
gst_buffer_fill (buffer, offset, test_data_eoi, sizeof (test_data_eoi));
|
gst_buffer_fill (buffer, offset, test_data_eoi, sizeof (test_data_eoi));
|
||||||
offset += sizeof (test_data_eoi);
|
offset += sizeof (test_data_eoi);
|
||||||
|
|
||||||
|
@ -349,7 +331,7 @@ GST_START_TEST (test_parse_app1_exif)
|
||||||
"width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL);
|
"width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL);
|
||||||
|
|
||||||
buffer_in = make_my_input_buffer (test_data_app1_exif,
|
buffer_in = make_my_input_buffer (test_data_app1_exif,
|
||||||
sizeof (test_data_app1_exif), FALSE);
|
sizeof (test_data_app1_exif));
|
||||||
buffer_out = make_my_output_buffer (buffer_in);
|
buffer_out = make_my_output_buffer (buffer_in);
|
||||||
|
|
||||||
gst_check_element_push_buffer ("jpegparse", buffer_in, caps_in, buffer_out,
|
gst_check_element_push_buffer ("jpegparse", buffer_in, caps_in, buffer_out,
|
||||||
|
@ -375,33 +357,7 @@ GST_START_TEST (test_parse_comment)
|
||||||
"width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL);
|
"width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL);
|
||||||
|
|
||||||
buffer_in = make_my_input_buffer (test_data_comment,
|
buffer_in = make_my_input_buffer (test_data_comment,
|
||||||
sizeof (test_data_comment), FALSE);
|
sizeof (test_data_comment));
|
||||||
buffer_out = make_my_output_buffer (buffer_in);
|
|
||||||
|
|
||||||
gst_check_element_push_buffer ("jpegparse", buffer_in, caps_in, buffer_out,
|
|
||||||
caps_out);
|
|
||||||
|
|
||||||
gst_caps_unref (caps_in);
|
|
||||||
gst_caps_unref (caps_out);
|
|
||||||
}
|
|
||||||
|
|
||||||
GST_END_TEST;
|
|
||||||
|
|
||||||
GST_START_TEST (test_parse_interlaced)
|
|
||||||
{
|
|
||||||
GstBuffer *buffer_in, *buffer_out;
|
|
||||||
GstCaps *caps_in, *caps_out;
|
|
||||||
|
|
||||||
caps_in = gst_caps_new_simple ("image/jpeg", "parsed",
|
|
||||||
G_TYPE_BOOLEAN, FALSE, NULL);
|
|
||||||
|
|
||||||
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, TRUE,
|
|
||||||
"width", G_TYPE_INT, 80, "height", G_TYPE_INT, 60, NULL);
|
|
||||||
|
|
||||||
buffer_in = make_my_input_buffer (test_data_comment,
|
|
||||||
sizeof (test_data_comment), TRUE);
|
|
||||||
buffer_out = make_my_output_buffer (buffer_in);
|
buffer_out = make_my_output_buffer (buffer_in);
|
||||||
|
|
||||||
gst_check_element_push_buffer ("jpegparse", buffer_in, caps_in, buffer_out,
|
gst_check_element_push_buffer ("jpegparse", buffer_in, caps_in, buffer_out,
|
||||||
|
@ -424,7 +380,6 @@ jpegparse_suite (void)
|
||||||
tcase_add_test (tc_chain, test_parse_all_in_one_buf);
|
tcase_add_test (tc_chain, test_parse_all_in_one_buf);
|
||||||
tcase_add_test (tc_chain, test_parse_app1_exif);
|
tcase_add_test (tc_chain, test_parse_app1_exif);
|
||||||
tcase_add_test (tc_chain, test_parse_comment);
|
tcase_add_test (tc_chain, test_parse_comment);
|
||||||
tcase_add_test (tc_chain, test_parse_interlaced);
|
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue