diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-02-13 12:02:46 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-02-13 12:02:46 +0100 |
| commit | a7ddbc03fee5854bc963d959728762c024d4a3d0 (patch) | |
| tree | fbab3dc3d71e69a0b969ca62bdf64b03f8dccd19 | |
| parent | ae291fc40c1f3a4b9f9c7ed1dbc79605e14b76d1 (diff) | |
rtp-payloading: Fix unit test caps and AMR depayloader sink template caps
Fields were missing from the actual caps, or too many fields
existed in the template caps.
| -rw-r--r-- | gst/rtp/gstrtpamrdepay.c | 14 | ||||
| -rw-r--r-- | tests/check/elements/rtp-payloading.c | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c index 07749b68d..8ce0cc049 100644 --- a/gst/rtp/gstrtpamrdepay.c +++ b/gst/rtp/gstrtpamrdepay.c @@ -64,11 +64,12 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template = "encoding-params = (string) \"1\", " /* NOTE that all values must be strings in orde to be able to do SDP <-> * GstCaps mapping. */ - "octet-align = (string) \"1\", " - "crc = (string) { \"0\", \"1\" }, " - "robust-sorting = (string) \"0\", " "interleaving = (string) \"0\";" + "octet-align = (string) \"1\";" /* following options are not needed for a decoder * + "crc = (string) { \"0\", \"1\" }, " + "robust-sorting = (string) \"0\", " + "interleaving = (string) \"0\";" "mode-set = (int) [ 0, 7 ], " "mode-change-period = (int) [ 1, MAX ], " "mode-change-neighbor = (boolean) { TRUE, FALSE }, " @@ -82,11 +83,12 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template = "encoding-params = (string) \"1\", " /* NOTE that all values must be strings in orde to be able to do SDP <-> * GstCaps mapping. */ - "octet-align = (string) \"1\", " - "crc = (string) { \"0\", \"1\" }, " - "robust-sorting = (string) \"0\", " "interleaving = (string) \"0\"" + "octet-align = (string) \"1\";" /* following options are not needed for a decoder * + "crc = (string) { \"0\", \"1\" }, " + "robust-sorting = (string) \"0\", " + "interleaving = (string) \"0\"" "mode-set = (int) [ 0, 7 ], " "mode-change-period = (int) [ 1, MAX ], " "mode-change-neighbor = (boolean) { TRUE, FALSE }, " diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c index 5cddce7ab..63db391ba 100644 --- a/tests/check/elements/rtp-payloading.c +++ b/tests/check/elements/rtp-payloading.c @@ -699,7 +699,7 @@ GST_START_TEST (rtp_mp4v_list) { rtp_pipeline_test (rtp_mp4v_list_frame_data, rtp_mp4v_list_frame_data_size, rtp_mp4v_list_frame_count, - "video/mpeg,mpegversion=4,codec_data=(buffer)000001b001", + "video/mpeg,mpegversion=4,systemstream=false,codec_data=(buffer)000001b001", "rtpmp4vpay", "rtpmp4vdepay", rtp_mp4v_list_bytes_sent, 0, TRUE); } @@ -717,8 +717,8 @@ GST_START_TEST (rtp_mp4g) { rtp_pipeline_test (rtp_mp4g_frame_data, rtp_mp4g_frame_data_size, rtp_mp4g_frame_count, - "video/mpeg,mpegversion=4,codec_data=(buffer)000001b001", "rtpmp4gpay", - "rtpmp4gdepay", 0, 0, FALSE); + "video/mpeg,mpegversion=4,systemstream=false,codec_data=(buffer)000001b001", + "rtpmp4gpay", "rtpmp4gdepay", 0, 0, FALSE); } GST_END_TEST; |