Flip (M)JPEG frames encoded by Intel JPEG library.

[ffmpeg] / libavcodec / vdpau.c

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 0ed413ad684ca0e52b20bdc9ac549f73183a6859..4a7c86c0a863d934fc9bc9d92cc019541bf6cb4a 100644 (file)
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -131,6 +131,7 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
 {
     H264Context *h = s->avctx->priv_data;
     struct vdpau_render_state *render;
+    int i;
 
     render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
     assert(render);
@@ -139,19 +140,19 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
     if (render->info.h264.slice_count < 1)
         return;
 
-    for (int i = 0; i < 2; ++i) {
+    for (i = 0; i < 2; ++i) {
         int foc = s->current_picture_ptr->field_poc[i];
         if (foc == INT_MAX)
             foc = 0;
         render->info.h264.field_order_cnt[i] = foc;
     }
 
-    render->info.h264.is_reference                           = s->current_picture_ptr->reference ? VDP_TRUE : VDP_FALSE;
+    render->info.h264.is_reference                           = (s->current_picture_ptr->reference & 3) ? VDP_TRUE : VDP_FALSE;
     render->info.h264.frame_num                              = h->frame_num;
     render->info.h264.field_pic_flag                         = s->picture_structure != PICT_FRAME;
     render->info.h264.bottom_field_flag                      = s->picture_structure == PICT_BOTTOM_FIELD;
     render->info.h264.num_ref_frames                         = h->sps.ref_frame_count;
-    render->info.h264.mb_adaptive_frame_field_flag           = h->sps.mb_aff;
+    render->info.h264.mb_adaptive_frame_field_flag           = h->sps.mb_aff && !render->info.h264.field_pic_flag;
     render->info.h264.constrained_intra_pred_flag            = h->pps.constrained_intra_pred;
     render->info.h264.weighted_pred_flag                     = h->pps.weighted_pred;
     render->info.h264.weighted_bipred_idc                    = h->pps.weighted_bipred_idc;
@@ -164,7 +165,7 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
     render->info.h264.num_ref_idx_l1_active_minus1           = h->pps.ref_count[1] - 1;
     render->info.h264.log2_max_frame_num_minus4              = h->sps.log2_max_frame_num - 4;
     render->info.h264.pic_order_cnt_type                     = h->sps.poc_type;
-    render->info.h264.log2_max_pic_order_cnt_lsb_minus4      = h->sps.log2_max_poc_lsb - 4;
+    render->info.h264.log2_max_pic_order_cnt_lsb_minus4      = h->sps.poc_type ? 0 : h->sps.log2_max_poc_lsb - 4;
     render->info.h264.delta_pic_order_always_zero_flag       = h->sps.delta_pic_order_always_zero_flag;
     render->info.h264.direct_8x8_inference_flag              = h->sps.direct_8x8_inference_flag;
     render->info.h264.entropy_coding_mode_flag               = h->pps.cabac;
@@ -184,6 +185,8 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
     struct vdpau_render_state *render, *last, *next;
     int i;
 
+    if (!s->current_picture_ptr) return;
+
     render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
     assert(render);
 
@@ -267,7 +270,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
     /* Specific to simple/main profile only */
     render->info.vc1.multires           = v->multires;
     render->info.vc1.syncmarker         = v->s.resync_marker;
-    render->info.vc1.rangered           = v->rangered;
+    render->info.vc1.rangered           = v->rangered | (v->rangeredfrm << 1);
     render->info.vc1.maxbframes         = v->s.max_b_frames;
 
     render->info.vc1.deblockEnable      = v->postprocflag & 1;