fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 13:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

frontends/va, d3d12: Fix PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE -> PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE typo

Browse source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27342>
This commit is contained in:
Sil Vilerino 2024-01-29 14:42:42 -05:00 • committed by Marge Bot
parent e28d52e761
commit 9710fca612
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp
View file

@ -466,7 +466,7 @@ d3d12_video_encoder_negotiate_current_h264_slices_configuration(struct d3d12_vid
"have the same number of macroblocks.\n"); "have the same number of macroblocks.\n");
return false; return false;
} }
} else if(picture->slice_mode == PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE) { } else if(picture->slice_mode == PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE) {
if ((picture->max_slice_bytes > 0) && if ((picture->max_slice_bytes > 0) &&
d3d12_video_encoder_check_subregion_mode_support( d3d12_video_encoder_check_subregion_mode_support(
pD3D12Enc, pD3D12Enc,

2
src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp
View file

@ -491,7 +491,7 @@ d3d12_video_encoder_negotiate_current_hevc_slices_configuration(struct d3d12_vid
"have the same number of macroblocks.\n"); "have the same number of macroblocks.\n");
return false; return false;
} }
} else if(picture->slice_mode == PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE) { } else if(picture->slice_mode == PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE) {
if ((picture->max_slice_bytes > 0) && if ((picture->max_slice_bytes > 0) &&
d3d12_video_encoder_check_subregion_mode_support( d3d12_video_encoder_check_subregion_mode_support(
pD3D12Enc, pD3D12Enc,

4
src/gallium/frontends/va/picture.c
View file

@ -651,12 +651,12 @@ handleVAEncMiscParameterTypeMaxSliceSize(vlVaContext *context, VAEncMiscParamete
switch (u_reduce_video_profile(context->templat.profile)) { switch (u_reduce_video_profile(context->templat.profile)) {
case PIPE_VIDEO_FORMAT_MPEG4_AVC: case PIPE_VIDEO_FORMAT_MPEG4_AVC:
{ {
context->desc.h264enc.slice_mode = PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE; context->desc.h264enc.slice_mode = PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE;
context->desc.h264enc.max_slice_bytes = max_slice_size_buffer->max_slice_size; context->desc.h264enc.max_slice_bytes = max_slice_size_buffer->max_slice_size;
} break; } break;
case PIPE_VIDEO_FORMAT_HEVC: case PIPE_VIDEO_FORMAT_HEVC:
{ {
context->desc.h265enc.slice_mode = PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE; context->desc.h265enc.slice_mode = PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE;
context->desc.h265enc.max_slice_bytes = max_slice_size_buffer->max_slice_size; context->desc.h265enc.max_slice_bytes = max_slice_size_buffer->max_slice_size;
} break; } break;
default: default:

2
src/gallium/include/pipe/p_video_enums.h
View file

@ -333,7 +333,7 @@ enum pipe_video_slice_mode
/* /*
* Partitions the frame using max slice size per coded slice * Partitions the frame using max slice size per coded slice
*/ */
PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE = 1, PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE = 1,
}; };
enum pipe_video_entrypoint enum pipe_video_entrypoint

4
src/gallium/include/pipe/p_video_state.h
View file

@ -666,7 +666,7 @@ struct pipe_h264_enc_picture_desc
unsigned num_slice_descriptors; unsigned num_slice_descriptors;
struct h264_slice_descriptor slices_descriptors[128]; struct h264_slice_descriptor slices_descriptors[128];
/* Use with PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE */ /* Use with PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE */
unsigned max_slice_bytes; unsigned max_slice_bytes;
bool insert_aud_nalu; bool insert_aud_nalu;
@ -867,7 +867,7 @@ struct pipe_h265_enc_picture_desc
unsigned num_slice_descriptors; unsigned num_slice_descriptors;
struct h265_slice_descriptor slices_descriptors[128]; struct h265_slice_descriptor slices_descriptors[128];
/* Use with PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SICE */ /* Use with PIPE_VIDEO_SLICE_MODE_MAX_SLICE_SIZE */
unsigned max_slice_bytes; unsigned max_slice_bytes;
enum pipe_video_feedback_metadata_type requested_metadata; enum pipe_video_feedback_metadata_type requested_metadata;
bool renew_headers_on_idr; bool renew_headers_on_idr;