RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flac: Use a local cache for decode_residual() 

About an additional 4% speedup.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Luca Barbato 2017-04-29 02:15:32 +00:00 committed by Diego Biurrun
parent 15f1cc09a4
commit 0f5ad12ba2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/flacdec.c
View File

@ -199,12 +199,13 @@ static int get_metadata_size(const uint8_t *buf, int buf_size)
static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order) static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
{ {
BitstreamContext bc = s->bc;
int i, tmp, partition, method_type, rice_order; int i, tmp, partition, method_type, rice_order;
int rice_bits, rice_esc; int rice_bits, rice_esc;
int samples; int samples;
method_type = bitstream_read(&s->bc, 2); method_type = bitstream_read(&bc, 2);
rice_order = bitstream_read(&s->bc, 4); rice_order = bitstream_read(&bc, 4);
samples = s->blocksize >> rice_order; samples = s->blocksize >> rice_order;
rice_bits = 4 + method_type; rice_bits = 4 + method_type;
@ -226,19 +227,21 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
} }
for (partition = 0; partition < (1 << rice_order); partition++) { for (partition = 0; partition < (1 << rice_order); partition++) {
tmp = bitstream_read(&s->bc, rice_bits); tmp = bitstream_read(&bc, rice_bits);
if (tmp == rice_esc) { if (tmp == rice_esc) {
tmp = bitstream_read(&s->bc, 5); tmp = bitstream_read(&bc, 5);
for (; i < samples; i++) for (; i < samples; i++)
*decoded++ = bitstream_read_signed(&s->bc, tmp); *decoded++ = bitstream_read_signed(&bc, tmp);
} else { } else {
for (; i < samples; i++) { for (; i < samples; i++) {
*decoded++ = get_sr_golomb_flac(&s->bc, tmp, INT_MAX, 0); *decoded++ = get_sr_golomb_flac(&bc, tmp, INT_MAX, 0);
} }
} }
i= 0; i= 0;
} }
s->bc = bc;
return 0; return 0;
} }