|
|
|
@ -1480,14 +1480,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// transform decoded frame into output format
|
|
|
|
|
#define INTERLEAVE_OUTPUT(bps) \ |
|
|
|
|
{ \
|
|
|
|
|
int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \
|
|
|
|
|
shift = bps - ctx->avctx->bits_per_raw_sample; \
|
|
|
|
|
if (!sconf->chan_sort) { \
|
|
|
|
|
for (sample = 0; sample < ctx->cur_frame_length; sample++) \
|
|
|
|
|
for (c = 0; c < avctx->channels; c++) \
|
|
|
|
|
*dest++ = ctx->raw_samples[c][sample] << shift; \
|
|
|
|
|
#define INTERLEAVE_OUTPUT(bps) \ |
|
|
|
|
{ \
|
|
|
|
|
int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \
|
|
|
|
|
shift = bps - ctx->avctx->bits_per_raw_sample; \
|
|
|
|
|
if (!sconf->chan_sort) { \
|
|
|
|
|
for (sample = 0; sample < ctx->cur_frame_length; sample++) \
|
|
|
|
|
for (c = 0; c < avctx->channels; c++) \
|
|
|
|
|
*dest++ = ctx->raw_samples[c][sample] << shift; \
|
|
|
|
|
} else { \
|
|
|
|
|
for (sample = 0; sample < ctx->cur_frame_length; sample++) \
|
|
|
|
|
for (c = 0; c < avctx->channels; c++) \
|
|
|
|
|