generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use data size directly instead of recomputing."

Browse Source
This commit is contained in:
Johann Koenig
2016-06-15 18:23:33 +00:00
committed by Gerrit Code Review
parent 9c90830165 a9936de384
commit ace4073090
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vp8/decoder/decodeframe.c
View File

@@ -986,7 +986,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
VP8_COMMON *const pc = &pbi->common; VP8_COMMON *const pc = &pbi->common;
MACROBLOCKD *const xd = &pbi->mb; MACROBLOCKD *const xd = &pbi->mb;
const unsigned char *data = pbi->fragments.ptrs[0]; const unsigned char *data = pbi->fragments.ptrs[0];
const unsigned char *data_end = data + pbi->fragments.sizes[0]; const unsigned int data_sz = pbi->fragments.sizes[0];
const unsigned char *data_end = data + data_sz;
ptrdiff_t first_partition_length_in_bytes; ptrdiff_t first_partition_length_in_bytes;
int i, j, k, l; int i, j, k, l;
@@ -1022,7 +1023,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
const unsigned char *clear = data; const unsigned char *clear = data;
if (pbi->decrypt_cb) if (pbi->decrypt_cb)
{ {
int n = (int)VPXMIN(sizeof(clear_buffer), data_end - data); int n = (int)VPXMIN(sizeof(clear_buffer), data_sz);
pbi->decrypt_cb(pbi->decrypt_state, data, clear_buffer, n); pbi->decrypt_cb(pbi->decrypt_state, data, clear_buffer, n);
clear = clear_buffer; clear = clear_buffer;
} }