mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-20 14:20:51 +00:00
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: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
parent
3a70c0c95f
commit
b0593a4bca
@ -2465,13 +2465,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;
|
||||||
|
|
||||||
@ -2777,7 +2777,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
|
|||||||
|
|
||||||
/* parse the NAL units */
|
/* parse the NAL units */
|
||||||
for (i = 0; i < s->nb_nals; i++) {
|
for (i = 0; i < s->nb_nals; i++) {
|
||||||
int ret = decode_nal_unit(s, s->nals[i].data, s->nals[i].size);
|
int 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);
|
||||||
|
Loading…
Reference in New Issue
Block a user