highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ws_snd: use samples pointer for loop termination instead of a separate

Browse Source 
iterator variable.
This commit is contained in:
Justin Ruggles
2011-09-12 09:59:13 -04:00
parent 6a818cb3ff
commit 6896aa7a38
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/ws-snd1.c
View File

@ -62,6 +62,7 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
int sample = 128; int sample = 128;
int i; int i;
uint8_t *samples = data; uint8_t *samples = data;
uint8_t *samples_end;
if (!buf_size) if (!buf_size)
return 0; return 0;
@ -83,6 +84,7 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n"); av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n");
return -1; return -1;
} }
samples_end = samples + out_size;
if (in_size == out_size) { if (in_size == out_size) {
for (i = 0; i < out_size; i++) for (i = 0; i < out_size; i++)
@ -91,24 +93,22 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
return buf_size; return buf_size;
} }
while (out_size > 0 && buf - avpkt->data < buf_size) { while (samples < samples_end && buf - avpkt->data < buf_size) {
int code, smp, size; int code, smp, size;
uint8_t count; uint8_t count;
code = (*buf) >> 6; code = (*buf) >> 6;
count = (*buf) & 0x3F; count = (*buf) & 0x3F;
buf++; buf++;
/* make sure we don't write more than out_size samples */ /* make sure we don't write past the output buffer */
switch (code) { switch (code) {
case 0: smp = 4; break; case 0: smp = 4; break;
case 1: smp = 2; break; case 1: smp = 2; break;
case 2: smp = (count & 0x20) ? 1 : count + 1; break; case 2: smp = (count & 0x20) ? 1 : count + 1; break;
default: smp = count + 1; break; default: smp = count + 1; break;
} }
if (out_size < smp) { if (samples_end - samples < smp)
out_size = 0;
break; break;
}
/* make sure we don't read past the input buffer */ /* make sure we don't read past the input buffer */
size = ((code == 2 && (count & 0x20)) || code == 3) ? 0 : count + 1; size = ((code == 2 && (count & 0x20)) || code == 3) ? 0 : count + 1;
@ -131,7 +131,6 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
sample += ws_adpcm_2bit[(code >> 6) & 0x3]; sample += ws_adpcm_2bit[(code >> 6) & 0x3];
sample = av_clip_uint8(sample); sample = av_clip_uint8(sample);
*samples++ = sample; *samples++ = sample;
out_size -= 4;
} }
break; break;
case 1: /* ADPCM 4-bit */ case 1: /* ADPCM 4-bit */
@ -143,7 +142,6 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
sample += ws_adpcm_4bit[code >> 4]; sample += ws_adpcm_4bit[code >> 4];
sample = av_clip_uint8(sample); sample = av_clip_uint8(sample);
*samples++ = sample; *samples++ = sample;
out_size -= 2;
} }
break; break;
case 2: /* no compression */ case 2: /* no compression */
@ -154,11 +152,9 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
sample += t >> 3; sample += t >> 3;
sample = av_clip_uint8(sample); sample = av_clip_uint8(sample);
*samples++ = sample; *samples++ = sample;
out_size--;
} else { /* copy */ } else { /* copy */
for (count++; count > 0; count--) { for (count++; count > 0; count--) {
*samples++ = *buf++; *samples++ = *buf++;
out_size--;
} }
sample = buf[-1]; sample = buf[-1];
} }
@ -166,7 +162,6 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
default: /* run */ default: /* run */
for(count++; count > 0; count--) { for(count++; count > 0; count--) {
*samples++ = sample; *samples++ = sample;
out_size--;
} }
} }
} }