generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtpenc: Add support for G726 audio

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-11-30 23:11:50 +02:00
parent fa6dce4c57
commit 04403ec2e4
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/rtpenc.c
View File

@ -72,6 +72,7 @@ static int is_supported(enum CodecID id)
case CODEC_ID_THEORA: case CODEC_ID_THEORA:
case CODEC_ID_VP8: case CODEC_ID_VP8:
case CODEC_ID_ADPCM_G722: case CODEC_ID_ADPCM_G722:
case CODEC_ID_ADPCM_G726:
return 1; return 1;
default: default:
return 0; return 0;
@ -411,6 +412,10 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
* clock. */ * clock. */
rtp_send_samples(s1, pkt->data, size, 8 * st->codec->channels); rtp_send_samples(s1, pkt->data, size, 8 * st->codec->channels);
break; break;
case CODEC_ID_ADPCM_G726:
rtp_send_samples(s1, pkt->data, size,
st->codec->bits_per_coded_sample * st->codec->channels);
break;
case CODEC_ID_MP2: case CODEC_ID_MP2:
case CODEC_ID_MP3: case CODEC_ID_MP3:
rtp_send_mpegaudio(s1, pkt->data, size); rtp_send_mpegaudio(s1, pkt->data, size);

8
libavformat/sdp.c
View File

@ -517,6 +517,14 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
payload_type, payload_type,
8000, c->channels); 8000, c->channels);
break; break;
case CODEC_ID_ADPCM_G726: {
if (payload_type >= RTP_PT_PRIVATE)
av_strlcatf(buff, size, "a=rtpmap:%d G726-%d/%d\r\n",
payload_type,
c->bits_per_coded_sample*8,
c->sample_rate);
break;
}
default: default:
/* Nothing special to do here... */ /* Nothing special to do here... */
break; break;