History

avformat/riff: G.728 muxing and demuxing

Peter Ross committed 1 year ago

Commit dee4edf1 parent 52f62462 files · +3 −0Browse files

Unified · Split

2 files
  1. libavformat/riff.c +2 −0
  2. libavformat/riffenc.c +1 −0
libavformat/riff.c+2−0
@@ -555,6 +555,7 @@ const AVCodecTag ff_codec_wav_tags[] = { · 554 unmodified lines
555 { AV_CODEC_ID_ADPCM_G726, 0x0045 },555 { AV_CODEC_ID_ADPCM_G726, 0x0045 },
556 { AV_CODEC_ID_ADPCM_G726, 0x0014 }, /* g723 Antex */556 { AV_CODEC_ID_ADPCM_G726, 0x0014 }, /* g723 Antex */
557 { AV_CODEC_ID_ADPCM_G726, 0x0040 }, /* g721 Antex */557 { AV_CODEC_ID_ADPCM_G726, 0x0040 }, /* g721 Antex */
558 { AV_CODEC_ID_G728, 0x0041 },
558 { AV_CODEC_ID_MP2, 0x0050 },559 { AV_CODEC_ID_MP2, 0x0050 },
559 { AV_CODEC_ID_MP3, 0x0055 },560 { AV_CODEC_ID_MP3, 0x0055 },
560 { AV_CODEC_ID_AMR_NB, 0x0057 },561 { AV_CODEC_ID_AMR_NB, 0x0057 },
@@ -611,6 +612,7 @@ const AVCodecTag ff_codec_wav_tags[] = { · 50 unmodified lines
611 { AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */612 { AV_CODEC_ID_G723_1, 0xA100 }, /* Comverse Infosys Ltd. G723 1 */
612 { AV_CODEC_ID_AAC, 0xA106 },613 { AV_CODEC_ID_AAC, 0xA106 },
613 { AV_CODEC_ID_SPEEX, 0xA109 },614 { AV_CODEC_ID_SPEEX, 0xA109 },
615 { AV_CODEC_ID_G728, 0xCD02 },
614 { AV_CODEC_ID_FLAC, 0xF1AC },616 { AV_CODEC_ID_FLAC, 0xF1AC },
615 /* DFPWM does not have an assigned format tag; it uses a GUID in WAVEFORMATEX instead */617 /* DFPWM does not have an assigned format tag; it uses a GUID in WAVEFORMATEX instead */
616 { AV_CODEC_ID_DFPWM, 0xFFFE },618 { AV_CODEC_ID_DFPWM, 0xFFFE },
libavformat/riffenc.c+1−0
@@ -92,6 +92,7 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, · 91 unmodified lines
92 avio_wl32(pb, par->sample_rate);92 avio_wl32(pb, par->sample_rate);
93 if (par->codec_id == AV_CODEC_ID_ATRAC3 ||93 if (par->codec_id == AV_CODEC_ID_ATRAC3 ||
94 par->codec_id == AV_CODEC_ID_G723_1 ||94 par->codec_id == AV_CODEC_ID_G723_1 ||
95 par->codec_id == AV_CODEC_ID_G728 ||
95 par->codec_id == AV_CODEC_ID_MP2 ||96 par->codec_id == AV_CODEC_ID_MP2 ||
96 par->codec_id == AV_CODEC_ID_MP3 ||97 par->codec_id == AV_CODEC_ID_MP3 ||
97 par->codec_id == AV_CODEC_ID_GSM_MS) {98 par->codec_id == AV_CODEC_ID_GSM_MS) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t