}
/** Pack FFmpeg bitplanes into a VABitPlaneBuffer element */
-static inline uint8_t vc1_pack_bitplanes(const uint8_t *ff_bp[3], int x, int y, int stride)
+static inline void vc1_pack_bitplanes(uint8_t *bitplane, int n, const uint8_t *ff_bp[3], int x, int y, int stride)
{
- const int n = y * stride + x;
+ const int bitplane_index = n / 2;
+ const int ff_bp_index = y * stride + x;
uint8_t v = 0;
if (ff_bp[0])
- v = ff_bp[0][n];
+ v = ff_bp[0][ff_bp_index];
if (ff_bp[1])
- v |= ff_bp[1][n] << 1;
+ v |= ff_bp[1][ff_bp_index] << 1;
if (ff_bp[2])
- v |= ff_bp[2][n] << 2;
- return v;
+ v |= ff_bp[2][ff_bp_index] << 2;
+ bitplane[bitplane_index] = (bitplane[bitplane_index] << 4) | v;
}
static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
/* Fill in VAPictureParameterBufferVC1 */
- pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferVC1));
+ pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
if (!pic_param)
return -1;
- pic_param->forward_reference_picture = 0xffffffff;
- pic_param->backward_reference_picture = 0xffffffff;
- pic_param->inloop_decoded_picture = 0xffffffff;
+ pic_param->forward_reference_picture = VA_INVALID_ID;
+ pic_param->backward_reference_picture = VA_INVALID_ID;
+ pic_param->inloop_decoded_picture = VA_INVALID_ID;
pic_param->sequence_fields.value = 0; /* reset all bits */
pic_param->sequence_fields.bits.pulldown = v->broadcast;
pic_param->sequence_fields.bits.interlace = v->interlace;
switch (s->pict_type) {
case FF_B_TYPE:
- pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
+ pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
// fall-through
case FF_P_TYPE:
- pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
+ pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
break;
}
break;
}
- bitplane = ff_vaapi_alloc_bitplane(vactx, s->mb_height * ((s->mb_width + 1) / 2));
+ bitplane = ff_vaapi_alloc_bitplane(vactx, (s->mb_width * s->mb_height + 1) / 2);
if (!bitplane)
return -1;
n = 0;
- for (y = 0; y < s->mb_height; y++) {
- for (x = 0; x < s->mb_width; x += 2) {
- bitplane[n] = vc1_pack_bitplanes(ff_bp, x+1, y, s->mb_stride);
- bitplane[n] |= (vc1_pack_bitplanes(ff_bp, x, y, s->mb_stride) << 4);
- ++n;
- }
- }
+ for (y = 0; y < s->mb_height; y++)
+ for (x = 0; x < s->mb_width; x++, n++)
+ vc1_pack_bitplanes(bitplane, n, ff_bp, x, y, s->mb_stride);
+ if (n & 1) /* move last nibble to the high order */
+ bitplane[n/2] <<= 4;
}
return 0;
}
};
#endif
-#if CONFIG_VC1_VAAPI_HWACCEL
AVHWAccel vc1_vaapi_hwaccel = {
.name = "vc1_vaapi",
.type = CODEC_TYPE_VIDEO,
.decode_slice = vaapi_vc1_decode_slice,
.priv_data_size = 0,
};
-#endif