diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2014-03-21 15:56:16 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2014-03-21 16:00:46 +0100 |
| commit | 385ae4ace124746ae634f0cf492bead593ecb761 (patch) | |
| tree | bcf07b4cfe9bfa47ef390e07e7c38b1b70706f05 /tests | |
| parent | 05cb4bc6a58a03d8ff4fd95bec90f95ea3210d03 (diff) | |
| download | gstreamer-plugins-bad-385ae4ace124746ae634f0cf492bead593ecb761.tar.gz | |
check: fix make check
The mpeg parser now flags the stream as mpeg2 if there is a picture
extension header, so remove it for mpeg1 data.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/elements/mpegvideoparse.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/check/elements/mpegvideoparse.c b/tests/check/elements/mpegvideoparse.c index ead31a622..07d73bf75 100644 --- a/tests/check/elements/mpegvideoparse.c +++ b/tests/check/elements/mpegvideoparse.c @@ -68,6 +68,14 @@ static guint8 mpeg2_iframe[] = { 0x8b, 0x94, 0xa5, 0x22, 0x20 }; +static guint8 mpeg1_iframe[] = { + 0x00, 0x00, 0x01, 0x00, 0x00, 0x0f, 0xff, 0xf8, + 0x00, 0x00, 0x01, 0x01, 0x23, 0xf8, 0x7d, + 0x29, 0x48, 0x8b, 0x94, 0xa5, 0x22, 0x20, 0x00, + 0x00, 0x01, 0x02, 0x23, 0xf8, 0x7d, 0x29, 0x48, + 0x8b, 0x94, 0xa5, 0x22, 0x20 +}; + static gboolean verify_buffer (buffer_verify_data_s * vdata, GstBuffer * buffer) { @@ -166,10 +174,12 @@ mpeg_video_parse_check_caps (guint version, guint8 * seq, gint size) ctx_headers[0].data = seq; ctx_headers[0].size = size; - /* parser does not really care that mpeg1 and mpeg2 frame data - * should be a bit different */ - caps = gst_parser_test_get_output_caps (mpeg2_iframe, sizeof (mpeg2_iframe), - NULL); + if (version == 1) + caps = gst_parser_test_get_output_caps (mpeg1_iframe, sizeof (mpeg1_iframe), + NULL); + else + caps = gst_parser_test_get_output_caps (mpeg2_iframe, sizeof (mpeg2_iframe), + NULL); fail_unless (caps != NULL); /* Check that the negotiated caps are as expected */ |