diff mbox

[FFmpeg-devel] lavf/rtp_g726: Map mime type G726 to the g726le decoder

Message ID 201610141512.26819.cehoyos@ag.or.at
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos Oct. 14, 2016, 1:12 p.m. UTC 
Hi!

Attached patch fixes ticket #5890, completely untested.

Please comment, Carl Eugen
From 8c5bb7f00be92f3adf08a6d46a6888dd2ab707b5 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Fri, 14 Oct 2016 15:05:05 +0200
Subject: [PATCH] lavf/rtpdec_g726: Map mime type G726 to g726le.

Add new mime types AAL2-G726 for g726 as suggested in rfc 3551.

This patch will break applications that incorrectly use big-endian
G.726 with mime type G726 but we know of at least one device (DVTel
camera) that correctly implements the rfc, so do the same.

Fixes ticket #5890.
---
 Changelog                 |    1 +
 libavformat/rtpdec_g726.c |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Carl Eugen Hoyos Oct. 18, 2016, 5:14 p.m. UTC | #1 
2016-10-14 15:12 GMT+02:00 Carl Eugen Hoyos <cehoyos@ag.or.at>:
> Hi!
>
> Attached patch fixes ticket #5890, completely untested.

I will apply this if there are no objections.

Carl Eugen
Carl Eugen Hoyos Oct. 22, 2016, 2:04 a.m. UTC | #2 
2016-10-14 15:12 GMT+02:00 Carl Eugen Hoyos <cehoyos@ag.or.at>:

> Attached patch fixes ticket #5890, completely untested.

Patch applied.

Carl Eugen
diff mbox

Patch

diff --git a/Changelog b/Changelog
index 32f0bd4..2b8b5e1 100644
--- a/Changelog
+++ b/Changelog
@@ -37,6 +37,7 @@  version <next>:
 - libfaac encoder removed
 - Matroska muxer now writes CRC32 elements by default in all Level 1 elements
 - sidedata video and asidedata audio filter
+- Changed mapping of rtp MIME type G726 to codec g726le.
 
 
 version 3.1:
diff --git a/libavformat/rtpdec_g726.c b/libavformat/rtpdec_g726.c
index 172a4b3..2de09ac 100644
--- a/libavformat/rtpdec_g726.c
+++ b/libavformat/rtpdec_g726.c
@@ -36,10 +36,16 @@  static av_cold int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, \
 } \
 \
 RTPDynamicProtocolHandler ff_g726_ ## bitrate ## _dynamic_handler = { \
-    .enc_name   = "G726-" #bitrate, \
+    .enc_name   = "AAL2-G726-" #bitrate, \
     .codec_type = AVMEDIA_TYPE_AUDIO, \
     .codec_id   = AV_CODEC_ID_ADPCM_G726, \
     .init       = g726_ ## bitrate ## _init, \
+}; \
+RTPDynamicProtocolHandler ff_g726le_ ## bitrate ## _dynamic_handler = { \
+    .enc_name   = "G726-" #bitrate, \
+    .codec_type = AVMEDIA_TYPE_AUDIO, \
+    .codec_id   = AV_CODEC_ID_ADPCM_G726LE, \
+    .init       = g726_ ## bitrate ## _init, \
 }
 
 RTP_G726_HANDLER(16);