The bit_rate field has type int64_t since commit
7404f3bdb90e6a5dcb59bc0a091e2c5c038e557d.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id;
par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id;
- par->bit_rate = par->sample_rate * par->channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES;
+ par->bit_rate = (int64_t)par->sample_rate * par->channels * BLOCK_SIZE * 8LL / BLOCK_SAMPLES;
avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, par->sample_rate);
avpriv_set_pts_info(st, 64, BLOCK_SAMPLES, par->sample_rate);
par->block_align = (av_get_bits_per_sample(par->codec_id) * par->channels) >> 3;
if (aiff->block_duration) {
par->block_align = (av_get_bits_per_sample(par->codec_id) * par->channels) >> 3;
if (aiff->block_duration) {
- par->bit_rate = par->sample_rate * (par->block_align << 3) /
+ par->bit_rate = (int64_t)par->sample_rate * (par->block_align << 3) /
st->codecpar->block_align = 35;
}
aiff->block_duration = 160;
st->codecpar->block_align = 35;
}
aiff->block_duration = 160;
- st->codecpar->bit_rate = st->codecpar->sample_rate * (st->codecpar->block_align << 3) /
+ st->codecpar->bit_rate = (int64_t)st->codecpar->sample_rate * (st->codecpar->block_align << 3) /
aiff->block_duration;
}
break;
aiff->block_duration;
}
break;
}
st->codecpar->bits_per_coded_sample = 4;
}
st->codecpar->bits_per_coded_sample = 4;
- st->codecpar->bit_rate = st->codecpar->bits_per_coded_sample * st->codecpar->channels
+ st->codecpar->bit_rate = (int64_t)st->codecpar->bits_per_coded_sample * st->codecpar->channels
* st->codecpar->sample_rate;
st->codecpar->block_align = 1;
* st->codecpar->sample_rate;
st->codecpar->block_align = 1;
astream->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
astream->codecpar->bits_per_coded_sample = 8;
astream->codecpar->bit_rate =
astream->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
astream->codecpar->bits_per_coded_sample = 8;
astream->codecpar->bit_rate =
- astream->codecpar->sample_rate * astream->codecpar->bits_per_coded_sample;
+ (int64_t)astream->codecpar->sample_rate * astream->codecpar->bits_per_coded_sample;
avio_seek(pb, chunk_header - 3, SEEK_SET);
avpriv_set_pts_info(astream, 64, 1, astream->codecpar->sample_rate);
return 0;
avio_seek(pb, chunk_header - 3, SEEK_SET);
avpriv_set_pts_info(astream, 64, 1, astream->codecpar->sample_rate);
return 0;
st->codecpar->channels = ea->num_channels;
st->codecpar->sample_rate = ea->sample_rate;
st->codecpar->bits_per_coded_sample = ea->bytes * 8;
st->codecpar->channels = ea->num_channels;
st->codecpar->sample_rate = ea->sample_rate;
st->codecpar->bits_per_coded_sample = ea->bytes * 8;
- st->codecpar->bit_rate = st->codecpar->channels *
+ st->codecpar->bit_rate = (int64_t)st->codecpar->channels *
st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample / 4;
st->codecpar->block_align = st->codecpar->channels *
st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample / 4;
st->codecpar->block_align = st->codecpar->channels *
}
st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id);
}
st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id);
- st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample;
+ st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample;
st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample;
if (st->codecpar->codec_tag == ID_DSD && st->codecpar->block_align <= 0)
return AVERROR_INVALIDDATA;
st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample;
if (st->codecpar->codec_tag == ID_DSD && st->codecpar->block_align <= 0)
return AVERROR_INVALIDDATA;
st->codecpar->sample_rate = sample_rate;
st->codecpar->bits_per_coded_sample = 32;
st->codecpar->sample_rate = sample_rate;
st->codecpar->bits_per_coded_sample = 32;
- st->codecpar->bit_rate = st->codecpar->sample_rate *
+ st->codecpar->bit_rate = (int64_t)st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample *
st->codecpar->channels;
st->codecpar->block_align = st->codecpar->bits_per_coded_sample *
st->codecpar->bits_per_coded_sample *
st->codecpar->channels;
st->codecpar->block_align = st->codecpar->bits_per_coded_sample *
- par->bit_rate = par->sample_rate * par->channels * par->bits_per_coded_sample;
+ par->bit_rate = (int64_t)par->sample_rate * par->channels * par->bits_per_coded_sample;
if (max_size <= 0)
max_size = 2048;
if (max_size <= 0)
max_size = 2048;
return AVERROR_INVALIDDATA;
}
return AVERROR_INVALIDDATA;
}
- st->codecpar->bit_rate = read_bitrate * 1000;
+ st->codecpar->bit_rate = (int64_t)read_bitrate * 1000;
break;
case MKTAG('D','S','I','Z'): // size of compressed data
{
break;
case MKTAG('D','S','I','Z'): // size of compressed data
{
st->codecpar->sample_rate = avio_rb32(pb) / 8;
avio_skip(pb, 4);
st->codecpar->channels = avio_r8(pb) & 0xF;
st->codecpar->sample_rate = avio_rb32(pb) / 8;
avio_skip(pb, 4);
st->codecpar->channels = avio_r8(pb) & 0xF;
- st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * 8LL;
+ st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate * 8LL;
if (!st->codecpar->channels)
return AVERROR_INVALIDDATA;
if (!st->codecpar->channels)
return AVERROR_INVALIDDATA;