uint32_t last_header; // Cached header to see if parsing is needed
int block_size; // Size of a block of samples in bytes
int samples_per_block; // Number of samples per channel per block
- int groups_per_block; // Number of 20/24bit sample groups per block
+ int groups_per_block; // Number of 20/24-bit sample groups per block
uint8_t *extra_samples; // Pointer to leftover samples from a frame
int extra_sample_count; // Number of leftover samples in the buffer
} PCMDVDContext;
return 0;
if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_dlog(avctx, "pcm_dvd_parse_header: header = %02x%02x%02x\n",
+ ff_dlog(avctx, "pcm_dvd_parse_header: header = %02x%02x%02x\n",
header[0], header[1], header[2]);
/*
* header[0] emphasis (1), muse(1), reserved(1), frame number(5)
avctx->sample_rate *
avctx->bits_per_coded_sample;
- /* 4 samples form a group in 20/24bit PCM on DVD Video.
+ /* 4 samples form a group in 20/24-bit PCM on DVD Video.
* A block is formed by the number of groups that are
* needed to complete a set of samples for each channel. */
if (avctx->bits_per_coded_sample == 16) {
}
if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_dlog(avctx,
+ ff_dlog(avctx,
"pcm_dvd_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
avctx->channels, avctx->bits_per_coded_sample,
avctx->sample_rate, avctx->bit_rate);
GetByteContext gb;
int i;
uint8_t t;
- int samples;
bytestream2_init(&gb, src, blocks * s->block_size);
switch (avctx->bits_per_coded_sample) {
- case 16:
+ case 16: {
#if HAVE_BIGENDIAN
bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
dst16 += blocks * s->block_size / 2;
#else
- samples = blocks * avctx->channels;
+ int samples = blocks * avctx->channels;
do {
*dst16++ = bytestream2_get_be16u(&gb);
} while (--samples);
#endif
return dst16;
+ }
case 20:
do {
for (i = s->groups_per_block; i; i--) {
.init = pcm_dvd_decode_init,
.decode = pcm_dvd_decode_frame,
.close = pcm_dvd_decode_uninit,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) {
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE
}