[PATCH 0/5] MR6148: include/codecapi.h: Add encoder defines.
From: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mf/tests/transform.c | 2 +- dlls/winegstreamer/video_decoder.c | 2 +- include/codecapi.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index b02c69b357e..7e2ccb6ea6e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4094,7 +4094,7 @@ static void test_h264_decoder(void) ATTR_UINT32(MF_SA_D3D11_AWARE, 1), ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0), /* more H264 decoder specific attributes from CODECAPI */ - ATTR_UINT32(AVDecVideoAcceleration_H264, 1), + ATTR_UINT32(CODECAPI_AVDecVideoAcceleration_H264, 1), {0}, }; static const DWORD input_width = 120, input_height = 248; diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 53d9e00b137..891066dac3b 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1625,7 +1625,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), NULL, &decoder))) return hr; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &CODECAPI_AVDecVideoAcceleration_H264, TRUE))) { IMFTransform_Release(&decoder->IMFTransform_iface); return hr; diff --git a/include/codecapi.h b/include/codecapi.h index 3df2bb09ce1..ed144fca914 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -85,7 +85,7 @@ enum eAVEncVideoOutputFrameRateConversion eAVEncVideoOutputFrameRateConversion_Alias = 2 }; -DEFINE_GUID(AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); +DEFINE_GUID(CODECAPI_AVDecVideoAcceleration_H264, 0xf7db8a2f, 0x4f48, 0x4ee8, 0xae, 0x31, 0x8b, 0x6e, 0xbe, 0x55, 0x8a, 0xe2); DEFINE_GUID(CODECAPI_AVEncCodecType, 0x08af4ac1, 0xf3f2, 0x4c74, 0x9d, 0xcf, 0x37, 0xf2, 0xec, 0x79, 0xf8, 0x26); DEFINE_GUID(CODECAPI_GUID_AVEncMPEG1Video, 0xc8dafefe, 0xda1e, 0x4774, 0xb2, 0x7d, 0x11, 0x83, 0x0c, 0x16, 0xb1, 0xfe); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6148
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index ed144fca914..26c34e86436 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -144,6 +144,10 @@ DEFINE_GUID(CODECAPI_AVEncH264CABACEnable, 0xee6cad62, 0xd305, 0x4248, 0xa5, 0xe DEFINE_GUID(CODECAPI_AVEncH264SPSID, 0x50f38f51, 0x2b79, 0x40e3, 0xb3, 0x9c, 0x7e, 0x9f, 0xa0, 0x77, 0x5, 0x1); DEFINE_GUID(CODECAPI_AVEncH264PPSID, 0xbfe29ec2, 0x56c, 0x4d68, 0xa3, 0x8d, 0xae, 0x59, 0x44, 0xc8, 0x58, 0x2e); +DEFINE_GUID(CODECAPI_AVEncStatVideoOutputFrameRate, 0xbe747849, 0x9ab4, 0x4a63, 0x98, 0xfe, 0xf1, 0x43, 0xf0, 0x4f, 0x8e, 0xe9); +DEFINE_GUID(CODECAPI_AVEncStatVideoCodedFrames, 0xd47f8d61, 0x6f5a, 0x4a26, 0xbb, 0x9f, 0xcd, 0x95, 0x18, 0x46, 0x2b, 0xcd); +DEFINE_GUID(CODECAPI_AVEncStatVideoTotalFrames, 0xfdaa9916, 0x119a, 0x4222, 0x9a, 0xd6, 0x3f, 0x7c, 0xab, 0x99, 0xcc, 0x8b); + DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRate, 0xea85e7c3, 0x9567, 0x4d99, 0x87, 0xc4, 0x02, 0xc1, 0xc2, 0x78, 0xca, 0x7c); DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRateConversion, 0x8c068bf4, 0x369a, 0x4ba3, 0x82, 0xfd, 0xb2, 0x51, 0x8f, 0xb3, 0x39, 0x6e); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6148
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 26c34e86436..2ad6b407343 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -148,6 +148,12 @@ DEFINE_GUID(CODECAPI_AVEncStatVideoOutputFrameRate, 0xbe747849, 0x9ab4, 0x4a63, DEFINE_GUID(CODECAPI_AVEncStatVideoCodedFrames, 0xd47f8d61, 0x6f5a, 0x4a26, 0xbb, 0x9f, 0xcd, 0x95, 0x18, 0x46, 0x2b, 0xcd); DEFINE_GUID(CODECAPI_AVEncStatVideoTotalFrames, 0xfdaa9916, 0x119a, 0x4222, 0x9a, 0xd6, 0x3f, 0x7c, 0xab, 0x99, 0xcc, 0x8b); +DEFINE_GUID(CODECAPI_AVEncVideoHeaderDropFrame, 0x6ed9e124, 0x7925, 0x43fe, 0x97, 0x1b, 0xe0, 0x19, 0xf6, 0x22, 0x22, 0xb4); +DEFINE_GUID(CODECAPI_AVEncVideoHeaderHours, 0x2acc7702, 0xe2da, 0x4158, 0xbf, 0x9b, 0x88, 0x88, 0x01, 0x29, 0xd7, 0x40); +DEFINE_GUID(CODECAPI_AVEncVideoHeaderMinutes, 0xdc1a99ce, 0x0307, 0x408b, 0x88, 0x0b, 0xb8, 0x34, 0x8e, 0xe8, 0xca, 0x7f); +DEFINE_GUID(CODECAPI_AVEncVideoHeaderSeconds, 0x4a2e1a05, 0xa780, 0x4f58, 0x81, 0x20, 0x9a, 0x44, 0x9d, 0x69, 0x65, 0x6b); +DEFINE_GUID(CODECAPI_AVEncVideoHeaderFrames, 0xafd5f567, 0x5c1b, 0x4adc, 0xbd, 0xaf, 0x73, 0x56, 0x10, 0x38, 0x14, 0x36); + DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRate, 0xea85e7c3, 0x9567, 0x4d99, 0x87, 0xc4, 0x02, 0xc1, 0xc2, 0x78, 0xca, 0x7c); DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRateConversion, 0x8c068bf4, 0x369a, 0x4ba3, 0x82, 0xfd, 0xb2, 0x51, 0x8f, 0xb3, 0x39, 0x6e); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6148
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 2ad6b407343..472574d3068 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -78,6 +78,24 @@ enum eAVEncCommonStreamEndHandling eAVEncCommonStreamEndHandling_EnsureComplete = 1, }; +enum eAVEncVideoChromaResolution +{ + eAVEncVideoChromaResolution_SameAsSource = 0, + eAVEncVideoChromaResolution_444 = 1, + eAVEncVideoChromaResolution_422 = 2, + eAVEncVideoChromaResolution_420 = 3, + eAVEncVideoChromaResolution_411 = 4, +}; + +enum eAVEncVideoChromaSubsampling +{ + eAVEncVideoChromaSubsamplingFormat_SameAsSource = 0, + eAVEncVideoChromaSubsamplingFormat_ProgressiveChroma = 0x8, + eAVEncVideoChromaSubsamplingFormat_Horizontally_Cosited = 0x4, + eAVEncVideoChromaSubsamplingFormat_Vertically_Cosited = 0x2, + eAVEncVideoChromaSubsamplingFormat_Vertically_AlignedChromaPlanes = 0x1, +}; + enum eAVEncVideoOutputFrameRateConversion { eAVEncVideoOutputFrameRateConversion_Disable = 0, @@ -154,6 +172,11 @@ DEFINE_GUID(CODECAPI_AVEncVideoHeaderMinutes, 0xdc1a99ce, 0x0307, 0x408b, 0x88 DEFINE_GUID(CODECAPI_AVEncVideoHeaderSeconds, 0x4a2e1a05, 0xa780, 0x4f58, 0x81, 0x20, 0x9a, 0x44, 0x9d, 0x69, 0x65, 0x6b); DEFINE_GUID(CODECAPI_AVEncVideoHeaderFrames, 0xafd5f567, 0x5c1b, 0x4adc, 0xbd, 0xaf, 0x73, 0x56, 0x10, 0x38, 0x14, 0x36); +DEFINE_GUID(CODECAPI_AVEncVideoInputChromaResolution, 0xbb0cec33, 0x16f1, 0x47b0, 0x8a, 0x88, 0x37, 0x81, 0x5b, 0xee, 0x17, 0x39); +DEFINE_GUID(CODECAPI_AVEncVideoOutputChromaResolution, 0x6097b4c9, 0x7c1d, 0x4e64, 0xbf, 0xcc, 0x9e, 0x97, 0x65, 0x31, 0x8a, 0xe7); +DEFINE_GUID(CODECAPI_AVEncVideoInputChromaSubsampling, 0xa8e73a39, 0x4435, 0x4ec3, 0xa6, 0xea, 0x98, 0x30, 0x0f, 0x4b, 0x36, 0xf7); +DEFINE_GUID(CODECAPI_AVEncVideoOutputChromaSubsampling, 0xfa561c6c, 0x7d17, 0x44f0, 0x83, 0xc9, 0x32, 0xed, 0x12, 0xe9, 0x63, 0x43); + DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRate, 0xea85e7c3, 0x9567, 0x4d99, 0x87, 0xc4, 0x02, 0xc1, 0xc2, 0x78, 0xca, 0x7c); DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRateConversion, 0x8c068bf4, 0x369a, 0x4ba3, 0x82, 0xfd, 0xb2, 0x51, 0x8f, 0xb3, 0x39, 0x6e); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6148
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 472574d3068..c196c6214e7 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -96,6 +96,58 @@ enum eAVEncVideoChromaSubsampling eAVEncVideoChromaSubsamplingFormat_Vertically_AlignedChromaPlanes = 0x1, }; +enum eAVEncVideoColorPrimaries +{ + eAVEncVideoColorPrimaries_SameAsSource = 0, + eAVEncVideoColorPrimaries_Reserved = 1, + eAVEncVideoColorPrimaries_BT709 = 2, + eAVEncVideoColorPrimaries_BT470_2_SysM = 3, + eAVEncVideoColorPrimaries_BT470_2_SysBG = 4, + eAVEncVideoColorPrimaries_SMPTE170M = 5, + eAVEncVideoColorPrimaries_SMPTE240M = 6, + eAVEncVideoColorPrimaries_EBU3231 = 7, + eAVEncVideoColorPrimaries_SMPTE_C = 8, +}; + +enum eAVEncVideoColorTransferFunction +{ + eAVEncVideoColorTransferFunction_SameAsSource = 0, + eAVEncVideoColorTransferFunction_10 = 1, + eAVEncVideoColorTransferFunction_18 = 2, + eAVEncVideoColorTransferFunction_20 = 3, + eAVEncVideoColorTransferFunction_22 = 4, + eAVEncVideoColorTransferFunction_22_709 = 5, + eAVEncVideoColorTransferFunction_22_240M = 6, + eAVEncVideoColorTransferFunction_22_8bit_sRGB = 7, + eAVEncVideoColorTransferFunction_28 = 8, +}; + +enum eAVEncVideoColorTransferMatrix +{ + eAVEncVideoColorTransferMatrix_SameAsSource = 0, + eAVEncVideoColorTransferMatrix_BT709 = 1, + eAVEncVideoColorTransferMatrix_BT601 = 2, + eAVEncVideoColorTransferMatrix_SMPTE240M = 3, +}; + +enum eAVEncVideoColorLighting +{ + eAVEncVideoColorLighting_SameAsSource = 0, + eAVEncVideoColorLighting_Unknown = 1, + eAVEncVideoColorLighting_Bright = 2, + eAVEncVideoColorLighting_Office = 3, + eAVEncVideoColorLighting_Dim = 4, + eAVEncVideoColorLighting_Dark = 5, +}; + +enum eAVEncVideoColorNominalRange +{ + eAVEncVideoColorNominalRange_SameAsSource = 0, + eAVEncVideoColorNominalRange_0_255 = 1, + eAVEncVideoColorNominalRange_16_235 = 2, + eAVEncVideoColorNominalRange_48_208 = 3, +}; + enum eAVEncVideoOutputFrameRateConversion { eAVEncVideoOutputFrameRateConversion_Disable = 0, @@ -177,6 +229,17 @@ DEFINE_GUID(CODECAPI_AVEncVideoOutputChromaResolution, 0x6097b4c9, 0x7c1d, 0x4e DEFINE_GUID(CODECAPI_AVEncVideoInputChromaSubsampling, 0xa8e73a39, 0x4435, 0x4ec3, 0xa6, 0xea, 0x98, 0x30, 0x0f, 0x4b, 0x36, 0xf7); DEFINE_GUID(CODECAPI_AVEncVideoOutputChromaSubsampling, 0xfa561c6c, 0x7d17, 0x44f0, 0x83, 0xc9, 0x32, 0xed, 0x12, 0xe9, 0x63, 0x43); +DEFINE_GUID(CODECAPI_AVEncVideoInputColorPrimaries, 0xc24d783f, 0x7ce6, 0x4278, 0x90, 0xab, 0x28, 0xa4, 0xf1, 0xe5, 0xf8, 0x6c); +DEFINE_GUID(CODECAPI_AVEncVideoOutputColorPrimaries, 0xbe95907c, 0x9d04, 0x4921, 0x89, 0x85, 0xa6, 0xd6, 0xd8, 0x7d, 0x1a, 0x6c); +DEFINE_GUID(CODECAPI_AVEncVideoInputColorTransferFunction, 0x8c056111, 0xa9c3, 0x4b08, 0xa0, 0xa0, 0xce, 0x13, 0xf8, 0xa2, 0x7c, 0x75); +DEFINE_GUID(CODECAPI_AVEncVideoOutputColorTransferFunction, 0x4a7f884a, 0xea11, 0x460d, 0xbf, 0x57, 0xb8, 0x8b, 0xc7, 0x59, 0x00, 0xde); +DEFINE_GUID(CODECAPI_AVEncVideoInputColorTransferMatrix, 0x52ed68b9, 0x72d5, 0x4089, 0x95, 0x8d, 0xf5, 0x40, 0x5d, 0x55, 0x08, 0x1c); +DEFINE_GUID(CODECAPI_AVEncVideoOutputColorTransferMatrix, 0xa9b90444, 0xaf40, 0x4310, 0x8f, 0xbe, 0xed, 0x6d, 0x93, 0x3f, 0x89, 0x2b); +DEFINE_GUID(CODECAPI_AVEncVideoInputColorLighting, 0x46a99549, 0x0015, 0x4a45, 0x9c, 0x30, 0x1d, 0x5c, 0xfa, 0x25, 0x83, 0x16); +DEFINE_GUID(CODECAPI_AVEncVideoOutputColorLighting, 0x0e5aaac6, 0xace6, 0x4c5c, 0x99, 0x8e, 0x1a, 0x8c, 0x9c, 0x6c, 0x0f, 0x89); +DEFINE_GUID(CODECAPI_AVEncVideoInputColorNominalRange, 0x16cf25c6, 0xa2a6, 0x48e9, 0xae, 0x80, 0x21, 0xae, 0xc4, 0x1d, 0x42, 0x7e); +DEFINE_GUID(CODECAPI_AVEncVideoOutputColorNominalRange, 0x972835ed, 0x87b5, 0x4e95, 0x95, 0x00, 0xc7, 0x39, 0x58, 0x56, 0x6e, 0x54); + DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRate, 0xea85e7c3, 0x9567, 0x4d99, 0x87, 0xc4, 0x02, 0xc1, 0xc2, 0x78, 0xca, 0x7c); DEFINE_GUID(CODECAPI_AVEncVideoOutputFrameRateConversion, 0x8c068bf4, 0x369a, 0x4ba3, 0x82, 0xfd, 0xb2, 0x51, 0x8f, 0xb3, 0x39, 0x6e); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6148
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=147315 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000009C00E0, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032
participants (3)
-
Marvin -
Ziqing Hui -
Ziqing Hui (＠zhui)