highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsd: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov
2019-05-13 11:11:26 +02:00
committed by James Almer
parent 2a4a3f5176
commit 271a9b632c
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/rsd.c
View File

@@ -81,9 +81,9 @@ static int rsd_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
par->channels = avio_rl32(pb); par->ch_layout.nb_channels = avio_rl32(pb);
if (par->channels <= 0 || par->channels > INT_MAX / 36) { if (par->ch_layout.nb_channels <= 0 || par->ch_layout.nb_channels > INT_MAX / 36) {
av_log(s, AV_LOG_ERROR, "Invalid number of channels: %d\n", par->channels); av_log(s, AV_LOG_ERROR, "Invalid number of channels: %d\n", par->ch_layout.nb_channels);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@@ -102,17 +102,17 @@ static int rsd_read_header(AVFormatContext *s)
memset(par->extradata, 0, 34); memset(par->extradata, 0, 34);
break; break;
case AV_CODEC_ID_ADPCM_PSX: case AV_CODEC_ID_ADPCM_PSX:
par->block_align = 16 * par->channels; par->block_align = 16 * par->ch_layout.nb_channels;
break; break;
case AV_CODEC_ID_ADPCM_IMA_RAD: case AV_CODEC_ID_ADPCM_IMA_RAD:
par->block_align = 20 * par->channels; par->block_align = 20 * par->ch_layout.nb_channels;
break; break;
case AV_CODEC_ID_ADPCM_IMA_WAV: case AV_CODEC_ID_ADPCM_IMA_WAV:
if (version == 2) if (version == 2)
start = avio_rl32(pb); start = avio_rl32(pb);
par->bits_per_coded_sample = 4; par->bits_per_coded_sample = 4;
par->block_align = 36 * par->channels; par->block_align = 36 * par->ch_layout.nb_channels;
break; break;
case AV_CODEC_ID_ADPCM_THP_LE: case AV_CODEC_ID_ADPCM_THP_LE:
/* RSD3GADP is mono, so only alloc enough memory /* RSD3GADP is mono, so only alloc enough memory
@@ -124,13 +124,13 @@ static int rsd_read_header(AVFormatContext *s)
return ret; return ret;
break; break;
case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP:
par->block_align = 8 * par->channels; par->block_align = 8 * par->ch_layout.nb_channels;
avio_skip(s->pb, 0x1A4 - avio_tell(s->pb)); avio_skip(s->pb, 0x1A4 - avio_tell(s->pb));
if ((ret = ff_alloc_extradata(st->codecpar, 32 * par->channels)) < 0) if ((ret = ff_alloc_extradata(st->codecpar, 32 * par->ch_layout.nb_channels)) < 0)
return ret; return ret;
for (i = 0; i < par->channels; i++) { for (i = 0; i < par->ch_layout.nb_channels; i++) {
if (avio_feof(pb)) if (avio_feof(pb))
return AVERROR_EOF; return AVERROR_EOF;
avio_read(s->pb, st->codecpar->extradata + 32 * i, 32); avio_read(s->pb, st->codecpar->extradata + 32 * i, 32);
@@ -159,11 +159,11 @@ static int rsd_read_header(AVFormatContext *s)
st->duration = av_get_audio_frame_duration2(par, remaining - start); st->duration = av_get_audio_frame_duration2(par, remaining - start);
break; break;
case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP:
st->duration = (remaining - start) / (8 * par->channels) * 14; st->duration = (remaining - start) / (8 * par->ch_layout.nb_channels) * 14;
break; break;
case AV_CODEC_ID_PCM_S16LE: case AV_CODEC_ID_PCM_S16LE:
case AV_CODEC_ID_PCM_S16BE: case AV_CODEC_ID_PCM_S16BE:
st->duration = (remaining - start) / 2 / par->channels; st->duration = (remaining - start) / 2 / par->ch_layout.nb_channels;
} }
} }
@@ -194,14 +194,14 @@ static int rsd_read_packet(AVFormatContext *s, AVPacket *pkt)
par->codec_id == AV_CODEC_ID_XMA2) { par->codec_id == AV_CODEC_ID_XMA2) {
ret = av_get_packet(s->pb, pkt, par->block_align); ret = av_get_packet(s->pb, pkt, par->block_align);
} else if (par->codec_tag == MKTAG('W','A','D','P') && } else if (par->codec_tag == MKTAG('W','A','D','P') &&
par->channels > 1) { par->ch_layout.nb_channels > 1) {
int i, ch; int i, ch;
ret = av_new_packet(pkt, par->block_align); ret = av_new_packet(pkt, par->block_align);
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
for (ch = 0; ch < par->channels; ch++) { for (ch = 0; ch < par->ch_layout.nb_channels; ch++) {
pkt->data[ch * 8 + i * 2 + 0] = avio_r8(s->pb); pkt->data[ch * 8 + i * 2 + 0] = avio_r8(s->pb);
pkt->data[ch * 8 + i * 2 + 1] = avio_r8(s->pb); pkt->data[ch * 8 + i * 2 + 1] = avio_r8(s->pb);
} }