Media
/
libva-utils
mirror of https://github.com/intel/libva-utils.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modify output CS settings for Chroma siting on Linux 

Signed-off-by: Du, Kelly <kelly.du@intel.com>
This commit is contained in:
Du, Kelly 2019-12-06 16:02:55 +08:00 committed by XinfengZhang
parent 0e012b1794
commit 287f3a581f
2 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
videoprocess/process_chromasitting.cfg.template
View File

@ -30,4 +30,7 @@ FRAME_SUM: 5
#4.chromasitting mode parameters set, the following modes are supported: #4.chromasitting mode parameters set, the following modes are supported:
# UNKNOWN, CHROMA_SITING_TOP_LEFT, CHROMA_SITING_TOP_CENTER,CHROMA_SITING_CENTER_LEFT # UNKNOWN, CHROMA_SITING_TOP_LEFT, CHROMA_SITING_TOP_CENTER,CHROMA_SITING_CENTER_LEFT
# CHROMA_SITING_CENTER_CENTER, CHROMA_SITING_BOTTOM_LEFT,CHROMA_SITING_BOTTOM_CENTER # CHROMA_SITING_CENTER_CENTER, CHROMA_SITING_BOTTOM_LEFT,CHROMA_SITING_BOTTOM_CENTER
CHROMA_SITTING_MODE: CHROMA_SITING_TOP_LEFT # input
IN_CHROMA_SITTING_MODE: CHROMA_SITING_TOP_LEFT
# output
DST_CHROMA_SITTING_MODE: CHROMA_SITING_BOTTOM_LEFT

81
videoprocess/vppchromasitting.cpp
View File

