Skip to content

F
ffmpeg.wasm-core
Commit fc6faee0 authored by Justin Ruggles's avatar Justin Ruggles
Browse files
Options

dpcm: move codec-specific variable declarations to their corresponding decoding blocks.

parent 989bb7bd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavcodec/dpcm.c
View file @ fc6faee0
...@@ -175,8 +175,6 @@ static int dpcm_decode_frame(AVCodecContext *avctx, ...@@ -175,8 +175,6 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
int ch = 0; int ch = 0;
int stereo = s->channels - 1; int stereo = s->channels - 1;
short *output_samples = data; short *output_samples = data;
int shift[2];
short diff;
if (!buf_size) if (!buf_size)
return 0; return 0;
...@@ -253,8 +251,9 @@ static int dpcm_decode_frame(AVCodecContext *avctx, ...@@ -253,8 +251,9 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
break; break;
case CODEC_ID_XAN_DPCM: case CODEC_ID_XAN_DPCM:
{
int shift[2] = { 4, 4 };
in = 0; in = 0;
shift[0] = shift[1] = 4;
predictor[0] = AV_RL16(&buf[in]); predictor[0] = AV_RL16(&buf[in]);
in += 2; in += 2;
SE_16BIT(predictor[0]); SE_16BIT(predictor[0]);
...@@ -266,7 +265,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, ...@@ -266,7 +265,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
while (in < buf_size) { while (in < buf_size) {
uint8_t n = buf[in++]; uint8_t n = buf[in++];
diff = (n & 0xFC) << 8; int16_t diff = (n & 0xFC) << 8;
if ((n & 0x03) == 3) if ((n & 0x03) == 3)
shift[ch]++; shift[ch]++;
else else
...@@ -285,6 +284,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, ...@@ -285,6 +284,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
ch ^= stereo; ch ^= stereo;
} }
break; break;
}
case CODEC_ID_SOL_DPCM: case CODEC_ID_SOL_DPCM:
in = 0; in = 0;
if (avctx->codec_tag != 3) { if (avctx->codec_tag != 3) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment