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

idroq: 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 f9d235f9a2
commit 59530185c9
1 changed files with 5 additions and 7 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. 12
      libavformat/idroqdec.c

12
libavformat/idroqdec.c
Unescape View File

@ -185,18 +185,16 @@ static int roq_read_packet(AVFormatContext *s,
st->codecpar->codec_id = AV_CODEC_ID_ROQ_DPCM; st->codecpar->codec_id = AV_CODEC_ID_ROQ_DPCM;
st->codecpar->codec_tag = 0; /* no tag */ st->codecpar->codec_tag = 0; /* no tag */
if (chunk_type == RoQ_SOUND_STEREO) { if (chunk_type == RoQ_SOUND_STEREO) {
st->codecpar->channels = 2; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
} else { } else {
st->codecpar->channels = 1; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
} }
roq->audio_channels = st->codecpar->channels; roq->audio_channels = st->codecpar->ch_layout.nb_channels;
st->codecpar->sample_rate = RoQ_AUDIO_SAMPLE_RATE; st->codecpar->sample_rate = RoQ_AUDIO_SAMPLE_RATE;
st->codecpar->bits_per_coded_sample = 16; st->codecpar->bits_per_coded_sample = 16;
st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bit_rate = roq->audio_channels * st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample; st->codecpar->bits_per_coded_sample;
st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample; st->codecpar->block_align = roq->audio_channels * st->codecpar->bits_per_coded_sample;
} }
case RoQ_QUAD_VQ: case RoQ_QUAD_VQ:
if (chunk_type == RoQ_QUAD_VQ) { if (chunk_type == RoQ_QUAD_VQ) {

Write Preview
Loading…
Cancel
Save