- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL GEP instruction.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 59730ecfd8b889cae59d07307c65185be4560b9e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/59730ecfd8b889cae59d07307c651… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 16:52:45 2023 +1000 vkd3d-shader/dxil: Implement the DXIL GEP instruction. --- libs/vkd3d-shader/dxil.c | 115 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/ir.c | 3 + libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 3 files changed, 120 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 5990b6df..4249e7f5 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2195,6 +2195,18 @@ static bool sm6_value_validate_is_handle(const struct sm6_value *value, struct s return true; } +static bool sm6_value_validate_is_pointer(const struct sm6_value *value, struct sm6_parser *sm6) +{ + if (!sm6_type_is_pointer(value->type)) + { + WARN("Operand result type class %u is not a pointer.\n", value->type->class); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "A pointer operand passed to a DXIL instruction is not a pointer."); + return false; + } + return true; +} + static bool sm6_value_validate_is_bool(const struct sm6_value *value, struct sm6_parser *sm6) { const struct sm6_type *type = value->type; @@ -3877,6 +3889,106 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_gep(struct sm6_parser *sm6, const struct dxil_record *record, + struct vkd3d_shader_instruction *ins, struct sm6_value *dst) +{ + const struct sm6_type *type, *pointee_type; + unsigned int elem_idx, operand_idx = 2; + enum bitcode_address_space addr_space; + const struct sm6_value *elem_value; + struct vkd3d_shader_register *reg; + const struct sm6_value *src; + bool is_in_bounds; + + if (!dxil_record_validate_operand_min_count(record, 5, sm6) + || !(type = sm6_parser_get_type(sm6, record->operands[1])) + || !(src = sm6_parser_get_value_by_ref(sm6, record, NULL, &operand_idx)) + || !sm6_value_validate_is_register(src, sm6) + || !sm6_value_validate_is_pointer(src, sm6) + || !dxil_record_validate_operand_min_count(record, operand_idx + 2, sm6)) + { + return; + } + + if (src->u.reg.idx_count > 1) + { + WARN("Unsupported stacked GEP.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "A GEP instruction on the result of a previous GEP is unsupported."); + return; + } + + is_in_bounds = record->operands[0]; + + if ((pointee_type = src->type->u.pointer.type) != type) + { + WARN("Type mismatch, type %u width %u vs type %u width %u.\n", type->class, + type->u.width, pointee_type->class, pointee_type->u.width); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "Type mismatch in GEP operation arguments."); + } + addr_space = src->type->u.pointer.addr_space; + + if (!(elem_value = sm6_parser_get_value_by_ref(sm6, record, NULL, &operand_idx))) + return; + + /* The first index is always zero, to form a simple pointer dereference. */ + if (sm6_value_get_constant_uint(elem_value)) + { + WARN("Expected constant zero.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "The pointer dereference index for a GEP instruction is not constant zero."); + return; + } + + if (!sm6_type_is_array(pointee_type)) + { + WARN("Invalid GEP on type class %u.\n", pointee_type->class); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Source type for index 1 of a GEP instruction is not an array."); + return; + } + + if (!(elem_value = sm6_parser_get_value_by_ref(sm6, record, NULL, &operand_idx))) + return; + + /* If indexing is dynamic, just get the type at offset zero. */ + elem_idx = sm6_value_is_constant(elem_value) ? sm6_value_get_constant_uint(elem_value) : 0; + type = sm6_type_get_element_type_at_index(pointee_type, elem_idx); + if (!type) + { + WARN("Invalid element index %u.\n", elem_idx); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Element index %u for a GEP instruction is out of bounds.", elem_idx); + return; + } + + if (operand_idx < record->operand_count) + { + FIXME("Multiple element indices are not implemented.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Multi-dimensional addressing in GEP instructions is not supported."); + return; + } + + if (!(dst->type = sm6_type_get_pointer_to_type(type, addr_space, sm6))) + { + WARN("Failed to get pointer type for type %u.\n", type->class); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE, + "Module does not define a pointer type for a GEP instruction."); + return; + } + + reg = &dst->u.reg; + *reg = src->u.reg; + reg->idx[1].offset = 0; + register_index_address_init(&reg->idx[1], elem_value, sm6); + reg->idx[1].is_in_bounds = is_in_bounds; + reg->idx_count = 2; + + ins->handler_idx = VKD3DSIH_NOP; +} + static void sm6_parser_emit_ret(struct sm6_parser *sm6, const struct dxil_record *record, struct sm6_block *code_block, struct vkd3d_shader_instruction *ins) { @@ -4079,6 +4191,9 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const case FUNC_CODE_INST_EXTRACTVAL: sm6_parser_emit_extractval(sm6, record, ins, dst); break; + case FUNC_CODE_INST_GEP: + sm6_parser_emit_gep(sm6, record, ins, dst); + break; case FUNC_CODE_INST_RET: sm6_parser_emit_ret(sm6, record, code_block, ins); is_terminator = true; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 833f5084..8ddfc115 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -300,10 +300,13 @@ void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_reg reg->data_type = data_type; reg->idx[0].offset = ~0u; reg->idx[0].rel_addr = NULL; + reg->idx[0].is_in_bounds = false; reg->idx[1].offset = ~0u; reg->idx[1].rel_addr = NULL; + reg->idx[1].is_in_bounds = false; reg->idx[2].offset = ~0u; reg->idx[2].rel_addr = NULL; + reg->idx[2].is_in_bounds = false; reg->idx_count = idx_count; reg->dimension = VSIR_DIMENSION_SCALAR; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index fc6c5fca..cdf636f8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -814,6 +814,8 @@ struct vkd3d_shader_register_index { const struct vkd3d_shader_src_param *rel_addr; unsigned int offset; + /* address is known to fall within the object (for optimisation) */ + bool is_in_bounds; }; struct vkd3d_shader_register

1 0

Conor McCarthy : vkd3d-shader/dxil: Introduce a value type for immediate constant buffers.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: f2a656b876ebfdbb4d15592a6ecb6e9d511f0124 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f2a656b876ebfdbb4d15592a6ecb6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 15 11:54:03 2023 +1000 vkd3d-shader/dxil: Introduce a value type for immediate constant buffers. --- libs/vkd3d-shader/dxil.c | 14 ++++++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index bb23aa86..1929fcb4 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -404,6 +404,7 @@ enum sm6_value_type { VALUE_TYPE_FUNCTION, VALUE_TYPE_REG, + VALUE_TYPE_ICB, VALUE_TYPE_HANDLE, }; @@ -429,6 +430,7 @@ struct sm6_value { struct sm6_function_data function; struct vkd3d_shader_register reg; + const struct vkd3d_shader_immediate_constant_buffer *icb; struct sm6_handle_data handle; } u; }; @@ -1900,7 +1902,7 @@ static inline bool sm6_value_is_undef(const struct sm6_value *value) static bool sm6_value_is_icb(const struct sm6_value *value) { - return sm6_value_is_register(value) && value->u.reg.type == VKD3DSPR_IMMCONSTBUFFER; + return value->value_type == VALUE_TYPE_ICB; } static inline unsigned int sm6_value_get_constant_uint(const struct sm6_value *value) @@ -2360,7 +2362,7 @@ static inline double bitcast_uint64_to_double(uint64_t value) return u.double_value; } -static enum vkd3d_result register_allocate_constant_array(struct vkd3d_shader_register *reg, const struct sm6_type *type, +static enum vkd3d_result value_allocate_constant_array(struct sm6_value *dst, const struct sm6_type *type, const uint64_t *operands, struct sm6_parser *sm6) { struct vkd3d_shader_immediate_constant_buffer *icb; @@ -2395,7 +2397,7 @@ static enum vkd3d_result register_allocate_constant_array(struct vkd3d_shader_re "Out of memory allocating an immediate constant buffer of count %u.", count); return VKD3D_ERROR_OUT_OF_MEMORY; } - if ((reg->idx[0].offset = shader_instruction_array_add_icb(&sm6->p.instructions, icb)) == UINT_MAX) + if (!shader_instruction_array_add_icb(&sm6->p.instructions, icb)) { ERR("Failed to store icb object.\n"); vkd3d_free(icb); @@ -2404,8 +2406,8 @@ static enum vkd3d_result register_allocate_constant_array(struct vkd3d_shader_re return VKD3D_ERROR_OUT_OF_MEMORY; } - reg->type = VKD3DSPR_IMMCONSTBUFFER; - reg->idx_count = 1; + dst->value_type = VALUE_TYPE_ICB; + dst->u.icb = icb; icb->data_type = vkd3d_data_type_from_sm6_type(elem_type); icb->element_count = type->u.array.count; @@ -2544,7 +2546,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const if (!dxil_record_validate_operand_count(record, type->u.array.count, type->u.array.count, sm6)) return VKD3D_ERROR_INVALID_SHADER; - if ((ret = register_allocate_constant_array(&dst->u.reg, type, record->operands, sm6)) < 0) + if ((ret = value_allocate_constant_array(dst, type, record->operands, sm6)) < 0) return ret; break; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 770e385a..77164c9c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -2045,14 +2045,14 @@ bool shader_instruction_array_reserve(struct vkd3d_shader_instruction_array *ins return true; } -unsigned int shader_instruction_array_add_icb(struct vkd3d_shader_instruction_array *instructions, +bool shader_instruction_array_add_icb(struct vkd3d_shader_instruction_array *instructions, struct vkd3d_shader_immediate_constant_buffer *icb) { if (!vkd3d_array_reserve((void **)&instructions->icbs, &instructions->icb_capacity, instructions->icb_count + 1, sizeof(*instructions->icbs))) - return UINT_MAX; - instructions->icbs[instructions->icb_count] = icb; - return instructions->icb_count++; + return false; + instructions->icbs[instructions->icb_count++] = icb; + return true; } static struct vkd3d_shader_src_param *shader_instruction_array_clone_src_params( diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a9c64641..e4e0ca42 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1206,7 +1206,7 @@ struct vkd3d_shader_instruction_array bool shader_instruction_array_init(struct vkd3d_shader_instruction_array *instructions, unsigned int reserve); bool shader_instruction_array_reserve(struct vkd3d_shader_instruction_array *instructions, unsigned int reserve); -unsigned int shader_instruction_array_add_icb(struct vkd3d_shader_instruction_array *instructions, +bool shader_instruction_array_add_icb(struct vkd3d_shader_instruction_array *instructions, struct vkd3d_shader_immediate_constant_buffer *icb); bool shader_instruction_array_clone_instruction(struct vkd3d_shader_instruction_array *instructions, unsigned int dst, unsigned int src);

1 0

Conor McCarthy : vkd3d-shader: Delete unused struct list from struct vkd3d_shader_indexable_temp.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 920657e7ee976a2fbaddad47db890831f2bcb7ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/920657e7ee976a2fbaddad47db890… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 16:16:11 2023 +1000 vkd3d-shader: Delete unused struct list from struct vkd3d_shader_indexable_temp. --- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 41fcf577..007610be 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -801,7 +801,6 @@ struct vkd3d_shader_immediate_constant_buffer struct vkd3d_shader_indexable_temp { - struct list entry; unsigned int register_idx; unsigned int register_size; unsigned int component_count;

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement default address space global variables.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: vkd3d Branch: master Commit: 85d5f83fb7eeee4a0f3f1d974d441373000f21b6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/85d5f83fb7eeee4a0f3f1d974d441… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 16:09:58 2023 +1000 vkd3d-shader/dxil: Implement default address space global variables. --- libs/vkd3d-shader/d3d_asm.c | 2 + libs/vkd3d-shader/dxil.c | 189 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 3 + libs/vkd3d-shader/tpf.c | 2 + libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 5 files changed, 197 insertions(+), 1 deletion(-)

1 0

Alfred Agrell : winegstreamer: Store duration in the duration field.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 9196fecb639b433e6a6f687e0ce62669c9cc2bf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/9196fecb639b433e6a6f687e0ce626… Author: Alfred Agrell <floating(a)muncher.se> Date: Mon Nov 20 20:56:07 2023 +0100 winegstreamer: Store duration in the duration field. --- dlls/winegstreamer/wg_sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 4b02252174b..31281066957 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -484,7 +484,7 @@ HRESULT wg_transform_push_dmo(wg_transform_t transform, IMediaBuffer *media_buff if (flags & DMO_INPUT_DATA_BUFFERF_TIMELENGTH) { wg_sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; - wg_sample->pts = time_length; + wg_sample->duration = time_length; } wg_sample_queue_begin_append(queue, wg_sample);

1 0

Eric Pouech : msvcrt: Lazily initialize ___winitenv.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: a45ca342fc418ce5e018953f60c4c1219774f254 URL: https://gitlab.winehq.org/wine/wine/-/commit/a45ca342fc418ce5e018953f60c4c1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Lazily initialize ___winitenv. --- dlls/msvcrt/data.c | 80 ++------------------------------ dlls/msvcrt/environ.c | 105 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/msvcrt.h | 5 +- dlls/msvcrt/tests/environ.c | 3 -- dlls/ucrtbase/tests/environ.c | 3 +- 5 files changed, 97 insertions(+), 99 deletions(-)

1 0

Eric Pouech : msvcrt: Allocate environment variables in separate allocation chunks.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: bdb624fffb1c1acc1feb2baec396d9b805cb0ce9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdb624fffb1c1acc1feb2baec396d9… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Allocate environment variables in separate allocation chunks. --- dlls/msvcrt/environ.c | 338 ++++++++++++++++++++++++++---------------- dlls/msvcrt/tests/environ.c | 4 - dlls/ucrtbase/tests/environ.c | 4 - 3 files changed, 214 insertions(+), 132 deletions(-)

1 0

Francois Gouget : advapi32/tests: Fix a service stop race condition.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 96da5a8a3572d08bbcf4323c3701e7da5f79e523 URL: https://gitlab.winehq.org/wine/wine/-/commit/96da5a8a3572d08bbcf4323c3701e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 16 18:50:30 2023 +0100 advapi32/tests: Fix a service stop race condition. If some Windows services stop while testing EnumServicesStatusW()'s resume handle support, one possibility is that the still running services all fit in the specified buffer, invalidating the test so there is a retry in place. But in some cases the second call just returns fewer tests than expected. So retry in that case too. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4e6aebb445d..3fb1bda1d7d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1370,6 +1370,8 @@ static BOOL test_enum_svc(int attempt) goto retry; /* service start race condition */ ok(ret, "Expected success, got error %lu\n", GetLastError()); ok(needed == 0, "Expected 0 needed bytes as we are done, got %lu\n", needed); + if (returned < missing && strcmp(winetest_platform, "wine") && attempt) + goto retry; /* service stop race condition */ todo_wine ok(returned == missing, "Expected %lu remaining services, got %lu\n", missing, returned); ok(resume == 0, "Expected the resume handle to be 0\n");

1 0

Eric Pouech : msvcrt: Fix ucrtbase environment initialization.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 58155d3eb9ccaf79a2f8a481aec639568cce9f14 URL: https://gitlab.winehq.org/wine/wine/-/commit/58155d3eb9ccaf79a2f8a481aec639… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Fix ucrtbase environment initialization. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/data.c | 34 +++++++++++++++++++--------------- dlls/ucrtbase/tests/environ.c | 1 - 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index bec1e61e411..6e764e52eae 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -592,14 +592,6 @@ void CDECL __set_app_type(int app_type) #if _MSVCR_VER>=140 -/********************************************************************* - * _get_initial_narrow_environment (UCRTBASE.@) - */ -char** CDECL _get_initial_narrow_environment(void) -{ - return MSVCRT___initenv; -} - /********************************************************************* * _configure_narrow_argv (UCRTBASE.@) */ @@ -614,16 +606,18 @@ int CDECL _configure_narrow_argv(int mode) */ int CDECL _initialize_narrow_environment(void) { - TRACE("\n"); - return 0; + TRACE("\n"); + return env_init(FALSE, FALSE); } /********************************************************************* - * _get_initial_wide_environment (UCRTBASE.@) + * _get_initial_narrow_environment (UCRTBASE.@) */ -wchar_t** CDECL _get_initial_wide_environment(void) +char** CDECL _get_initial_narrow_environment(void) { - return MSVCRT___winitenv; + TRACE("\n"); + _initialize_narrow_environment(); + return MSVCRT___initenv; } /********************************************************************* @@ -640,8 +634,18 @@ int CDECL _configure_wide_argv(int mode) */ int CDECL _initialize_wide_environment(void) { - WARN("stub\n"); - return 0; + TRACE("\n"); + return env_init(TRUE, FALSE); +} + +/********************************************************************* + * _get_initial_wide_environment (UCRTBASE.@) + */ +wchar_t** CDECL _get_initial_wide_environment(void) +{ + TRACE("\n"); + _initialize_wide_environment(); + return MSVCRT___winitenv; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/environ.c b/dlls/ucrtbase/tests/environ.c index dc31c640239..a42f64466e9 100644 --- a/dlls/ucrtbase/tests/environ.c +++ b/dlls/ucrtbase/tests/environ.c @@ -136,7 +136,6 @@ static void test_initial_environ( void ) ok( p__p__wenviron() != NULL, "Unexpected NULL _wenviron[]\n" ); ok( *p__p__wenviron() == NULL, "Unexpected non empty _wenviron[]\n" ); - todo_wine ok( p_get_initial_wide_environment() != NULL, "Unexpected empty wide initial environment\n" ); ok( p_get_initial_wide_environment() == *p__p__wenviron(), "Expecting _wenviron[] to match initial wide environment\n" ); }

1 0

Ziqing Hui : winegstreamer: Implement wg_muxer_read_data.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 1617bd3f874ea96b2757723d82a0bd1b656f3d2f URL: https://gitlab.winehq.org/wine/wine/-/commit/1617bd3f874ea96b2757723d82a0bd… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Oct 30 10:29:08 2023 +0800 winegstreamer: Implement wg_muxer_read_data. --- dlls/winegstreamer/wg_muxer.c | 76 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 0d25687a7d1..c0614807459 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -59,8 +59,11 @@ struct wg_muxer GstPad *my_sink; GstCaps *my_sink_caps; + GstAtomicQueue *output_queue; + GstBuffer *buffer; + pthread_mutex_t mutex; - guint64 offset; + guint64 offset; /* Write offset of the output buffer generated by muxer. */ struct list streams; }; @@ -198,8 +201,29 @@ static gboolean muxer_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *ev static GstFlowReturn muxer_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { - GST_FIXME("Stub."); - return GST_FLOW_ERROR; + GstBuffer *buffer_writable= gst_buffer_make_writable(buffer); + struct wg_muxer *muxer = gst_pad_get_element_private(pad); + + GST_DEBUG("muxer %p, pad %"GST_PTR_FORMAT", parent %"GST_PTR_FORMAT", buffer <%"GST_PTR_FORMAT">.", + muxer, pad, parent, buffer); + + pthread_mutex_lock(&muxer->mutex); + + GST_BUFFER_OFFSET(buffer_writable) = GST_BUFFER_OFFSET_NONE; + if (muxer->offset != GST_BUFFER_OFFSET_NONE) + { + GST_BUFFER_OFFSET(buffer_writable) = muxer->offset; + muxer->offset = GST_BUFFER_OFFSET_NONE; + } + + gst_atomic_queue_push(muxer->output_queue, buffer_writable); + + GST_DEBUG("Pushed writable buffer <%"GST_PTR_FORMAT"> to output queue %p, %u buffers in queue now.", + buffer_writable, muxer->output_queue, gst_atomic_queue_length(muxer->output_queue)); + + pthread_mutex_unlock(&muxer->mutex); + + return GST_FLOW_OK; } static void stream_free(struct wg_muxer_stream *stream) @@ -226,6 +250,8 @@ NTSTATUS wg_muxer_create(void *args) pthread_mutex_init(&muxer->mutex, NULL); if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; + if (!(muxer->output_queue = gst_atomic_queue_new(8))) + goto out; /* Create sink pad. */ if (!(muxer->my_sink_caps = gst_caps_from_string(params->format))) @@ -257,6 +283,8 @@ out: gst_object_unref(template); if (muxer->my_sink_caps) gst_caps_unref(muxer->my_sink_caps); + if (muxer->output_queue) + gst_atomic_queue_unref(muxer->output_queue); if (muxer->container) gst_object_unref(muxer->container); pthread_mutex_destroy(&muxer->mutex); @@ -269,6 +297,7 @@ NTSTATUS wg_muxer_destroy(void *args) { struct wg_muxer *muxer = get_muxer(*(wg_muxer_t *)args); struct wg_muxer_stream *stream, *next; + GstBuffer *buffer; LIST_FOR_EACH_ENTRY_SAFE(stream, next, &muxer->streams, struct wg_muxer_stream, entry) { @@ -276,6 +305,13 @@ NTSTATUS wg_muxer_destroy(void *args) stream_free(stream); } + if (muxer->buffer) + gst_buffer_unref(muxer->buffer); + + while ((buffer = gst_atomic_queue_pop(muxer->output_queue))) + gst_buffer_unref(buffer); + gst_atomic_queue_unref(muxer->output_queue); + gst_object_unref(muxer->my_sink); gst_caps_unref(muxer->my_sink_caps); gst_element_set_state(muxer->container, GST_STATE_NULL); @@ -454,6 +490,36 @@ NTSTATUS wg_muxer_push_sample(void *args) NTSTATUS wg_muxer_read_data(void *args) { - GST_FIXME("Not implemented."); - return STATUS_NOT_IMPLEMENTED; + struct wg_muxer_read_data_params *params = args; + struct wg_muxer *muxer = get_muxer(params->muxer); + gsize size, copied; + + /* Pop buffer from output queue. */ + if (!muxer->buffer) + { + if (!(muxer->buffer = gst_atomic_queue_pop(muxer->output_queue))) + return STATUS_NO_MEMORY; + + /* We may continuously read data from a same buffer multiple times. + * But we only need to set the offset at the first reading. */ + if (GST_BUFFER_OFFSET_IS_VALID(muxer->buffer)) + params->offset = GST_BUFFER_OFFSET(muxer->buffer); + } + + /* Copy data. */ + size = min(gst_buffer_get_size(muxer->buffer), params->size); + copied = gst_buffer_extract(muxer->buffer, 0, params->buffer, size); + params->size = copied; + + GST_INFO("Copied %"G_GSIZE_FORMAT" bytes from buffer <%"GST_PTR_FORMAT">", copied, muxer->buffer); + + /* Unref buffer if all data is read. */ + gst_buffer_resize(muxer->buffer, (gssize)copied, -1); + if (!gst_buffer_get_size(muxer->buffer)) + { + gst_buffer_unref(muxer->buffer); + muxer->buffer = NULL; + } + + return STATUS_SUCCESS; }

1 0