diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-02-27 15:45:55 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2009-02-27 15:45:55 +0000 |
| commit | 6026a0968a393c86ae0850d25e0d9a81dba06b13 (patch) | |
| tree | 31b96d53f8911b492148c07f317f21abb8fc5bfe | |
| parent | e6fdc2b1a0def9aa77aac861ed151c7c2ccef413 (diff) | |
Add hardware acceleration hooks to H.264.
Patch by Gwenolé Beauchesne.
Originally committed as revision 17644 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 707cde138a..bfa78e8013 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7491,6 +7491,11 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ if((err = decode_slice_header(hx, h))) break; + if (s->avctx->hwaccel && h->current_slice == 1) { + if (s->avctx->hwaccel->start_frame(s->avctx, NULL, 0) < 0) + return -1; + } + s->current_picture_ptr->key_frame |= (hx->nal_unit_type == NAL_IDR_SLICE) || (h->sei_recovery_frame_cnt >= 0); @@ -7715,6 +7720,11 @@ static int decode_frame(AVCodecContext *avctx, h->prev_frame_num_offset= h->frame_num_offset; h->prev_frame_num= h->frame_num; + if (avctx->hwaccel) { + if (avctx->hwaccel->end_frame(avctx) < 0) + av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); + } + if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_picture_complete(s); @@ -8105,7 +8115,7 @@ AVCodec h264_decoder = { /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush= flush_dpb, .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), - .pix_fmts= ff_pixfmt_list_420, + .pix_fmts= ff_hwaccel_pixfmt_list_420, }; #if CONFIG_H264_VDPAU_DECODER |