diff --git a/gst/rtp/gstrtpvp9depay.c b/gst/rtp/gstrtpvp9depay.c index 3d78e644c9..ad1b22042c 100644 --- a/gst/rtp/gstrtpvp9depay.c +++ b/gst/rtp/gstrtpvp9depay.c @@ -165,14 +165,6 @@ gst_rtp_vp9_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp) } } - /* flexible-mode not implemented */ - if (f_bit) { - GST_ELEMENT_WARNING (depay, STREAM, NOT_IMPLEMENTED, - ("Stream type not supported"), - ("Depayloader does not implement flexible mode")); - return NULL; - } - /* Check L optional header layer indices */ if (l_bit) { hdrsize++; @@ -181,6 +173,24 @@ gst_rtp_vp9_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp) hdrsize++; } + if (p_bit && f_bit) { + /* At least one P_DIFF|N, up to three times */ + for (gint i = 0; i < 3; i++) { + guint p_diff, n_bit; + + if (G_UNLIKELY (size < hdrsize + 1)) + goto too_small; + + p_diff = data[hdrsize] >> 1; + n_bit = data[hdrsize] & 0x1; + GST_TRACE_OBJECT (self, "P_DIFF[%d]=%d", i, p_diff); + hdrsize++; + + if (!n_bit) + break; + } + } + /* Check V optional Scalability Structure */ if (v_bit) { guint n_s, y_bit, g_bit; @@ -252,7 +262,6 @@ gst_rtp_vp9_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp) GstBuffer *out; gboolean key_frame_first_layer = !p_bit && spatial_layer == 0; - if (gst_adapter_available (self->adapter) < 10) goto too_small; diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 07323983b2..afa4aece1f 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -222,7 +222,8 @@ if USE_PLUGIN_RTP check_rtp = \ elements/rtp-payloading \ elements/rtph261 \ - elements/rtph263 + elements/rtph263 \ + elements/rtpvp9 else check_rtp = endif diff --git a/tests/check/elements/rtpvp9.c b/tests/check/elements/rtpvp9.c new file mode 100644 index 0000000000..1430c5ffdd --- /dev/null +++ b/tests/check/elements/rtpvp9.c @@ -0,0 +1,113 @@ +/* GStreamer + * + * Copyright (C) 2016 Pexip AS + * @author Stian Selnes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include +#include + +#define RTP_VP9_CAPS_STR \ + "application/x-rtp,media=video,encoding-name=VP9,clock-rate=90000,payload=96" + + +GST_START_TEST (test_depay_flexible_mode) +{ + /* b-bit, e-bit, f-bit and marker bit set */ + /* First packet of first frame, handcrafted to also set the e-bit and marker + * bit in addition to changing the seqnum */ + guint8 intra[] = { + 0x80, 0xf4, 0x00, 0x00, 0x49, 0xb5, 0xbe, 0x32, 0xb1, 0x01, 0x64, 0xd1, + 0xbc, 0x98, 0xbf, 0x00, 0x83, 0x49, 0x83, 0x42, 0x00, 0x77, 0xf0, 0x43, + 0x71, 0xd8, 0xe0, 0x90, 0x70, 0x66, 0x80, 0x60, 0x0e, 0xf0, 0x5f, 0xfd, + }; + /* b-bit, e-bit, p-bit, f-bit and marker bit set */ + /* First packet of second frame, handcrafted to also set the e-bit and + * marker bit in addition to changing the seqnum */ + guint8 inter[] = { + 0x80, 0xf4, 0x00, 0x01, 0x49, 0xb6, 0x02, 0xc0, 0xb1, 0x01, 0x64, 0xd1, + 0xfc, 0x98, 0xc0, 0x00, 0x02, 0x87, 0x01, 0x00, 0x09, 0x3f, 0x1c, 0x12, + 0x0e, 0x0c, 0xd0, 0x1b, 0xa7, 0x80, 0x80, 0xb0, 0x18, 0x0f, 0xda, 0x11, + }; + + GstHarness *h = gst_harness_new ("rtpvp9depay"); + gst_harness_set_src_caps_str (h, RTP_VP9_CAPS_STR); + + gst_harness_push (h, gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY, + intra, sizeof (intra), 0, sizeof (intra), NULL, NULL)); + fail_unless_equals_int (1, gst_harness_buffers_received (h)); + + gst_harness_push (h, gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY, + inter, sizeof (inter), 0, sizeof (inter), NULL, NULL)); + fail_unless_equals_int (2, gst_harness_buffers_received (h)); + + gst_harness_teardown (h); +} + +GST_END_TEST; + +GST_START_TEST (test_depay_non_flexible_mode) +{ + /* b-bit, e-bit and marker bit set. f-bit NOT set */ + /* First packet of first frame, handcrafted to also set the e-bit and marker + * bit in addition to changing the seqnum */ + guint8 intra[] = { + 0x80, 0xf4, 0x00, 0x00, 0x49, 0x88, 0xd9, 0xf8, 0xa0, 0x6c, 0x65, 0x6c, + 0x8c, 0x98, 0xc0, 0x87, 0x01, 0x02, 0x49, 0x3f, 0x1c, 0x12, 0x0e, 0x0c, + 0xd0, 0x1b, 0xb9, 0x80, 0x80, 0xb0, 0x18, 0x0f, 0xa6, 0x4d, 0x01, 0xa5 + }; + /* b-bit, e-bit, p-bit and marker bit set. f-bit NOT set */ + /* First packet of second frame, handcrafted to also set the e-bit and + * marker bit in addition to changing the seqnum */ + guint8 inter[] = { + 0x80, 0xf4, 0x00, 0x01, 0x49, 0x88, 0xe5, 0x38, 0xa0, 0x6c, 0x65, 0x6c, + 0xcc, 0x98, 0xc1, 0x87, 0x01, 0x02, 0x49, 0x3f, 0x1c, 0x12, 0x0e, 0x0c, + 0xd0, 0x1b, 0x97, 0x80, 0x80, 0xb0, 0x18, 0x0f, 0x8a, 0x9f, 0x01, 0xbc + }; + + GstHarness *h = gst_harness_new ("rtpvp9depay"); + gst_harness_set_src_caps_str (h, RTP_VP9_CAPS_STR); + + gst_harness_push (h, gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY, + intra, sizeof (intra), 0, sizeof (intra), NULL, NULL)); + fail_unless_equals_int (1, gst_harness_buffers_received (h)); + + gst_harness_push (h, gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY, + inter, sizeof (inter), 0, sizeof (inter), NULL, NULL)); + fail_unless_equals_int (2, gst_harness_buffers_received (h)); + + gst_harness_teardown (h); +} +GST_END_TEST; + + + +static Suite * +rtpvp9_suite (void) +{ + Suite *s = suite_create ("rtpvp9"); + TCase *tc_chain; + + suite_add_tcase (s, (tc_chain = tcase_create ("vp9depay"))); + tcase_add_test (tc_chain, test_depay_flexible_mode); + tcase_add_test (tc_chain, test_depay_non_flexible_mode); + + return s; +} + +GST_CHECK_MAIN (rtpvp9);