Revision 36ad2b3e

View differences:

libavcodec/vaapi.c
185 185 
    if (commit_slices(vactx) < 0)
186 186 
        goto done;
187 187 
    if (vactx->n_slice_buf_ids > 0) {
188 
        if (render_picture(vactx, ff_vaapi_get_surface(s->current_picture_ptr)) < 0)
188 
        if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0)
189 189 
            goto done;
190 190 
        ff_draw_horiz_band(s, 0, s->avctx->height);
191 191 
    }
libavcodec/vaapi_internal.h
36 36 
 */
37 37 

  		




  38
  38
  
    
/** Extract VASurfaceID from a Picture */


  		




  39
  
  
    
static inline VASurfaceID ff_vaapi_get_surface(Picture *pic)


  		




  
  39
  
    
static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic)


  		




  40
  40
  
    
{


  		




  41
  41
  
    
    return (uintptr_t)pic->data[3];


  		




  42
  42
  
    
}


  		












  

    
      libavcodec/vaapi_mpeg2.c
    
  





  73
  73
  
    

  		




  74
  74
  
    
    switch (s->pict_type) {


  		




  75
  75
  
    
    case FF_B_TYPE:


  		




  76
  
  
    
        pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);


  		




  
  76
  
    
        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);


  		




  77
  77
  
    
        // fall-through


  		




  78
  78
  
    
    case FF_P_TYPE:


  		




  79
  
  
    
        pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);


  		




  
  79
  
    
        pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);


  		




  80
  80
  
    
        break;


  		




  81
  81
  
    
    }


  		




  82
  82
  
    

  		












  

    
      libavcodec/vaapi_mpeg4.c
    
  





  92
  92
  
    
    pic_param->TRD                                      = s->pp_time;


  		




  93
  93
  
    

  		




  94
  94
  
    
    if (s->pict_type == FF_B_TYPE)


  		




  95
  
  
    
        pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);


  		




  
  95
  
    
        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);


  		




  96
  96
  
    
    if (s->pict_type != FF_I_TYPE)


  		




  97
  
  
    
        pic_param->forward_reference_picture  = ff_vaapi_get_surface(&s->last_picture);


  		




  
  97
  
    
        pic_param->forward_reference_picture  = ff_vaapi_get_surface_id(&s->last_picture);


  		




  98
  98
  
    

  		




  99
  99
  
    
    /* Fill in VAIQMatrixBufferMPEG4 */


  		




  100
  100
  
    
    /* Only the first inverse quantisation method uses the weighthing matrices */


  		












  

    
      libavcodec/vaapi_vc1.c
    
  





  242
  242
  
    

  		




  243
  243
  
    
    switch (s->pict_type) {


  		




  244
  244
  
    
    case FF_B_TYPE:


  		




  245
  
  
    
        pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);


  		




  
  245
  
    
        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);


  		




  246
  246
  
    
        // fall-through


  		




  247
  247
  
    
    case FF_P_TYPE:


  		




  248
  
  
    
        pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);


  		




  
  248
  
    
        pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);


  		




  249
  249
  
    
        break;


  		




  250
  250
  
    
    }


  		




  251
  251
  
    

  		












Also available in:  Unified diff