Skip to content

F
ffmpeg
Commit 3a91b3ae authored by Aman Gupta's avatar Aman Gupta
Browse files
Options

avcodec/hevc: implement new decode_params callback for VideoToolbox 

Signed-off-by: 's avatarAman Gupta <aman@tmm1.net>
parent bd2d70c0
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 0 deletions
libavcodec/hevcdec.c
View file @ 3a91b3ae
...@@ -2824,23 +2824,55 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) ...@@ -2824,23 +2824,55 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal)
switch (s->nal_unit_type) { switch (s->nal_unit_type) {
case HEVC_NAL_VPS: case HEVC_NAL_VPS:
if (s->avctx->hwaccel && s->avctx->hwaccel->decode_params) {
ret = s->avctx->hwaccel->decode_params(s->avctx,
nal->type,
nal->raw_data,
nal->raw_size);
if (ret < 0)
goto fail;
}
ret = ff_hevc_decode_nal_vps(gb, s->avctx, &s->ps); ret = ff_hevc_decode_nal_vps(gb, s->avctx, &s->ps);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
break; break;
case HEVC_NAL_SPS: case HEVC_NAL_SPS:
if (s->avctx->hwaccel && s->avctx->hwaccel->decode_params) {
ret = s->avctx->hwaccel->decode_params(s->avctx,
nal->type,
nal->raw_data,
nal->raw_size);
if (ret < 0)
goto fail;
}
ret = ff_hevc_decode_nal_sps(gb, s->avctx, &s->ps, ret = ff_hevc_decode_nal_sps(gb, s->avctx, &s->ps,
s->apply_defdispwin); s->apply_defdispwin);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
break; break;
case HEVC_NAL_PPS: case HEVC_NAL_PPS:
if (s->avctx->hwaccel && s->avctx->hwaccel->decode_params) {
ret = s->avctx->hwaccel->decode_params(s->avctx,
nal->type,
nal->raw_data,
nal->raw_size);
if (ret < 0)
goto fail;
}
ret = ff_hevc_decode_nal_pps(gb, s->avctx, &s->ps); ret = ff_hevc_decode_nal_pps(gb, s->avctx, &s->ps);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
break; break;
case HEVC_NAL_SEI_PREFIX: case HEVC_NAL_SEI_PREFIX:
case HEVC_NAL_SEI_SUFFIX: case HEVC_NAL_SEI_SUFFIX:
if (s->avctx->hwaccel && s->avctx->hwaccel->decode_params) {
ret = s->avctx->hwaccel->decode_params(s->avctx,
nal->type,
nal->raw_data,
nal->raw_size);
if (ret < 0)
goto fail;
}
ret = ff_hevc_decode_nal_sei(gb, s->avctx, &s->sei, &s->ps, s->nal_unit_type); ret = ff_hevc_decode_nal_sei(gb, s->avctx, &s->sei, &s->ps, s->nal_unit_type);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
......
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