diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp index 8804b80cf49..0f4a3b3e2b7 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc_h264.cpp @@ -466,7 +466,7 @@ d3d12_video_encoder_negotiate_current_h264_slices_configuration(struct d3d12_vid "have the same number of macroblocks.\n"); 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) && d3d12_video_encoder_check_subregion_mode_support( pD3D12Enc, diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp index 019bcf0551d..d85dc2cad99 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc_hevc.cpp @@ -491,7 +491,7 @@ d3d12_video_encoder_negotiate_current_hevc_slices_configuration(struct d3d12_vid "have the same number of macroblocks.\n"); 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) && d3d12_video_encoder_check_subregion_mode_support( pD3D12Enc, diff --git a/src/gallium/frontends/va/picture.c b/src/gallium/frontends/va/picture.c index 9172980bc77..a2bb608ec96 100644 --- a/src/gallium/frontends/va/picture.c +++ b/src/gallium/frontends/va/picture.c @@ -651,12 +651,12 @@ handleVAEncMiscParameterTypeMaxSliceSize(vlVaContext *context, VAEncMiscParamete switch (u_reduce_video_profile(context->templat.profile)) { 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; } break; 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; } break; default: diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index 8c03fe74755..0f2b7c2f0a2 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -333,7 +333,7 @@ enum pipe_video_slice_mode /* * 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 diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h index 1afa57dadf4..e2b2f9dd434 100644 --- a/src/gallium/include/pipe/p_video_state.h +++ b/src/gallium/include/pipe/p_video_state.h @@ -666,7 +666,7 @@ struct pipe_h264_enc_picture_desc unsigned num_slice_descriptors; 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; bool insert_aud_nalu; @@ -867,7 +867,7 @@ struct pipe_h265_enc_picture_desc unsigned num_slice_descriptors; 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; enum pipe_video_feedback_metadata_type requested_metadata; bool renew_headers_on_idr;