diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-10-22 16:03:20 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-01 11:29:17 -0400 |
| commit | 0fd1ddf15545a7bac1e8d2622d070fdf4bad95d8 (patch) | |
| tree | 3c7c05cd4b5686a3c18cd520097543b86da65b08 /libavcodec/dpcm.c | |
| parent | 1c7a0161538a9e8417086759a5d6d3295337c433 (diff) | |
dpcm: use AVCodecContext.channels instead of keeping a private copy
Diffstat (limited to 'libavcodec/dpcm.c')
| -rw-r--r-- | libavcodec/dpcm.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index f9aff98417..fb1c7ce6f2 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -44,7 +44,6 @@ typedef struct DPCMContext { AVFrame frame; - int channels; int16_t roq_square_array[256]; int sample[2]; ///< previous sample (for SOL_DPCM) const int8_t *sol_table; ///< delta table for SOL_DPCM @@ -123,7 +122,6 @@ static av_cold int dpcm_decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - s->channels = avctx->channels; s->sample[0] = s->sample[1] = 0; switch(avctx->codec->id) { @@ -179,7 +177,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, int out = 0, ret; int predictor[2]; int ch = 0; - int stereo = s->channels - 1; + int stereo = avctx->channels - 1; int16_t *output_samples, *samples_end; GetByteContext gb; @@ -193,10 +191,10 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, out = buf_size - 8; break; case AV_CODEC_ID_INTERPLAY_DPCM: - out = buf_size - 6 - s->channels; + out = buf_size - 6 - avctx->channels; break; case AV_CODEC_ID_XAN_DPCM: - out = buf_size - 2 * s->channels; + out = buf_size - 2 * avctx->channels; break; case AV_CODEC_ID_SOL_DPCM: if (avctx->codec_tag != 3) @@ -211,7 +209,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, } /* get output buffer */ - s->frame.nb_samples = out / s->channels; + s->frame.nb_samples = out / avctx->channels; if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; @@ -245,7 +243,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, case AV_CODEC_ID_INTERPLAY_DPCM: bytestream2_skipu(&gb, 6); /* skip over the stream mask and stream length */ - for (ch = 0; ch < s->channels; ch++) { + for (ch = 0; ch < avctx->channels; ch++) { predictor[ch] = sign_extend(bytestream2_get_le16u(&gb), 16); *output_samples++ = predictor[ch]; } @@ -265,7 +263,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, { int shift[2] = { 4, 4 }; - for (ch = 0; ch < s->channels; ch++) + for (ch = 0; ch < avctx->channels; ch++) predictor[ch] = sign_extend(bytestream2_get_le16u(&gb), 16); ch = 0; |