From 2cced88552c5782fbae0096c9525ac36c25efebe Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 5 Jun 2025 08:55:23 -0400 Subject: [PATCH] MT#55283 improve G.729 format matching RFC says that annex B is the default in the absence of the annexb=no format string. Consider the alias "G729a" as annex A. Closes #1951 Change-Id: I9a8483ee5520bf4688601123f1ebec4f1f480642 (cherry picked from commit 3df26cf2d060b531546cd51f040779b1aeda4047) (cherry picked from commit 754837ea9fffc9ab03f25b5a5eda1ff182372229) (cherry picked from commit 0119014d46fa79f27ce804cca42ddf9ca7078b5c) --- lib/codeclib.c | 28 +++++++++++++++------------- t/auto-daemon-tests.pl | 6 +++--- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lib/codeclib.c b/lib/codeclib.c index 608df7be2..7b3964f21 100644 --- a/lib/codeclib.c +++ b/lib/codeclib.c @@ -425,7 +425,7 @@ static struct codec_def_s __codec_defs[] = { .default_channels = 1, .default_ptime = 20, .minimum_ptime = 20, - .default_fmtp = "annexb=no", + .default_fmtp = "annexb=yes", .format_cmp = format_cmp_g729, .packetizer = packetizer_g729, .bits_per_sample = 1, // 10 ms frame has 80 samples and encodes as (max) 10 bytes = 80 bits @@ -444,6 +444,7 @@ static struct codec_def_s __codec_defs[] = { .default_channels = 1, .default_ptime = 20, .minimum_ptime = 20, + .default_fmtp = "annexb=no", .format_cmp = format_cmp_g729, .packetizer = packetizer_g729, .bits_per_sample = 1, // 10 ms frame has 80 samples and encodes as (max) 10 bytes = 80 bits @@ -3382,19 +3383,20 @@ static int packetizer_g729(AVPacket *pkt, GString *buf, str *input_output, encod return buf->len >= 2 ? 1 : 0; } +static bool g729_is_annex_b(const struct rtp_payload_type *p) { + // defaults based on codec name (G729 vs G729a) + bool annex_b = p->encoding.len && !((p->encoding.s[p->encoding.len - 1] & 0xdf) == 'A'); + // override per fmtp + if (str_str(&p->format_parameters, "annexb=no") != -1) + annex_b = false; + else if (str_str(&p->format_parameters, "annexb=yes") != -1) + annex_b = true; + return annex_b; +} static int format_cmp_g729(const struct rtp_payload_type *a, const struct rtp_payload_type *b) { - // shortcut the most common case: - if (!str_cmp_str(&a->format_parameters, &b->format_parameters)) - return 0; - // incompatible is if one side uses annex B but the other one doesn't - if (str_str(&a->format_parameters, "annexb=yes") != -1 - && str_str(&b->format_parameters, "annexb=yes") == -1) - return -1; - if (str_str(&a->format_parameters, "annexb=yes") == -1 - && str_str(&b->format_parameters, "annexb=yes") != -1) - return -1; - // everything else is compatible - return 0; + bool a_b = g729_is_annex_b(a); + bool b_b = g729_is_annex_b(b); + return a_b == b_b ? 0 : -1; } #endif diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl index 005407a9f..d5569bf0b 100755 --- a/t/auto-daemon-tests.pl +++ b/t/auto-daemon-tests.pl @@ -323,7 +323,7 @@ m=audio 49696 RTP/AVP 8 0 18 100 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:18 G729/8000 -a=fmtp:18 annexb=no +a=fmtp:18 annexb=yes a=rtpmap:100 telephone-event/8000 a=fmtp:100 0-11 a=ptime:20 @@ -340,7 +340,7 @@ a=maxptime:30 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:18 G729/8000 -a=fmtp:18 annexb=no +a=fmtp:18 annexb=yes a=rtpmap:100 telephone-event/8000 a=fmtp:100 0-11 a=sendrecv @@ -386,7 +386,7 @@ m=audio 49696 RTP/AVP 8 0 18 100 a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:18 G729/8000 -a=fmtp:18 annexb=yes +a=fmtp:18 annexb=no a=rtpmap:100 telephone-event/8000 a=fmtp:100 0-11 a=ptime:20