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

avcodec/hevc: Simplify entry_point_offset parsing

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-13 13:24:36 +02:00
parent 1c6ae98d4a
commit 6679d5f29a
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/hevc.c
View File

@@ -717,8 +717,6 @@ static int hls_slice_header(HEVCContext *s)
sh->num_entry_point_offsets = num_entry_point_offsets; sh->num_entry_point_offsets = num_entry_point_offsets;
if (sh->num_entry_point_offsets > 0) { if (sh->num_entry_point_offsets > 0) {
int offset_len = get_ue_golomb_long(gb) + 1; int offset_len = get_ue_golomb_long(gb) + 1;
int segments = offset_len >> 4;
int rest = (offset_len & 15);
if (offset_len < 1 || offset_len > 32) { if (offset_len < 1 || offset_len > 32) {
sh->num_entry_point_offsets = 0; sh->num_entry_point_offsets = 0;
@@ -738,15 +736,7 @@ static int hls_slice_header(HEVCContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
for (i = 0; i < sh->num_entry_point_offsets; i++) { for (i = 0; i < sh->num_entry_point_offsets; i++) {
int val = 0; unsigned val = get_bits_long(gb, offset_len);
for (j = 0; j < segments; j++) {
val <<= 16;
val += get_bits(gb, 16);
}
if (rest) {
val <<= rest;
val += get_bits(gb, rest);
}
sh->entry_point_offset[i] = val + 1; // +1; // +1 to get the size sh->entry_point_offset[i] = val + 1; // +1; // +1 to get the size
} }
if (s->threads_number > 1 && (s->pps->num_tile_rows > 1 || s->pps->num_tile_columns > 1)) { if (s->threads_number > 1 && (s->pps->num_tile_rows > 1 || s->pps->num_tile_columns > 1)) {