[FFmpeg-cvslog] vaapi_mpeg2: Convert to use the new VAAPI hwaccel code
Mark Thompson
git at videolan.org
Mon Mar 20 09:25:41 EET 2017
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sat Aug 6 18:37:47 2016 +0100| [102e13c353de43aa0cb1aa1843804d195c2a9164] | committer: Mark Thompson
vaapi_mpeg2: Convert to use the new VAAPI hwaccel code
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=102e13c353de43aa0cb1aa1843804d195c2a9164
---
libavcodec/vaapi_mpeg2.c | 167 ++++++++++++++++++++++++++++++-----------------
1 file changed, 106 insertions(+), 61 deletions(-)
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 459eb75..6c10578 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -22,8 +22,8 @@
#include "mpegutils.h"
#include "mpegvideo.h"
-#include "vaapi_internal.h"
#include "internal.h"
+#include "vaapi_decode.h"
/** Reconstruct bitstream f_code */
static inline int mpeg2_get_f_code(const MpegEncContext *s)
@@ -41,70 +41,100 @@ static inline int mpeg2_get_is_frame_start(const MpegEncContext *s)
static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
{
const MpegEncContext *s = avctx->priv_data;
- struct vaapi_context * const vactx = avctx->hwaccel_context;
- VAPictureParameterBufferMPEG2 *pic_param;
- VAIQMatrixBufferMPEG2 *iq_matrix;
- int i;
-
- vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
-
- /* Fill in VAPictureParameterBufferMPEG2 */
- pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG2));
- if (!pic_param)
- return -1;
- pic_param->horizontal_size = s->width;
- pic_param->vertical_size = s->height;
- pic_param->forward_reference_picture = VA_INVALID_ID;
- pic_param->backward_reference_picture = VA_INVALID_ID;
- pic_param->picture_coding_type = s->pict_type;
- pic_param->f_code = mpeg2_get_f_code(s);
- pic_param->picture_coding_extension.value = 0; /* reset all bits */
- pic_param->picture_coding_extension.bits.intra_dc_precision = s->intra_dc_precision;
- pic_param->picture_coding_extension.bits.picture_structure = s->picture_structure;
- pic_param->picture_coding_extension.bits.top_field_first = s->top_field_first;
- pic_param->picture_coding_extension.bits.frame_pred_frame_dct = s->frame_pred_frame_dct;
- pic_param->picture_coding_extension.bits.concealment_motion_vectors = s->concealment_motion_vectors;
- pic_param->picture_coding_extension.bits.q_scale_type = s->q_scale_type;
- pic_param->picture_coding_extension.bits.intra_vlc_format = s->intra_vlc_format;
- pic_param->picture_coding_extension.bits.alternate_scan = s->alternate_scan;
- pic_param->picture_coding_extension.bits.repeat_first_field = s->repeat_first_field;
- pic_param->picture_coding_extension.bits.progressive_frame = s->progressive_frame;
- pic_param->picture_coding_extension.bits.is_first_field = mpeg2_get_is_frame_start(s);
+ VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private;
+ VAPictureParameterBufferMPEG2 pic_param;
+ VAIQMatrixBufferMPEG2 iq_matrix;
+ int i, err;
+
+ pic->output_surface = ff_vaapi_get_surface_id(s->current_picture_ptr->f);
+
+ pic_param = (VAPictureParameterBufferMPEG2) {
+ .horizontal_size = s->width,
+ .vertical_size = s->height,
+ .forward_reference_picture = VA_INVALID_ID,
+ .backward_reference_picture = VA_INVALID_ID,
+ .picture_coding_type = s->pict_type,
+ .f_code = mpeg2_get_f_code(s),
+ .picture_coding_extension.bits = {
+ .intra_dc_precision = s->intra_dc_precision,
+ .picture_structure = s->picture_structure,
+ .top_field_first = s->top_field_first,
+ .frame_pred_frame_dct = s->frame_pred_frame_dct,
+ .concealment_motion_vectors = s->concealment_motion_vectors,
+ .q_scale_type = s->q_scale_type,
+ .intra_vlc_format = s->intra_vlc_format,
+ .alternate_scan = s->alternate_scan,
+ .repeat_first_field = s->repeat_first_field,
+ .progressive_frame = s->progressive_frame,
+ .is_first_field = mpeg2_get_is_frame_start(s),
+ },
+ };
switch (s->pict_type) {
case AV_PICTURE_TYPE_B:
- pic_param->backward_reference_picture = ff_vaapi_get_surface_id(s->next_picture.f);
+ pic_param.backward_reference_picture = ff_vaapi_get_surface_id(s->next_picture.f);
// fall-through
case AV_PICTURE_TYPE_P:
- pic_param->forward_reference_picture = ff_vaapi_get_surface_id(s->last_picture.f);
+ pic_param.forward_reference_picture = ff_vaapi_get_surface_id(s->last_picture.f);
break;
}
- /* Fill in VAIQMatrixBufferMPEG2 */
- iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG2));
- if (!iq_matrix)
- return -1;
- iq_matrix->load_intra_quantiser_matrix = 1;
- iq_matrix->load_non_intra_quantiser_matrix = 1;
- iq_matrix->load_chroma_intra_quantiser_matrix = 1;
- iq_matrix->load_chroma_non_intra_quantiser_matrix = 1;
+ err = ff_vaapi_decode_make_param_buffer(avctx, pic,
+ VAPictureParameterBufferType,
+ &pic_param, sizeof(pic_param));
+ if (err < 0)
+ goto fail;
+
+ iq_matrix.load_intra_quantiser_matrix = 1;
+ iq_matrix.load_non_intra_quantiser_matrix = 1;
+ iq_matrix.load_chroma_intra_quantiser_matrix = 1;
+ iq_matrix.load_chroma_non_intra_quantiser_matrix = 1;
for (i = 0; i < 64; i++) {
int n = s->idsp.idct_permutation[ff_zigzag_direct[i]];
- iq_matrix->intra_quantiser_matrix[i] = s->intra_matrix[n];
- iq_matrix->non_intra_quantiser_matrix[i] = s->inter_matrix[n];
- iq_matrix->chroma_intra_quantiser_matrix[i] = s->chroma_intra_matrix[n];
- iq_matrix->chroma_non_intra_quantiser_matrix[i] = s->chroma_inter_matrix[n];
+ iq_matrix.intra_quantiser_matrix[i] = s->intra_matrix[n];
+ iq_matrix.non_intra_quantiser_matrix[i] = s->inter_matrix[n];
+ iq_matrix.chroma_intra_quantiser_matrix[i] = s->chroma_intra_matrix[n];
+ iq_matrix.chroma_non_intra_quantiser_matrix[i] = s->chroma_inter_matrix[n];
}
+
+ err = ff_vaapi_decode_make_param_buffer(avctx, pic,
+ VAIQMatrixBufferType,
+ &iq_matrix, sizeof(iq_matrix));
+ if (err < 0)
+ goto fail;
+
return 0;
+
+fail:
+ ff_vaapi_decode_cancel(avctx, pic);
+ return err;
+}
+
+static int vaapi_mpeg2_end_frame(AVCodecContext *avctx)
+{
+ MpegEncContext *s = avctx->priv_data;
+ VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private;
+ int ret;
+
+ ret = ff_vaapi_decode_issue(avctx, pic);
+ if (ret < 0)
+ goto fail;
+
+ ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
+
+fail:
+ return ret;
}
static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
const MpegEncContext *s = avctx->priv_data;
- VASliceParameterBufferMPEG2 *slice_param;
+ VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private;
+ VASliceParameterBufferMPEG2 slice_param;
GetBitContext gb;
uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset;
+ int err;
/* Determine macroblock_offset */
init_get_bits(&gb, buffer, 8 * size);
@@ -119,24 +149,39 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
}
macroblock_offset = get_bits_count(&gb);
- /* Fill in VASliceParameterBufferMPEG2 */
- slice_param = (VASliceParameterBufferMPEG2 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
- if (!slice_param)
- return -1;
- slice_param->macroblock_offset = macroblock_offset;
- slice_param->slice_horizontal_position = s->mb_x;
- slice_param->slice_vertical_position = s->mb_y >> (s->picture_structure != PICT_FRAME);
- slice_param->quantiser_scale_code = quantiser_scale_code;
- slice_param->intra_slice_flag = intra_slice_flag;
+ slice_param = (VASliceParameterBufferMPEG2) {
+ .slice_data_size = size,
+ .slice_data_offset = 0,
+ .slice_data_flag = VA_SLICE_DATA_FLAG_ALL,
+ .macroblock_offset = macroblock_offset,
+ .slice_horizontal_position = s->mb_x,
+ .slice_vertical_position = s->mb_y >> (s->picture_structure != PICT_FRAME),
+ .quantiser_scale_code = quantiser_scale_code,
+ .intra_slice_flag = intra_slice_flag,
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+ &slice_param, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+ return err;
+ }
+
+
return 0;
}
AVHWAccel ff_mpeg2_vaapi_hwaccel = {
- .name = "mpeg2_vaapi",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG2VIDEO,
- .pix_fmt = AV_PIX_FMT_VAAPI,
- .start_frame = vaapi_mpeg2_start_frame,
- .end_frame = ff_vaapi_mpeg_end_frame,
- .decode_slice = vaapi_mpeg2_decode_slice,
+ .name = "mpeg2_vaapi",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_MPEG2VIDEO,
+ .pix_fmt = AV_PIX_FMT_VAAPI,
+ .start_frame = &vaapi_mpeg2_start_frame,
+ .end_frame = &vaapi_mpeg2_end_frame,
+ .decode_slice = &vaapi_mpeg2_decode_slice,
+ .frame_priv_data_size = sizeof(VAAPIDecodePicture),
+ .init = &ff_vaapi_decode_init,
+ .uninit = &ff_vaapi_decode_uninit,
+ .priv_data_size = sizeof(VAAPIDecodeContext),
};
More information about the ffmpeg-cvslog
mailing list