Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

xvag: 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>
release/5.1
Vittorio Giovara 8 years ago committed by James Almer
parent fdfbc47a0d
commit 4f7c45208e
1 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      libavformat/xvag.c

9
libavformat/xvag.c
Unescape View File

@ -52,7 +52,7 @@ static int xvag_read_header(AVFormatContext *s)
offset = av_bswap32(offset); offset = av_bswap32(offset);
avio_skip(s->pb, 28); avio_skip(s->pb, 28);
codec = avio_rb32(s->pb); codec = avio_rb32(s->pb);
st->codecpar->channels = avio_rb32(s->pb); st->codecpar->ch_layout.nb_channels = avio_rb32(s->pb);
avio_skip(s->pb, 4); avio_skip(s->pb, 4);
st->duration = avio_rb32(s->pb); st->duration = avio_rb32(s->pb);
avio_skip(s->pb, 8); avio_skip(s->pb, 8);
@ -60,7 +60,7 @@ static int xvag_read_header(AVFormatContext *s)
} else { } else {
avio_skip(s->pb, 28); avio_skip(s->pb, 28);
codec = avio_rl32(s->pb); codec = avio_rl32(s->pb);
st->codecpar->channels = avio_rl32(s->pb); st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb);
avio_skip(s->pb, 4); avio_skip(s->pb, 4);
st->duration = avio_rl32(s->pb); st->duration = avio_rl32(s->pb);
avio_skip(s->pb, 8); avio_skip(s->pb, 8);
@ -69,13 +69,14 @@ static int xvag_read_header(AVFormatContext *s)
if (st->codecpar->sample_rate <= 0) if (st->codecpar->sample_rate <= 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (st->codecpar->channels <= 0 || st->codecpar->channels > FF_SANE_NB_CHANNELS) if (st->codecpar->ch_layout.nb_channels <= 0 ||
st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
switch (codec) { switch (codec) {
case 0x1c: case 0x1c:
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codecpar->block_align = 16 * st->codecpar->channels; st->codecpar->block_align = 16 * st->codecpar->ch_layout.nb_channels;
break; break;
default: default:
avpriv_request_sample(s, "codec %X", codec); avpriv_request_sample(s, "codec %X", codec);

Write Preview
Loading…
Cancel
Save