@ -984,38 +984,64 @@ store_yuv_surface_to_file(FILE *fp,
} }
static VAStatus static VAStatus
chromasitting_param_init(uint8_t *chroma_sample_location) chromasitting_param_init(uint8_t *in_chroma_sample_location,uint8_t *dst_chroma_sample_location)
{ {
VAStatus va_status = VA_STATUS_SUCCESS; VAStatus va_status = VA_STATUS_SUCCESS;
uint8_t sample_location; uint8_t in_sample_location = 0;
char chroma_siting_mode[MAX_LEN]; char in_chroma_siting_mode[MAX_LEN];
uint8_t dst_sample_location = 0;
char dst_chroma_siting_mode[MAX_LEN];
/* Read filter type */ /* Read filter type */
if (read_value_string(g_config_file_fd, "CHROMA_SITTING_MODE", chroma_siting_mode)){ if (read_value_string(g_config_file_fd, "IN_CHROMA_SITTING_MODE", in_chroma_siting_mode)){
printf("Read CHROMA_SITTING_MODE type error !\n"); printf("Read IN_CHROMA_SITTING_MODE type error !\n");
assert(0); assert(0);
} }
if (!strcmp(in_chroma_siting_mode, "UNKNOWN"))
if (!strcmp(chroma_siting_mode, "UNKNOWN")) in_sample_location = VA_CHROMA_SITING_UNKNOWN;
sample_location = VA_CHROMA_SITING_UNKNOWN; else if (!strcmp(in_chroma_siting_mode, "CHROMA_SITING_TOP_LEFT"))
else if (!strcmp(chroma_siting_mode, "CHROMA_SITING_TOP_LEFT")) in_sample_location = VA_CHROMA_SITING_VERTICAL_TOP | VA_CHROMA_SITING_HORIZONTAL_LEFT;
sample_location = VA_CHROMA_SITING_VERTICAL_TOP | VA_CHROMA_SITING_HORIZONTAL_LEFT; else if (!strcmp(in_chroma_siting_mode, "CHROMA_SITING_TOP_CENTER"))
else if (!strcmp(chroma_siting_mode, "CHROMA_SITING_TOP_CENTER")) in_sample_location = VA_CHROMA_SITING_VERTICAL_TOP | VA_CHROMA_SITING_HORIZONTAL_CENTER;
sample_location = VA_CHROMA_SITING_VERTICAL_TOP | VA_CHROMA_SITING_HORIZONTAL_CENTER; else if (!strcmp(in_chroma_siting_mode, "CHROMA_SITING_CENTER_LEFT"))
else if (!strcmp(chroma_siting_mode, "CHROMA_SITING_CENTER_LEFT")) in_sample_location = VA_CHROMA_SITING_VERTICAL_CENTER | VA_CHROMA_SITING_HORIZONTAL_LEFT;
sample_location = VA_CHROMA_SITING_VERTICAL_CENTER | VA_CHROMA_SITING_HORIZONTAL_LEFT; else if (!strcmp(in_chroma_siting_mode, "CHROMA_SITING_CENTER_CENTER"))
else if (!strcmp(chroma_siting_mode, "CHROMA_SITING_CENTER_CENTER")) in_sample_location = VA_CHROMA_SITING_VERTICAL_CENTER | VA_CHROMA_SITING_HORIZONTAL_CENTER;
sample_location = VA_CHROMA_SITING_VERTICAL_CENTER | VA_CHROMA_SITING_HORIZONTAL_CENTER; else if (!strcmp(in_chroma_siting_mode, "CHROMA_SITING_BOTTOM_LEFT"))
else if (!strcmp(chroma_siting_mode, "CHROMA_SITING_BOTTOM_LEFT")) in_sample_location = VA_CHROMA_SITING_VERTICAL_BOTTOM | VA_CHROMA_SITING_HORIZONTAL_LEFT;
sample_location = VA_CHROMA_SITING_VERTICAL_BOTTOM | VA_CHROMA_SITING_HORIZONTAL_LEFT; else if (!strcmp(in_chroma_siting_mode, "CHROMA_SITING_BOTTOM_CENTER"))
else if (!strcmp(chroma_siting_mode, "CHROMA_SITING_BOTTOM_CENTER")) in_sample_location = VA_CHROMA_SITING_VERTICAL_BOTTOM | VA_CHROMA_SITING_HORIZONTAL_CENTER;
sample_location = VA_CHROMA_SITING_VERTICAL_BOTTOM | VA_CHROMA_SITING_HORIZONTAL_CENTER;
else { else {
printf("Unsupported CHROMA_SITTING_MODE type :%s \n", chroma_siting_mode); printf("Unsupported IN_CHROMA_SITTING_MODE type :%s \n", in_chroma_siting_mode);
return -1; return -1;
} }
*chroma_sample_location = sample_location; *in_chroma_sample_location = in_sample_location;
if (read_value_string(g_config_file_fd, "DST_CHROMA_SITTING_MODE", dst_chroma_siting_mode)){
printf("Read DST_CHROMA_SITTING_MODE type error !\n");
assert(0);
}
if (!strcmp(dst_chroma_siting_mode, "UNKNOWN"))
dst_sample_location = VA_CHROMA_SITING_UNKNOWN;
else if (!strcmp(dst_chroma_siting_mode, "CHROMA_SITING_TOP_LEFT"))
dst_sample_location = VA_CHROMA_SITING_VERTICAL_TOP | VA_CHROMA_SITING_HORIZONTAL_LEFT;
else if (!strcmp(dst_chroma_siting_mode, "CHROMA_SITING_TOP_CENTER"))
dst_sample_location = VA_CHROMA_SITING_VERTICAL_TOP | VA_CHROMA_SITING_HORIZONTAL_CENTER;
else if (!strcmp(dst_chroma_siting_mode, "CHROMA_SITING_CENTER_LEFT"))
dst_sample_location = VA_CHROMA_SITING_VERTICAL_CENTER | VA_CHROMA_SITING_HORIZONTAL_LEFT;
else if (!strcmp(dst_chroma_siting_mode, "CHROMA_SITING_CENTER_CENTER"))
dst_sample_location = VA_CHROMA_SITING_VERTICAL_CENTER | VA_CHROMA_SITING_HORIZONTAL_CENTER;
else if (!strcmp(dst_chroma_siting_mode, "CHROMA_SITING_BOTTOM_LEFT"))
dst_sample_location = VA_CHROMA_SITING_VERTICAL_BOTTOM | VA_CHROMA_SITING_HORIZONTAL_LEFT;
else if (!strcmp(dst_chroma_siting_mode, "CHROMA_SITING_BOTTOM_CENTER"))
dst_sample_location = VA_CHROMA_SITING_VERTICAL_BOTTOM | VA_CHROMA_SITING_HORIZONTAL_CENTER;
else {
printf("Unsupported DST_CHROMA_SITTING_MODE type :%s \n", dst_chroma_siting_mode);
return -1;
}
*dst_chroma_sample_location = dst_sample_location;
return va_status; return va_status;
} }
@ -1027,8 +1053,9 @@ video_frame_process( VASurfaceID in_surface_id,
VAProcPipelineParameterBuffer pipeline_param; VAProcPipelineParameterBuffer pipeline_param;
VARectangle surface_region, output_region; VARectangle surface_region, output_region;
VABufferID pipeline_param_buf_id = VA_INVALID_ID; VABufferID pipeline_param_buf_id = VA_INVALID_ID;
uint8_t chroma_sample_location = VA_CHROMA_SITING_UNKNOWN; uint8_t in_chroma_sample_location = VA_CHROMA_SITING_UNKNOWN;
chromasitting_param_init(&chroma_sample_location); uint8_t dst_chroma_sample_location = VA_CHROMA_SITING_UNKNOWN;
chromasitting_param_init(&in_chroma_sample_location, &dst_chroma_sample_location);
/* Fill pipeline buffer */ /* Fill pipeline buffer */
surface_region.x = 0; surface_region.x = 0;
surface_region.y = 0; surface_region.y = 0;
@ -1043,7 +1070,9 @@ video_frame_process( VASurfaceID in_surface_id,
pipeline_param.surface = in_surface_id; pipeline_param.surface = in_surface_id;
pipeline_param.surface_region = &surface_region; pipeline_param.surface_region = &surface_region;
pipeline_param.output_region = &output_region; pipeline_param.output_region = &output_region;
pipeline_param.input_color_properties.chroma_sample_location = chroma_sample_location; pipeline_param.input_color_properties.chroma_sample_location = in_chroma_sample_location;
pipeline_param.output_color_properties.chroma_sample_location = dst_chroma_sample_location;
va_status = vaCreateBuffer(va_dpy, va_status = vaCreateBuffer(va_dpy,
context_id, context_id,
VAProcPipelineParameterBufferType, VAProcPipelineParameterBufferType,