virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/riff: G.728 muxing and demuxing

Browse Source
This commit is contained in:
Peter Ross
2024-12-19 22:57:04 +11:00
parent 52f62468aa
commit dee4edfa63
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/riff.c
View File

@ -555,6 +555,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_ADPCM_G726, 0x0045 }, { AV_CODEC_ID_ADPCM_G726, 0x0045 },
{ AV_CODEC_ID_ADPCM_G726, 0x0014 }, /* g723 Antex */ { AV_CODEC_ID_ADPCM_G726, 0x0014 }, /* g723 Antex */
{ AV_CODEC_ID_ADPCM_G726, 0x0040 }, /* g721 Antex */ { AV_CODEC_ID_ADPCM_G726, 0x0040 }, /* g721 Antex */
{ AV_CODEC_ID_G728, 0x0041 },
{ AV_CODEC_ID_MP2, 0x0050 }, { AV_CODEC_ID_MP2, 0x0050 },
{ AV_CODEC_ID_MP3, 0x0055 }, { AV_CODEC_ID_MP3, 0x0055 },
{ AV_CODEC_ID_AMR_NB, 0x0057 }, { AV_CODEC_ID_AMR_NB, 0x0057 },
@ -611,6 +612,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */ { AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */
{ AV_CODEC_ID_AAC, 0xA106 }, { AV_CODEC_ID_AAC, 0xA106 },
{ AV_CODEC_ID_SPEEX, 0xA109 }, { AV_CODEC_ID_SPEEX, 0xA109 },
{ AV_CODEC_ID_G728, 0xCD02 },
{ AV_CODEC_ID_FLAC, 0xF1AC }, { AV_CODEC_ID_FLAC, 0xF1AC },
/* DFPWM does not have an assigned format tag; it uses a GUID in WAVEFORMATEX instead */ /* DFPWM does not have an assigned format tag; it uses a GUID in WAVEFORMATEX instead */
{ AV_CODEC_ID_DFPWM, 0xFFFE }, { AV_CODEC_ID_DFPWM, 0xFFFE },

1
libavformat/riffenc.c
View File

@ -92,6 +92,7 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb,
avio_wl32(pb, par->sample_rate); avio_wl32(pb, par->sample_rate);
if (par->codec_id == AV_CODEC_ID_ATRAC3 || if (par->codec_id == AV_CODEC_ID_ATRAC3 ||
par->codec_id == AV_CODEC_ID_G723_1 || par->codec_id == AV_CODEC_ID_G723_1 ||
par->codec_id == AV_CODEC_ID_G728 ||
par->codec_id == AV_CODEC_ID_MP2 || par->codec_id == AV_CODEC_ID_MP2 ||
par->codec_id == AV_CODEC_ID_MP3 || par->codec_id == AV_CODEC_ID_MP3 ||
par->codec_id == AV_CODEC_ID_GSM_MS) { par->codec_id == AV_CODEC_ID_GSM_MS) {