1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-12-04 20:07:36 +00:00

Revert "Disable g722 to avoid test failure with ffmpeg 5.0/gst-libav"

This reverts commit 857c375ab9.

The failure to register types due to invalid type names seems to be
resolved, so let's revert to reenable g722 codecs.
This commit is contained in:
Evangelos Ribeiro Tzaras 2022-08-08 21:21:53 +02:00 committed by Evangelos Ribeiro Tzaras
parent 2a5e96cda2
commit 8cdd017c2f
2 changed files with 4 additions and 10 deletions

View file

@ -34,7 +34,7 @@ static MediaCodecInfo gst_codecs[] = {
{8, "PCMA", 8000, 1, "rtppcmapay", "rtppcmadepay", "alawenc", "alawdec", "libgstalaw.so"},
{0, "PCMU", 8000, 1, "rtppcmupay", "rtppcmudepay", "mulawenc", "mulawdec", "libgstmulaw.so"},
{3, "GSM", 8000, 1, "rtpgsmpay", "rtpgsmdepay", "gsmenc", "gsmdec", "libgstgsm.so"},
/* {9, "G722", 8000, 1, "rtpg722pay", "rtpg722depay", "avenc_g722", "avdec_g722", "libgstlibav.so"}, */
{9, "G722", 8000, 1, "rtpg722pay", "rtpg722depay", "avenc_g722", "avdec_g722", "libgstlibav.so"},
{4, "G723", 8000, 1, "rtpg723pay", "rtpg723depay", "avenc_g723_1", "avdec_g723_1", "libgstlibav.so"}, // does not seem to work
};

View file

@ -85,7 +85,6 @@ test_sip_media_manager_caps (void)
g_debug ("PCMA SRTP test OK");
/* G722 RTP */
/*
codecs = g_list_append (NULL, media_codec_by_name ("G722"));
sdp_message =
@ -103,10 +102,9 @@ test_sip_media_manager_caps (void)
g_free (sdp_message);
g_debug ("G722 RTP test OK");
*/
/* G722 PCMU PCMA RTP (in this order) */
/* codecs = g_list_append (NULL, media_codec_by_name ("G722")); */
codecs = g_list_append (NULL, media_codec_by_name ("G722"));
codecs = g_list_append (codecs, media_codec_by_name ("PCMU"));
codecs = g_list_append (codecs, media_codec_by_name ("PCMA"));
@ -115,11 +113,9 @@ test_sip_media_manager_caps (void)
g_assert_true (sdp_message);
g_assert_true (find_string_in_sdp_message (sdp_message,
"m=audio 33340 RTP/AVP 0 8"));
/*
"m=audio 33340 RTP/AVP 9 0 8"));
g_assert_true (find_string_in_sdp_message (sdp_message,
"a=rtpmap:9 G722/8000"));
*/
g_assert_true (find_string_in_sdp_message (sdp_message,
"a=rtpmap:0 PCMU/8000"));
g_assert_true (find_string_in_sdp_message (sdp_message,
@ -133,9 +129,7 @@ test_sip_media_manager_caps (void)
/* GSM PCMA G722 PCMU SRTP (in this order) */
codecs = g_list_append (NULL, media_codec_by_name ("GSM"));
codecs = g_list_append (codecs, media_codec_by_name ("PCMA"));
/*
codecs = g_list_append (codecs, media_codec_by_name ("G722"));
*/
codecs = g_list_append (codecs, media_codec_by_name ("PCMU"));
sdp_message =
@ -143,7 +137,7 @@ test_sip_media_manager_caps (void)
g_assert_true (sdp_message);
g_assert_true (find_string_in_sdp_message (sdp_message,
"m=audio 18098 RTP/SAVP 3 8 0"));
"m=audio 18098 RTP/SAVP 3 8 9 0"));
g_clear_pointer (&codecs, g_list_free);
g_free (sdp_message);