[PATCH 0/1] MR5965: mf/tests: do not use static consts for older compilers
Otherwise it will fail with gcc 7 on Leap 15.5 and 15.6. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965
From: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/mf/tests/transform.c | 295 +++++++++++++++++++------------------- 1 file changed, 146 insertions(+), 149 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index deec2c7dd92..6c081f917f9 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -49,6 +49,9 @@ #include "d3d11_4.h" +#define ACTUAL_WIDTH 96 +#define ACTUAL_HEIGHT 96 + DEFINE_GUID(DMOVideoFormat_RGB24,D3DFMT_R8G8B8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); DEFINE_GUID(DMOVideoFormat_RGB32,D3DFMT_X8R8G8B8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); DEFINE_GUID(DMOVideoFormat_RGB555,D3DFMT_X1R5G5B5,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); @@ -3818,7 +3821,6 @@ static IMFSample *next_h264_sample_(int line, const BYTE **h264_buf, ULONG *h264 static void test_h264_encoder(void) { - static const DWORD actual_width = 96, actual_height = 96; const GUID *const class_id = &CLSID_MSH264EncoderMFT; const struct transform_info expect_mft_info = { @@ -3859,7 +3861,7 @@ static void test_h264_encoder(void) }; static const struct attribute_desc expect_available_input_attributes[] = { - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, MFNominalRange_Wide), ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), @@ -3871,7 +3873,7 @@ static void test_h264_encoder(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_UINT32(test_attr_guid, 0), {0}, }; @@ -3879,7 +3881,7 @@ static void test_h264_encoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required_set = TRUE), ATTR_UINT32(MF_MT_AVG_BITRATE, 193540, .required_set = TRUE), ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive, .required_set = TRUE), @@ -3890,7 +3892,7 @@ static void test_h264_encoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), ATTR_UINT32(test_attr_guid, 0), {0}, @@ -3899,7 +3901,7 @@ static void test_h264_encoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header)), @@ -4178,7 +4180,6 @@ static void test_h264_decoder(void) {0}, }; static const MFVideoArea actual_aperture = {.Area={82,84}}; - static const DWORD actual_width = 96, actual_height = 96; const media_type_desc actual_outputs[] = { { @@ -4186,9 +4187,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 60000, 1000), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -4202,9 +4203,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 60000, 1000), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -4218,9 +4219,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 60000, 1000), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -4234,9 +4235,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 60000, 1000), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -4250,9 +4251,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 60000, 1000), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -4278,7 +4279,7 @@ static void test_h264_decoder(void) { .dwFlags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE, - .cbSize = actual_width * actual_height * 2, + .cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 2, }; const MFT_INPUT_STREAM_INFO input_info = { @@ -4294,9 +4295,9 @@ static void test_h264_decoder(void) }; const struct buffer_desc output_buffer_desc_nv12 = { - .length = actual_width * actual_height * 3 / 2, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2, .compare = compare_nv12, .compare_rect = {.right = 82, .bottom = 84}, - .dump = dump_nv12, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_nv12, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct sample_desc output_sample_desc_nv12 = { @@ -4306,9 +4307,9 @@ static void test_h264_decoder(void) }; const struct buffer_desc output_buffer_desc_i420 = { - .length = actual_width * actual_height * 3 / 2, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2, .compare = compare_i420, .compare_rect = {.right = 82, .bottom = 84}, - .dump = dump_i420, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_i420, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct sample_desc expect_output_sample_i420 = { @@ -4543,7 +4544,7 @@ static void test_h264_decoder(void) check_mft_get_output_current_type_(__LINE__, transform, expect_new_output_type_desc, FALSE, TRUE); - output_sample = create_sample(NULL, actual_width * actual_height * 2); + output_sample = create_sample(NULL, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2); hr = check_mft_process_output(transform, output_sample, &output_status); todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#lx\n", hr); @@ -4573,7 +4574,7 @@ static void test_h264_decoder(void) hr = MFCreateCollection(&output_samples); ok(hr == S_OK, "MFCreateCollection returned %#lx\n", hr); - output_sample = create_sample(NULL, actual_width * actual_height * 2); + output_sample = create_sample(NULL, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2); hr = check_mft_process_output(transform, output_sample, &output_status); ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr); ok(output_status == 0, "got output[0].dwStatus %#lx\n", output_status); @@ -4587,7 +4588,7 @@ static void test_h264_decoder(void) ok(ret == 0, "got %lu%% diff\n", ret); IMFCollection_Release(output_samples); - output_sample = create_sample(NULL, actual_width * actual_height * 2); + output_sample = create_sample(NULL, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2); hr = check_mft_process_output(transform, output_sample, &output_status); todo_wine_if(hr == S_OK) /* when VA-API plugin is used */ ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); @@ -5385,20 +5386,19 @@ static void test_wmv_encoder(void) }, }; - static const DWORD actual_width = 96, actual_height = 96; const struct attribute_desc input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), /* required for SetOutputType */ + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), /* required for SetOutputType */ {0}, }; const struct attribute_desc output_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_WMV1, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required = TRUE), ATTR_UINT32(MF_MT_AVG_BITRATE, 193540, .required = TRUE), {0}, @@ -5409,9 +5409,9 @@ static void test_wmv_encoder(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), @@ -5421,7 +5421,7 @@ static void test_wmv_encoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_WMV1), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), @@ -5700,7 +5700,6 @@ static void test_wmv_decoder(void) {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_VC1S)}, }; static const MFVideoArea actual_aperture = {.Area={96,96}}; - static const DWORD actual_width = 96, actual_height = 96; const struct attribute_desc expect_output_attributes[] = { ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, sizeof(actual_aperture)), @@ -5716,94 +5715,94 @@ static void test_wmv_decoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_UYVY), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YVYU), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV11), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 4), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB24), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 3), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 3), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB565), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2), /* ATTR_BLOB(MF_MT_PALETTE, ... with 12 elements), */ }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB555), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 2), }, { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB8), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT), /* ATTR_BLOB(MF_MT_PALETTE, ... with 904 elements), */ }, }; @@ -5820,52 +5819,52 @@ static void test_wmv_decoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_WMV1, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE, .todo = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE, .todo = TRUE), {0}, }; const struct attribute_desc output_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), {0}, }; const struct attribute_desc output_type_desc_negative_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH), {0}, }; const struct attribute_desc output_type_desc_rgb[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), {0}, }; const struct attribute_desc output_type_desc_rgb_negative_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc output_type_desc_rgb_positive_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc expect_input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_WMV1), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1, .todo = TRUE), {0}, }; @@ -5873,9 +5872,9 @@ static void test_wmv_decoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, 2), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), @@ -5886,9 +5885,9 @@ static void test_wmv_decoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 4), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, 2), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), @@ -5899,9 +5898,9 @@ static void test_wmv_decoder(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH * 4), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 4), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, 2), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), @@ -5943,15 +5942,15 @@ static void test_wmv_decoder(void) }; const struct buffer_desc output_buffer_desc_nv12 = { - .length = actual_width * actual_height * 3 / 2, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2, .compare = compare_nv12, .compare_rect = {.right = 82, .bottom = 84}, - .dump = dump_nv12, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_nv12, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct buffer_desc output_buffer_desc_rgb = { - .length = actual_width * actual_height * 4, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 4, .compare = compare_rgb32, .compare_rect = {.right = 82, .bottom = 84}, - .dump = dump_rgb32, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_rgb32, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct sample_desc output_sample_desc_nv12 = { @@ -7053,12 +7052,11 @@ static void test_color_convert(void) }; static const MFVideoArea actual_aperture = {.Area={82,84}}; - static const DWORD actual_width = 96, actual_height = 96; const struct attribute_desc input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), {0}, }; @@ -7066,23 +7064,23 @@ static void test_color_convert(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), {0}, }; const struct attribute_desc output_type_desc_negative_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc output_type_desc_positive_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc expect_input_type_desc[] = @@ -7090,9 +7088,9 @@ static void test_color_convert(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2, .todo = TRUE), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1, .todo = TRUE), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1, .todo = TRUE), @@ -7102,9 +7100,9 @@ static void test_color_convert(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 4, .todo = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 4, .todo = TRUE), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1, .todo = TRUE), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1, .todo = TRUE), @@ -7114,9 +7112,9 @@ static void test_color_convert(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 4, .todo = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH * 4), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, ACTUAL_WIDTH * ACTUAL_HEIGHT * 4, .todo = TRUE), ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1, .todo = TRUE), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1, .todo = TRUE), @@ -7124,20 +7122,20 @@ static void test_color_convert(void) }; const MFT_OUTPUT_STREAM_INFO output_info = { - .cbSize = actual_width * actual_height * 4, + .cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 4, .cbAlignment = 1, }; const MFT_INPUT_STREAM_INFO input_info = { - .cbSize = actual_width * actual_height * 3 / 2, + .cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2, .cbAlignment = 1, }; const struct buffer_desc output_buffer_desc = { - .length = actual_width * actual_height * 4, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 4, .compare = compare_rgb32, .compare_rect = {.right = 82, .bottom = 84}, - .dump = dump_rgb32, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_rgb32, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct attribute_desc output_sample_attributes[] = { @@ -7457,12 +7455,11 @@ static void test_video_processor(void) }; static const MFVideoArea actual_aperture = {.Area={82,84}}; - static const DWORD actual_width = 96, actual_height = 96; const struct attribute_desc rgb32_with_aperture[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), {0}, }; @@ -7470,62 +7467,62 @@ static void test_video_processor(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc nv12_default_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), {0}, }; const struct attribute_desc rgb32_default_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), {0}, }; const struct attribute_desc rgb32_negative_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc rgb32_positive_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 4), {0}, }; const struct attribute_desc rgb555_default_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB555, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), {0}, }; const struct attribute_desc rgb555_negative_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB555, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -ACTUAL_WIDTH * 2), {0}, }; const struct attribute_desc rgb555_positive_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB555, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, ACTUAL_WIDTH * 2), {0}, }; const struct attribute_desc nv12_no_aperture[] = @@ -7539,7 +7536,7 @@ static void test_video_processor(void) { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, ACTUAL_WIDTH, ACTUAL_HEIGHT, .required = TRUE), ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), ATTR_BLOB(MF_MT_GEOMETRIC_APERTURE, &actual_aperture, 16), ATTR_BLOB(MF_MT_PAN_SCAN_APERTURE, &actual_aperture, 16), @@ -7564,9 +7561,9 @@ static void test_video_processor(void) }; const struct buffer_desc rgb32_buffer_desc = { - .length = actual_width * actual_height * 4, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 4, .compare = compare_rgb32, .compare_rect = {.top = 12, .right = 82, .bottom = 96}, - .dump = dump_rgb32, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_rgb32, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct sample_desc rgb32_sample_desc = { @@ -7590,9 +7587,9 @@ static void test_video_processor(void) const struct buffer_desc rgb555_buffer_desc = { - .length = actual_width * actual_height * 2, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 2, .compare = compare_rgb16, .compare_rect = {.top = 12, .right = 82, .bottom = 96}, - .dump = dump_rgb16, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_rgb16, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct sample_desc rgb555_sample_desc = { @@ -7603,9 +7600,9 @@ static void test_video_processor(void) const struct buffer_desc nv12_buffer_desc = { - .length = actual_width * actual_height * 3 / 2, + .length = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2, .compare = compare_nv12, .compare_rect = {.top = 12, .right = 82, .bottom = 96}, - .dump = dump_nv12, .size = {.cx = actual_width, .cy = actual_height}, + .dump = dump_nv12, .size = {.cx = ACTUAL_WIDTH, .cy = ACTUAL_HEIGHT}, }; const struct sample_desc nv12_sample_desc = { @@ -7994,7 +7991,7 @@ static void test_video_processor(void) hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#lx.\n", hr); - hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)actual_width << 32 | actual_height); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)ACTUAL_WIDTH << 32 | ACTUAL_HEIGHT); ok(hr == S_OK, "SetUINT64 returned %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); @@ -8083,12 +8080,12 @@ static void test_video_processor(void) if (test->output_sample_desc == &nv12_sample_desc) { - output_info.cbSize = actual_width * actual_height * 3 / 2; + output_info.cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2; check_mft_get_output_stream_info(transform, S_OK, &output_info); } else if (test->output_sample_desc == &rgb555_sample_desc) { - output_info.cbSize = actual_width * actual_height * 2; + output_info.cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 2; check_mft_get_output_stream_info(transform, S_OK, &output_info); } else if (test->output_sample_desc == &rgb32_crop_sample_desc) @@ -8098,18 +8095,18 @@ static void test_video_processor(void) } else { - output_info.cbSize = actual_width * actual_height * 4; + output_info.cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 4; check_mft_get_output_stream_info(transform, S_OK, &output_info); } if (test->input_type_desc == nv12_default_stride || test->input_type_desc == nv12_with_aperture) { - input_info.cbSize = actual_width * actual_height * 3 / 2; + input_info.cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 3 / 2; check_mft_get_input_stream_info(transform, S_OK, &input_info); } else if (test->input_type_desc == rgb555_default_stride) { - input_info.cbSize = actual_width * actual_height * 2; + input_info.cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 2; check_mft_get_input_stream_info(transform, S_OK, &input_info); } else if (test->input_type_desc == rgb32_no_aperture) @@ -8119,7 +8116,7 @@ static void test_video_processor(void) } else { - input_info.cbSize = actual_width * actual_height * 4; + input_info.cbSize = ACTUAL_WIDTH * ACTUAL_HEIGHT * 4; check_mft_get_input_stream_info(transform, S_OK, &input_info); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5965
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=146720 Your paranoid android. === debian11 (build log) === 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0124:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins === debian11b (build log) === 0128:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins
What about just removing the static specifier? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_74800
I think removing static alone would not help, but i would need to remove const pretty much for all the structs using them -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_74805
What is the compilation error exactly? Often it is when `static const` variables are referenced in other `static const` initializations, and in this file I only see one instance of this which can be fixed by removing the static from the initialized variable. Wouldn't something like this be enough? ```diff diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index deec2c7dd92..8c5b156b622 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3857,7 +3857,7 @@ static void test_h264_encoder(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), {0}, }; - static const struct attribute_desc expect_available_input_attributes[] = + const struct attribute_desc expect_available_input_attributes[] = { ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_74884
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=146744 Your paranoid android. === debian11 (build log) === 0128:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins 0120:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins === debian11b (build log) === 0128:err:winediag:h264_encoder_create GStreamer doesn't support H.264 encoding, please install appropriate plugins
Error seen: ``` [ 415s] In file included from dlls/mf/tests/transform.c:42:0: [ 415s] dlls/mf/tests/transform.c: In function 'test_h264_encoder': [ 415s] dlls/mf/tests/transform.c:3862:38: error: initializer element is not constant [ 415s] ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), [ 415s] ^ [ 415s] dlls/mf/tests/mf_test.h:70:96: note: in definition of macro 'ATTR_RATIO' [ 415s] #define ATTR_RATIO(k, n, d, ...) {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE, __VA_ARGS__ } [ 415s] ^ [ 415s] dlls/mf/tests/transform.c:3862:38: note: (near initialization for 'expect_available_input_attributes[0].value.<anonymous>.uhVal.<anonymous>.HighPart') [ 415s] ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), [ 415s] ^ [ 415s] dlls/mf/tests/mf_test.h:70:96: note: in definition of macro 'ATTR_RATIO' [ 415s] #define ATTR_RATIO(k, n, d, ...) {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE, __VA_ARGS__ } [ 415s] ^ [ 415s] dlls/mf/tests/transform.c:3862:52: error: initializer element is not constant [ 415s] ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), [ 415s] ^ [ 415s] dlls/mf/tests/mf_test.h:70:110: note: in definition of macro 'ATTR_RATIO' [ 415s] #define ATTR_RATIO(k, n, d, ...) {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE, __VA_ARGS__ } [ 415s] ^ [ 415s] dlls/mf/tests/transform.c:3862:52: note: (near initialization for 'expect_available_input_attributes[0].value.<anonymous>.uhVal.<anonymous>.LowPart') [ 415s] ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), [ 415s] ^ [ 415s] dlls/mf/tests/mf_test.h:70:110: note: in definition of macro 'ATTR_RATIO' [ 415s] #define ATTR_RATIO(k, n, d, ...) {.key = &k, .name = #k, {.vt = VT_UI8, .uhVal = {.HighPart = n, .LowPart = d}}, .ratio = TRUE, __VA_ARGS__ } [ 415s] ^ [ 415s] dlls/mf/tests/transform.c: In function 'test_video_processor_with_dxgi_manager': [ 415s] dlls/mf/tests/transform.c:9214:49: error: initializer element is not constant [ 415s] static const MFVideoArea aperture = {.Area={set_width, set_height}}; [ 415s] ^~~~~~~~~ [ 415s] dlls/mf/tests/transform.c:9214:49: note: (near initialization for 'aperture.Area.cx') [ 415s] dlls/mf/tests/transform.c:9214:60: error: initializer element is not constant [ 415s] static const MFVideoArea aperture = {.Area={set_width, set_height}}; [ 415s] ^~~~~~~~~~ ``` [ 415s] dlls/mf/tests/transform.c:9214:60: note: (near initialization for 'aperture.Area.cy') -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_75399
I believe this was fixed with !6017, could you confirm? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_75561
This merge request was closed by Marcus Meissner. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965
it seems to build here. I think we are good -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_75721
The PR that superseeds this should fix https://bugs.winehq.org/show_bug.cgi?id=56751 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5965#note_76793
participants (5)
-
Marcus Meissner -
Marcus Meissner (＠msmeissn)
-
Marvin -
Rémi Bernon
-
theofficialgman (＠theofficialgman)