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.
This commit is contained in:
Sebastian Dröge 2013-02-13 12:02:46 +01:00
parent ae291fc40c
commit a7ddbc03fe
2 changed files with 11 additions and 9 deletions

View file

@ -64,11 +64,12 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template =
"encoding-params = (string) \"1\", " "encoding-params = (string) \"1\", "
/* NOTE that all values must be strings in orde to be able to do SDP <-> /* NOTE that all values must be strings in orde to be able to do SDP <->
* GstCaps mapping. */ * GstCaps mapping. */
"octet-align = (string) \"1\", " "octet-align = (string) \"1\";"
"crc = (string) { \"0\", \"1\" }, "
"robust-sorting = (string) \"0\", " "interleaving = (string) \"0\";"
/* following options are not needed for a decoder /* 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-set = (int) [ 0, 7 ], "
"mode-change-period = (int) [ 1, MAX ], " "mode-change-period = (int) [ 1, MAX ], "
"mode-change-neighbor = (boolean) { TRUE, FALSE }, " "mode-change-neighbor = (boolean) { TRUE, FALSE }, "
@ -82,11 +83,12 @@ static GstStaticPadTemplate gst_rtp_amr_depay_sink_template =
"encoding-params = (string) \"1\", " "encoding-params = (string) \"1\", "
/* NOTE that all values must be strings in orde to be able to do SDP <-> /* NOTE that all values must be strings in orde to be able to do SDP <->
* GstCaps mapping. */ * GstCaps mapping. */
"octet-align = (string) \"1\", " "octet-align = (string) \"1\";"
"crc = (string) { \"0\", \"1\" }, "
"robust-sorting = (string) \"0\", " "interleaving = (string) \"0\""
/* following options are not needed for a decoder /* 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-set = (int) [ 0, 7 ], "
"mode-change-period = (int) [ 1, MAX ], " "mode-change-period = (int) [ 1, MAX ], "
"mode-change-neighbor = (boolean) { TRUE, FALSE }, " "mode-change-neighbor = (boolean) { TRUE, FALSE }, "

View file

@ -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_pipeline_test (rtp_mp4v_list_frame_data, rtp_mp4v_list_frame_data_size,
rtp_mp4v_list_frame_count, 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); "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_pipeline_test (rtp_mp4g_frame_data, rtp_mp4g_frame_data_size,
rtp_mp4g_frame_count, rtp_mp4g_frame_count,
"video/mpeg,mpegversion=4,codec_data=(buffer)000001b001", "rtpmp4gpay", "video/mpeg,mpegversion=4,systemstream=false,codec_data=(buffer)000001b001",
"rtpmp4gdepay", 0, 0, FALSE); "rtpmp4gpay", "rtpmp4gdepay", 0, 0, FALSE);
} }
GST_END_TEST; GST_END_TEST;