RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 04:47:12 +00:00
Code Issues Projects Releases Wiki Activity

rpl: convert to new channel layout API

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-31 18:20:54 +02:00 committed by James Almer
parent 82f728828e
commit 2a4a3f5176
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rpl.c
View File

@ -194,23 +194,25 @@ static int rpl_read_header(AVFormatContext *s)
audio_format = read_int(line, &endptr, &error); // audio format ID audio_format = read_int(line, &endptr, &error); // audio format ID
av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH); av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH);
if (audio_format) { if (audio_format) {
int channels;
ast = avformat_new_stream(s, NULL); ast = avformat_new_stream(s, NULL);
if (!ast) if (!ast)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codecpar->codec_tag = audio_format; ast->codecpar->codec_tag = audio_format;
ast->codecpar->sample_rate = read_line_and_int(pb, &error); // audio bitrate ast->codecpar->sample_rate = read_line_and_int(pb, &error); // audio bitrate
ast->codecpar->channels = read_line_and_int(pb, &error); // number of audio channels channels = read_line_and_int(pb, &error); // number of audio channels
error |= read_line(pb, line, sizeof(line)); error |= read_line(pb, line, sizeof(line));
ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error); // audio bits per sample ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error); // audio bits per sample
av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH); av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH);
ast->codecpar->ch_layout.nb_channels = channels;
// At least one sample uses 0 for ADPCM, which is really 4 bits // At least one sample uses 0 for ADPCM, which is really 4 bits
// per sample. // per sample.
if (ast->codecpar->bits_per_coded_sample == 0) if (ast->codecpar->bits_per_coded_sample == 0)
ast->codecpar->bits_per_coded_sample = 4; ast->codecpar->bits_per_coded_sample = 4;
ast->codecpar->bit_rate = ast->codecpar->sample_rate * ast->codecpar->bit_rate = ast->codecpar->sample_rate *
(int64_t)ast->codecpar->channels; (int64_t)ast->codecpar->ch_layout.nb_channels;
if (ast->codecpar->bit_rate > INT64_MAX / ast->codecpar->bits_per_coded_sample) if (ast->codecpar->bit_rate > INT64_MAX / ast->codecpar->bits_per_coded_sample)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ast->codecpar->bit_rate *= ast->codecpar->bits_per_coded_sample; ast->codecpar->bit_rate *= ast->codecpar->bits_per_coded_sample;