Browse code

lavf/rtpenc: Add support for little-endian G.726.

Carl Eugen Hoyos authored on 2017/10/08 03:47:10
Showing 4 changed files
... ...
@@ -52,6 +52,7 @@ version <next>:
52 52
 - V4L2 mem2mem HW assisted codecs
53 53
 - Rockchip MPP hardware decoding
54 54
 - vmafmotion video filter
55
+- use MIME type "G726" for little-endian G.726, "AAL2-G726" for big-endian G.726
55 56
 
56 57
 
57 58
 version 3.3:
... ...
@@ -78,6 +78,7 @@ static int is_supported(enum AVCodecID id)
78 78
     case AV_CODEC_ID_VP9:
79 79
     case AV_CODEC_ID_ADPCM_G722:
80 80
     case AV_CODEC_ID_ADPCM_G726:
81
+    case AV_CODEC_ID_ADPCM_G726LE:
81 82
     case AV_CODEC_ID_ILBC:
82 83
     case AV_CODEC_ID_MJPEG:
83 84
     case AV_CODEC_ID_SPEEX:
... ...
@@ -550,6 +551,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
550 550
          * clock. */
551 551
         return rtp_send_samples(s1, pkt->data, size, 8 * st->codecpar->channels);
552 552
     case AV_CODEC_ID_ADPCM_G726:
553
+    case AV_CODEC_ID_ADPCM_G726LE:
553 554
         return rtp_send_samples(s1, pkt->data, size,
554 555
                                 st->codecpar->bits_per_coded_sample * st->codecpar->channels);
555 556
     case AV_CODEC_ID_MP2:
... ...
@@ -680,6 +680,14 @@ static char *sdp_write_media_attributes(char *buff, int size, AVStream *st, int
680 680
                                          p->sample_rate);
681 681
             break;
682 682
         }
683
+        case AV_CODEC_ID_ADPCM_G726LE: {
684
+            if (payload_type >= RTP_PT_PRIVATE)
685
+                av_strlcatf(buff, size, "a=rtpmap:%d G726-%d/%d\r\n",
686
+                                         payload_type,
687
+                                         p->bits_per_coded_sample*8,
688
+                                         p->sample_rate);
689
+            break;
690
+        }
683 691
         case AV_CODEC_ID_ILBC:
684 692
             av_strlcatf(buff, size, "a=rtpmap:%d iLBC/%d\r\n"
685 693
                                     "a=fmtp:%d mode=%d\r\n",
... ...
@@ -33,7 +33,7 @@
33 33
 // Also please add any ticket numbers that you believe might be affected here
34 34
 #define LIBAVFORMAT_VERSION_MAJOR  57
35 35
 #define LIBAVFORMAT_VERSION_MINOR  82
36
-#define LIBAVFORMAT_VERSION_MICRO 103
36
+#define LIBAVFORMAT_VERSION_MICRO 104
37 37
 
38 38
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
39 39
                                                LIBAVFORMAT_VERSION_MINOR, \