Commit 77140279 authored by Hendrik Leppkes's avatar Hendrik Leppkes Committed by Michael Niedermayer

hevc: pass the full HEVCNAL struct to decode_nal_unit

This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1296dc60
...@@ -2580,13 +2580,13 @@ fail: ...@@ -2580,13 +2580,13 @@ fail:
return ret; return ret;
} }
static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length) static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
{ {
HEVCLocalContext *lc = s->HEVClc; HEVCLocalContext *lc = s->HEVClc;
GetBitContext *gb = &lc->gb; GetBitContext *gb = &lc->gb;
int ctb_addr_ts, ret; int ctb_addr_ts, ret;
ret = init_get_bits8(gb, nal, length); ret = init_get_bits8(gb, nal->data, nal->size);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -2685,7 +2685,7 @@ static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length) ...@@ -2685,7 +2685,7 @@ static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length)
} }
if (s->threads_number > 1 && s->sh.num_entry_point_offsets > 0) if (s->threads_number > 1 && s->sh.num_entry_point_offsets > 0)
ctb_addr_ts = hls_slice_data_wpp(s, nal, length); ctb_addr_ts = hls_slice_data_wpp(s, nal->data, nal->size);
else else
ctb_addr_ts = hls_slice_data(s); ctb_addr_ts = hls_slice_data(s);
if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) { if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) {
...@@ -2937,7 +2937,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) ...@@ -2937,7 +2937,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
s->skipped_bytes = s->skipped_bytes_nal[i]; s->skipped_bytes = s->skipped_bytes_nal[i];
s->skipped_bytes_pos = s->skipped_bytes_pos_nal[i]; s->skipped_bytes_pos = s->skipped_bytes_pos_nal[i];
ret = decode_nal_unit(s, s->nals[i].data, s->nals[i].size); ret = decode_nal_unit(s, &s->nals[i]);
if (ret < 0) { if (ret < 0) {
av_log(s->avctx, AV_LOG_WARNING, av_log(s->avctx, AV_LOG_WARNING,
"Error parsing NAL unit #%d.\n", i); "Error parsing NAL unit #%d.\n", i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment