claude-noether/libva-v4l2-request-fourier
1
0
Fork 0
forked from marfrit/libva-v4l2-request-fourier
Code Pull Requests Activity

mpeg2: Rework helper functions to a more flexible interface

Browse Source 
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
This commit is contained in:
Paul Kocialkowski
2018-04-24 16:10:35 +02:00
parent c7f0d7684a
commit 1bf08f9656
3 changed files with 64 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mpeg2.c
+44 -52
View File
@@ -34,62 +34,54 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx, int mpeg2_fill_picture_parameters(struct object_context *context_object,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_surface *surface_object,
struct object_buffer *obj_buffer) VAPictureParameterBufferMPEG2 *parameters)
{ {
struct sunxi_cedrus_driver_data *driver_data = struct v4l2_ctrl_mpeg2_frame_hdr *header = &context_object->mpeg2_frame_hdr;
(struct sunxi_cedrus_driver_data *) ctx->pDriverData; struct object_surface *forward_reference_surface;
VAStatus vaStatus = VA_STATUS_SUCCESS; struct object_surface *backward_reference_surface;
struct v4l2_buffer buf;
struct v4l2_plane plane[1];
header->type = MPEG2;
return vaStatus; header->width = parameters->horizontal_size;
header->height = parameters->vertical_size;
header->picture_coding_type = parameters->picture_coding_type;
header->f_code[0][0] = (parameters->f_code >> 12) & 0x0f;
header->f_code[0][1] = (parameters->f_code >> 8) & 0x0f;
header->f_code[1][0] = (parameters->f_code >> 4) & 0x0f;
header->f_code[1][1] = (parameters->f_code >> 0) & 0x0f;
header->intra_dc_precision = parameters->picture_coding_extension.bits.intra_dc_precision;
header->picture_structure = parameters->picture_coding_extension.bits.picture_structure;
header->top_field_first = parameters->picture_coding_extension.bits.top_field_first;
header->frame_pred_frame_dct = parameters->picture_coding_extension.bits.frame_pred_frame_dct;
header->concealment_motion_vectors = parameters->picture_coding_extension.bits.concealment_motion_vectors;
header->q_scale_type = parameters->picture_coding_extension.bits.q_scale_type;
header->intra_vlc_format = parameters->picture_coding_extension.bits.intra_vlc_format;
header->alternate_scan = parameters->picture_coding_extension.bits.alternate_scan;
forward_reference_surface = SURFACE(parameters->forward_reference_picture);
if (forward_reference_surface != NULL)
header->forward_ref_index = forward_reference_surface->output_buf_index;
else
header->forward_ref_index = surface_object->output_buf_index;
backward_reference_surface = SURFACE(parameters->backward_reference_picture);
if (backward_reference_surface != NULL)
header->backward_ref_index = backward_reference_surface->output_buf_index;
else
header->backward_ref_index = surface_object->output_buf_index;
header->width = context_object->picture_width;
header->height = context_object->picture_height;
return 0;
} }
VAStatus sunxi_cedrus_render_mpeg2_picture_parameter(VADriverContextP ctx, int mpeg2_fill_slice_data(struct object_context *context_object,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_surface *surface_object, void *data, unsigned int size)
struct object_buffer *obj_buffer)
{ {
struct sunxi_cedrus_driver_data *driver_data = return 0;
(struct sunxi_cedrus_driver_data *) ctx->pDriverData;
VAStatus vaStatus = VA_STATUS_SUCCESS;
VAPictureParameterBufferMPEG2 *pic_param = (VAPictureParameterBufferMPEG2 *)obj_buffer->buffer_data;
obj_context->mpeg2_frame_hdr.type = MPEG2;
obj_context->mpeg2_frame_hdr.width = pic_param->horizontal_size;
obj_context->mpeg2_frame_hdr.height = pic_param->vertical_size;
obj_context->mpeg2_frame_hdr.picture_coding_type = pic_param->picture_coding_type;
obj_context->mpeg2_frame_hdr.f_code[0][0] = (pic_param->f_code >> 12) & 0xf;
obj_context->mpeg2_frame_hdr.f_code[0][1] = (pic_param->f_code >> 8) & 0xf;
obj_context->mpeg2_frame_hdr.f_code[1][0] = (pic_param->f_code >> 4) & 0xf;
obj_context->mpeg2_frame_hdr.f_code[1][1] = pic_param->f_code & 0xf;
obj_context->mpeg2_frame_hdr.intra_dc_precision = pic_param->picture_coding_extension.bits.intra_dc_precision;
obj_context->mpeg2_frame_hdr.picture_structure = pic_param->picture_coding_extension.bits.picture_structure;
obj_context->mpeg2_frame_hdr.top_field_first = pic_param->picture_coding_extension.bits.top_field_first;
obj_context->mpeg2_frame_hdr.frame_pred_frame_dct = pic_param->picture_coding_extension.bits.frame_pred_frame_dct;
obj_context->mpeg2_frame_hdr.concealment_motion_vectors = pic_param->picture_coding_extension.bits.concealment_motion_vectors;
obj_context->mpeg2_frame_hdr.q_scale_type = pic_param->picture_coding_extension.bits.q_scale_type;
obj_context->mpeg2_frame_hdr.intra_vlc_format = pic_param->picture_coding_extension.bits.intra_vlc_format;
obj_context->mpeg2_frame_hdr.alternate_scan = pic_param->picture_coding_extension.bits.alternate_scan;
struct object_surface *fwd_surface = SURFACE(pic_param->forward_reference_picture);
if(fwd_surface)
obj_context->mpeg2_frame_hdr.forward_index = fwd_surface->output_buf_index;
else
obj_context->mpeg2_frame_hdr.forward_index = obj_surface->output_buf_index;
struct object_surface *bwd_surface = SURFACE(pic_param->backward_reference_picture);
if(bwd_surface)
obj_context->mpeg2_frame_hdr.backward_index = bwd_surface->output_buf_index;
else
obj_context->mpeg2_frame_hdr.backward_index = obj_surface->output_buf_index;
return vaStatus;
} }
src/mpeg2.h
+5 -7
View File
@@ -33,12 +33,10 @@
#include "surface.h" #include "surface.h"
VAStatus sunxi_cedrus_render_mpeg2_slice_data(VADriverContextP ctx, int mpeg2_fill_picture_parameters(struct object_context *context_object,
struct object_context *obj_context, struct object_surface *obj_surface, struct object_surface *surface_object,
struct object_buffer *obj_buffer); VAPictureParameterBufferMPEG2 *parameters);
int mpeg2_fill_slice_data(struct object_context *context_object,
VAStatus sunxi_cedrus_render_mpeg2_picture_parameter(VADriverContextP ctx, struct object_surface *surface_object, void *data, unsigned int size);
struct object_context *obj_context, struct object_surface *obj_surface,
struct object_buffer *obj_buffer);
#endif #endif
src/picture.c
+15 -8
View File
@@ -79,7 +79,10 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
struct object_context *context_object; struct object_context *context_object;
struct object_config *config_object; struct object_config *config_object;
struct object_surface *surface_object; struct object_surface *surface_object;
VAStatus status; VAPictureParameterBufferMPEG2 *mpeg2_parameters;
void *data;
unsigned int size;
int rc;
int i; int i;
context_object = CONTEXT(context_id); context_object = CONTEXT(context_id);
@@ -103,13 +106,18 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
case VAProfileMPEG2Simple: case VAProfileMPEG2Simple:
case VAProfileMPEG2Main: case VAProfileMPEG2Main:
if (buffer_object->type == VASliceDataBufferType) { if (buffer_object->type == VASliceDataBufferType) {
status = sunxi_cedrus_render_mpeg2_slice_data(context, context_object, surface_object, buffer_object); data = buffer_object->data;
if (status != VA_STATUS_SUCCESS) size = buffer_object->size * buffer_object->count;
return status;
rc = mpeg2_fill_slice_data(context_object, surface_object, data, size);
if (rc < 0)
return VA_STATUS_ERROR_OPERATION_FAILED;
} else if (buffer_object->type == VAPictureParameterBufferType) { } else if (buffer_object->type == VAPictureParameterBufferType) {
status = sunxi_cedrus_render_mpeg2_picture_parameter(context, context_object, surface_object, buffer_object); mpeg2_parameters = (VAPictureParameterBufferMPEG2 *) buffer->data;
if (status != VA_STATUS_SUCCESS)
return status; rc = mpeg2_fill_picture_parameters(context_object, surface_object, mpeg2_parameters);
if (rc < 0)
return VA_STATUS_ERROR_OPERATION_FAILED;
} else { } else {
sunxi_cedrus_msg("Unsupported buffer type: %d\n", buffer_object->type); sunxi_cedrus_msg("Unsupported buffer type: %d\n", buffer_object->type);
} }
@@ -118,7 +126,6 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
default: default:
break; break;
} }
} }