diff options
| -rw-r--r-- | libavcodec/hevc.c | 38 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 3 | ||||
| -rw-r--r-- | libavcodec/hevc_refs.c | 17 |
3 files changed, 56 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 0148aba658..bf7203a9c0 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -385,6 +385,8 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb) static int set_sps(HEVCContext *s, const HEVCSPS *sps) { + #define HWACCEL_MAX (0) + enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; int ret; unsigned int num = 0, den = 0; @@ -397,9 +399,16 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps) s->avctx->coded_height = sps->height; s->avctx->width = sps->output_width; s->avctx->height = sps->output_height; - s->avctx->pix_fmt = sps->pix_fmt; s->avctx->has_b_frames = sps->temporal_layer[sps->max_sub_layers - 1].num_reorder_pics; + *fmt++ = sps->pix_fmt; + *fmt = AV_PIX_FMT_NONE; + + ret = ff_get_format(s->avctx, pix_fmts); + if (ret < 0) + goto fail; + s->avctx->pix_fmt = ret; + ff_set_sar(s->avctx, sps->vui.sar); if (sps->vui.video_signal_type_present_flag) @@ -422,7 +431,7 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps) ff_hevc_dsp_init (&s->hevcdsp, sps->bit_depth); ff_videodsp_init (&s->vdsp, sps->bit_depth); - if (sps->sao_enabled) { + if (sps->sao_enabled && !s->avctx->hwaccel) { av_frame_unref(s->tmp_frame); ret = ff_get_buffer(s->avctx, s->tmp_frame, AV_GET_BUFFER_FLAG_REF); if (ret < 0) @@ -2571,6 +2580,17 @@ static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal) } } + if (s->sh.first_slice_in_pic_flag && s->avctx->hwaccel) { + ret = s->avctx->hwaccel->start_frame(s->avctx, NULL, 0); + if (ret < 0) + goto fail; + } + + if (s->avctx->hwaccel) { + ret = s->avctx->hwaccel->decode_slice(s->avctx, nal->raw_data, nal->raw_size); + if (ret < 0) + goto fail; + } else { ctb_addr_ts = hls_slice_data(s); if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) { s->is_decoded = 1; @@ -2584,6 +2604,7 @@ static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal) ret = ctb_addr_ts; goto fail; } + } break; case NAL_EOS_NUT: case NAL_EOB_NUT: @@ -2891,6 +2912,11 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, if (ret < 0) return ret; + if (avctx->hwaccel) { + if (s->ref && avctx->hwaccel->end_frame(avctx) < 0) + av_log(avctx, AV_LOG_ERROR, + "hardware accelerator failed to decode picture\n"); + } else { /* verify the SEI checksum */ if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded && s->is_md5) { @@ -2900,6 +2926,7 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, return ret; } } + } s->is_md5 = 0; if (s->is_decoded) { @@ -2941,6 +2968,13 @@ static int hevc_ref_frame(HEVCContext *s, HEVCFrame *dst, HEVCFrame *src) dst->flags = src->flags; dst->sequence = src->sequence; + if (src->hwaccel_picture_private) { + dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf); + if (!dst->hwaccel_priv_buf) + goto fail; + dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data; + } + return 0; fail: ff_hevc_unref_frame(s, dst, ~0); diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index b78b1645fc..333ea4634b 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -676,6 +676,9 @@ typedef struct HEVCFrame { AVBufferRef *rpl_tab_buf; AVBufferRef *rpl_buf; + AVBufferRef *hwaccel_priv_buf; + void *hwaccel_picture_private; + /** * A sequence counter, so that old frames are output first * after a POC reset diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index ccb441bb75..94bd0f48c8 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "internal.h" @@ -46,6 +47,9 @@ void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags) frame->refPicList = NULL; frame->collocated_ref = NULL; + + av_buffer_unref(&frame->hwaccel_priv_buf); + frame->hwaccel_picture_private = NULL; } } @@ -105,6 +109,17 @@ static HEVCFrame *alloc_frame(HEVCContext *s) for (j = 0; j < frame->ctb_count; j++) frame->rpl_tab[j] = (RefPicListTab *)frame->rpl_buf->data; + if (s->avctx->hwaccel) { + const AVHWAccel *hwaccel = s->avctx->hwaccel; + av_assert0(!frame->hwaccel_picture_private); + if (hwaccel->frame_priv_data_size) { + frame->hwaccel_priv_buf = av_buffer_allocz(hwaccel->frame_priv_data_size); + if (!frame->hwaccel_priv_buf) + goto fail; + frame->hwaccel_picture_private = frame->hwaccel_priv_buf->data; + } + } + return frame; fail: @@ -340,6 +355,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc) if (!frame) return NULL; + if (!s->avctx->hwaccel) { if (!s->sps->pixel_shift) { for (i = 0; frame->frame->buf[i]; i++) memset(frame->frame->buf[i]->data, 1 << (s->sps->bit_depth - 1), @@ -352,6 +368,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc) 1 << (s->sps->bit_depth - 1)); } } + } frame->poc = poc; frame->sequence = s->seq_decode; |