Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: deMpegEncContextize

Conflicts:
	libavcodec/dxva2_h264.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb_template.c
	libavcodec/h264_parser.c
	libavcodec/h264_ps.c
	libavcodec/h264_refs.c
	libavcodec/h264_sei.c
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 19 insertions, 5 deletions

diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index cbe6deeee7..0f79c5868f 100644
--- a/libavcodec/vdpau_h264.c
+++ b/libavcodec/vdpau_h264.c
@@ -119,9 +119,8 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx,
 {
     H264Context * const h = avctx->priv_data;
     AVVDPAUContext *hwctx = avctx->hwaccel_context;
-    MpegEncContext * const s = &h->s;
     VdpPictureInfoH264 *info = &hwctx->info.h264;
-    Picture *pic = s->current_picture_ptr;
+    Picture *pic = h->cur_pic_ptr;
 
     /* init VdpPictureInfoH264 */
     info->slice_count                            = 0;
@@ -129,8 +128,8 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx,
     info->field_order_cnt[1]                     = h264_foc(pic->field_poc[1]);
     info->is_reference                           = h->nal_ref_idc != 0;
     info->frame_num                              = h->frame_num;
-    info->field_pic_flag                         = s->picture_structure != PICT_FRAME;
-    info->bottom_field_flag                      = s->picture_structure == PICT_BOTTOM_FIELD;
+    info->field_pic_flag                         = h->picture_structure != PICT_FRAME;
+    info->bottom_field_flag                      = h->picture_structure == PICT_BOTTOM_FIELD;
     info->num_ref_frames                         = h->sps.ref_frame_count;
     info->mb_adaptive_frame_field_flag           = h->sps.mb_aff && !info->field_pic_flag;
     info->constrained_intra_pred_flag            = h->pps.constrained_intra_pred;
@@ -185,12 +184,27 @@ static int vdpau_h264_decode_slice(AVCodecContext *avctx,
     return 0;
 }
 
+static int vdpau_h264_end_frame(AVCodecContext *avctx)
+{
+    AVVDPAUContext *hwctx = avctx->hwaccel_context;
+    H264Context *h = avctx->priv_data;
+    VdpVideoSurface surf = ff_vdpau_get_surface_id(h->cur_pic_ptr);
+
+    hwctx->render(hwctx->decoder, surf, (void *)&hwctx->info,
+                  hwctx->bitstream_buffers_used, hwctx->bitstream_buffers);
+
+    ff_h264_draw_horiz_band(h, 0, h->avctx->height);
+    hwctx->bitstream_buffers_used = 0;
+
+    return 0;
+}
+
 AVHWAccel ff_h264_vdpau_hwaccel = {
     .name           = "h264_vdpau",
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_H264,
     .pix_fmt        = AV_PIX_FMT_VDPAU,
     .start_frame    = vdpau_h264_start_frame,
-    .end_frame      = ff_vdpau_common_end_frame,
+    .end_frame      = vdpau_h264_end_frame,
     .decode_slice   = vdpau_h264_decode_slice,
 };