har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '0f5ad12ba2b538cb329c507ecc914e06bfa70194'

Browse Source 
* commit '0f5ad12ba2b538cb329c507ecc914e06bfa70194':
  flac: Use a local cache for decode_residual()

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-07 19:08:46 -03:00
commit ec703910af
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

@ -220,12 +220,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)
{ {
GetBitContext gb = s->gb;
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 = get_bits(&s->gb, 2); method_type = get_bits(&gb, 2);
rice_order = get_bits(&s->gb, 4); rice_order = get_bits(&gb, 4);
samples = s->blocksize >> rice_order; samples = s->blocksize >> rice_order;
rice_bits = 4 + method_type; rice_bits = 4 + method_type;
@ -253,15 +254,15 @@ 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 = get_bits(&s->gb, rice_bits); tmp = get_bits(&gb, rice_bits);
if (tmp == rice_esc) { if (tmp == rice_esc) {
tmp = get_bits(&s->gb, 5); tmp = get_bits(&gb, 5);
for (; i < samples; i++) for (; i < samples; i++)
*decoded++ = get_sbits_long(&s->gb, tmp); *decoded++ = get_sbits_long(&gb, tmp);
} else { } else {
int real_limit = tmp ? (INT_MAX >> tmp) + 2 : INT_MAX; int real_limit = tmp ? (INT_MAX >> tmp) + 2 : INT_MAX;
for (; i < samples; i++) { for (; i < samples; i++) {
int v = get_sr_golomb_flac(&s->gb, tmp, real_limit, 0); int v = get_sr_golomb_flac(&gb, tmp, real_limit, 0);
if (v == 0x80000000){ if (v == 0x80000000){
av_log(s->avctx, AV_LOG_ERROR, "invalid residual\n"); av_log(s->avctx, AV_LOG_ERROR, "invalid residual\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -273,6 +274,8 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
i= 0; i= 0;
} }
s->gb = gb;
return 0; return 0;
} }