avformat: Inline raw_codec_id where known

Andreas Rheinhardt committed 3 years ago

Commit 830b5cc1 parent d0b03b47 files · +7 −7Browse files

Unified · Split

7 files

libavformat/aacdec.c +1 −1
libavformat/adxdec.c +1 −1
libavformat/dfpwmdec.c +1 −1
libavformat/gsmdec.c +1 −1
libavformat/loasdec.c +1 −1
libavformat/serdec.c +1 −1
libavformat/wsddec.c +1 −1

libavformat/aacdec.c+1−1

@@ -113,7 +113,7 @@ static int adts_aac_read_header(AVFormatContext *s) · 112 unmodified lines
113	113	return AVERROR(ENOMEM);
114	114
115	115	st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
116		− st->codecpar->codec_id = s->iformat->raw_codec_id;
	116	+ st->codecpar->codec_id = AV_CODEC_ID_AAC;
117	117	ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW;
118	118
119	119	ff_id3v1_read(s);

libavformat/adxdec.c+1−1

@@ -120,7 +120,7 @@ static int adx_read_header(AVFormatContext *s) · 119 unmodified lines
120	120
121	121	par->ch_layout.nb_channels = channels;
122	122	par->codec_type = AVMEDIA_TYPE_AUDIO;
123		− par->codec_id = s->iformat->raw_codec_id;
	123	+ par->codec_id = AV_CODEC_ID_ADPCM_ADX;
124	124	par->bit_rate = (int64_t)par->sample_rate * par->ch_layout.nb_channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES;
125	125
126	126	avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, par->sample_rate);

libavformat/dfpwmdec.c+1−1

@@ -50,7 +50,7 @@ static int dfpwm_read_header(AVFormatContext *s) · 49 unmodified lines
50	50	par = st->codecpar;
51	51
52	52	par->codec_type = AVMEDIA_TYPE_AUDIO;
53		− par->codec_id = s->iformat->raw_codec_id;
	53	+ par->codec_id = AV_CODEC_ID_DFPWM;
54	54	par->sample_rate = s1->sample_rate;
55	55	#if FF_API_OLD_CHANNEL_LAYOUT
56	56	if (s1->ch_layout.nb_channels) {

libavformat/gsmdec.c+1−1

@@ -78,7 +78,7 @@ static int gsm_read_header(AVFormatContext *s) · 77 unmodified lines
78	78	return AVERROR(ENOMEM);
79	79
80	80	st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
81		− st->codecpar->codec_id = s->iformat->raw_codec_id;
	81	+ st->codecpar->codec_id = AV_CODEC_ID_GSM;
82	82	st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
83	83	st->codecpar->sample_rate = c->sample_rate;
84	84	st->codecpar->bit_rate = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES;

libavformat/loasdec.c+1−1

@@ -74,7 +74,7 @@ static int loas_read_header(AVFormatContext *s) · 73 unmodified lines
74	74	return AVERROR(ENOMEM);
75	75
76	76	st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
77		− st->codecpar->codec_id = s->iformat->raw_codec_id;
	77	+ st->codecpar->codec_id = AV_CODEC_ID_AAC_LATM;
78	78	ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW;
79	79
80	80	//LCM of all possible AAC sample rates

libavformat/serdec.c+1−1

@@ -80,7 +80,7 @@ static int ser_read_header(AVFormatContext *s) · 79 unmodified lines
80	80	}
81	81
82	82	st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
83		− st->codecpar->codec_id = s->iformat->raw_codec_id;
	83	+ st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
84	84
85	85	avpriv_set_pts_info(st, 64, ser->framerate.den, ser->framerate.num);
86	86

libavformat/wsddec.c+1−1

@@ -125,7 +125,7 @@ static int wsd_read_header(AVFormatContext *s) · 124 unmodified lines
125	125	av_dict_set(&s->metadata, "playback_time", playback_time, 0);
126	126
127	127	st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
128		− st->codecpar->codec_id = s->iformat->raw_codec_id;
	128	+ st->codecpar->codec_id = AV_CODEC_ID_DSD_MSBF;
129	129	st->codecpar->sample_rate = avio_rb32(pb) / 8;
130	130	avio_skip(pb, 4);
131	131	st->codecpar->ch_layout.nb_channels = avio_r8(pb) & 0xF;