RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat: Inline raw_codec_id where known 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-11 15:34:42 +02:00
parent d0b03b4182
commit 830b5cc35e
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/aacdec.c
View File

@ -113,7 +113,7 @@ static int adts_aac_read_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = s->iformat->raw_codec_id; st->codecpar->codec_id = AV_CODEC_ID_AAC;
ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW;
ff_id3v1_read(s); ff_id3v1_read(s);

2
libavformat/adxdec.c
View File

@ -120,7 +120,7 @@ static int adx_read_header(AVFormatContext *s)
par->ch_layout.nb_channels = channels; par->ch_layout.nb_channels = channels;
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id; par->codec_id = AV_CODEC_ID_ADPCM_ADX;
par->bit_rate = (int64_t)par->sample_rate * par->ch_layout.nb_channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES; par->bit_rate = (int64_t)par->sample_rate * par->ch_layout.nb_channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES;
avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, par->sample_rate); avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, par->sample_rate);

2
libavformat/dfpwmdec.c
View File

@ -50,7 +50,7 @@ static int dfpwm_read_header(AVFormatContext *s)
par = st->codecpar; par = st->codecpar;
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id; par->codec_id = AV_CODEC_ID_DFPWM;
par->sample_rate = s1->sample_rate; par->sample_rate = s1->sample_rate;
#if FF_API_OLD_CHANNEL_LAYOUT #if FF_API_OLD_CHANNEL_LAYOUT
if (s1->ch_layout.nb_channels) { if (s1->ch_layout.nb_channels) {

2
libavformat/gsmdec.c
View File

@ -78,7 +78,7 @@ static int gsm_read_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = s->iformat->raw_codec_id; st->codecpar->codec_id = AV_CODEC_ID_GSM;
st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
st->codecpar->sample_rate = c->sample_rate; st->codecpar->sample_rate = c->sample_rate;
st->codecpar->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES; st->codecpar->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES;

2
libavformat/loasdec.c
View File

@ -74,7 +74,7 @@ static int loas_read_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = s->iformat->raw_codec_id; st->codecpar->codec_id = AV_CODEC_ID_AAC_LATM;
ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW;
//LCM of all possible AAC sample rates //LCM of all possible AAC sample rates

2
libavformat/serdec.c
View File

@ -80,7 +80,7 @@ static int ser_read_header(AVFormatContext *s)
} }
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
st->codecpar->codec_id = s->iformat->raw_codec_id; st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
avpriv_set_pts_info(st, 64, ser->framerate.den, ser->framerate.num); avpriv_set_pts_info(st, 64, ser->framerate.den, ser->framerate.num);

2
libavformat/wsddec.c
View File

@ -125,7 +125,7 @@ static int wsd_read_header(AVFormatContext *s)
av_dict_set(&s->metadata, "playback_time", playback_time, 0); av_dict_set(&s->metadata, "playback_time", playback_time, 0);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = s->iformat->raw_codec_id; st->codecpar->codec_id = AV_CODEC_ID_DSD_MSBF;
st->codecpar->sample_rate = avio_rb32(pb) / 8; st->codecpar->sample_rate = avio_rb32(pb) / 8;
avio_skip(pb, 4); avio_skip(pb, 4);
st->codecpar->ch_layout.nb_channels = avio_r8(pb) & 0xF; st->codecpar->ch_layout.nb_channels = avio_r8(pb) & 0xF;