[PATCH 0/5] MR6143: include/codecapi.h: Add more encoder defines.
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index a9fe7c9de3f..db967b17ec2 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -63,4 +63,25 @@ enum eAVEncH264VLevel DEFINE_GUID(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); +DEFINE_GUID(CODECAPI_GUID_AVEncMPEG2Video, 0x046dc19a, 0x6677, 0x4aaa, 0xa3, 0x1d, 0xc1, 0xab, 0x71, 0x6f, 0x45, 0x60); +DEFINE_GUID(CODECAPI_GUID_AVEncMPEG1Audio, 0xd4dd1362, 0xcd4a, 0x4cd6, 0x81, 0x38, 0xb9, 0x4d, 0xb4, 0x54, 0x2b, 0x04); +DEFINE_GUID(CODECAPI_GUID_AVEncMPEG2Audio, 0xee4cbb1f, 0x9c3f, 0x4770, 0x92, 0xb5, 0xfc, 0xb7, 0xc2, 0xa8, 0xd3, 0x81); +DEFINE_GUID(CODECAPI_GUID_AVEncWMV, 0x4e0fef9b, 0x1d43, 0x41bd, 0xb8, 0xbd, 0x4d, 0x7b, 0xf7, 0x45, 0x7a, 0x2a); +DEFINE_GUID(CODECAPI_GUID_AVEndMPEG4Video, 0xdd37b12a, 0x9503, 0x4f8b, 0xb8, 0xd0, 0x32, 0x4a, 0x00, 0xc0, 0xa1, 0xcf); +DEFINE_GUID(CODECAPI_GUID_AVEncH264Video, 0x95044eab, 0x31b3, 0x47de, 0x8e, 0x75, 0x38, 0xa4, 0x2b, 0xb0, 0x3e, 0x28); +DEFINE_GUID(CODECAPI_GUID_AVEncDV, 0x09b769c7, 0x3329, 0x44fb, 0x89, 0x54, 0xfa, 0x30, 0x93, 0x7d, 0x3d, 0x5a); +DEFINE_GUID(CODECAPI_GUID_AVEncWMAPro, 0x1955f90c, 0x33f7, 0x4a68, 0xab, 0x81, 0x53, 0xf5, 0x65, 0x71, 0x25, 0xc4); +DEFINE_GUID(CODECAPI_GUID_AVEncWMALossless, 0x55ca7265, 0x23d8, 0x4761, 0x90, 0x31, 0xb7, 0x4f, 0xbe, 0x12, 0xf4, 0xc1); +DEFINE_GUID(CODECAPI_GUID_AVEncWMAVoice, 0x13ed18cb, 0x50e8, 0x4276, 0xa2, 0x88, 0xa6, 0xaa, 0x22, 0x83, 0x82, 0xd9); +DEFINE_GUID(CODECAPI_GUID_AVEncDolbyDigitalPro, 0xf5be76cc, 0x0ff8, 0x40eb, 0x9c, 0xb1, 0xbb, 0xa9, 0x40, 0x04, 0xd4, 0x4f); +DEFINE_GUID(CODECAPI_GUID_AVEncDolbyDigitalConsumer, 0xc1a7bf6c, 0x0059, 0x4bfa, 0x94, 0xef, 0xef, 0x74, 0x7a, 0x76, 0x8d, 0x52); +DEFINE_GUID(CODECAPI_GUID_AVEncDolbyDigitalPlus, 0x698d1b80, 0xf7dd, 0x415c, 0x97, 0x1c, 0x42, 0x49, 0x2a, 0x20, 0x56, 0xc6); +DEFINE_GUID(CODECAPI_GUID_AVEncDTSHD, 0x2052e630, 0x469d, 0x4bfb, 0x80, 0xca, 0x1d, 0x65, 0x6e, 0x7e, 0x91, 0x8f); +DEFINE_GUID(CODECAPI_GUID_AVEncDTS, 0x45fbcaa2, 0x5e6e, 0x4ab0, 0x88, 0x93, 0x59, 0x03, 0xbe, 0xe9, 0x3a, 0xcf); +DEFINE_GUID(CODECAPI_GUID_AVEncMLP, 0x05f73e29, 0xf0d1, 0x431e, 0xa4, 0x1c, 0xa4, 0x74, 0x32, 0xec, 0x5a, 0x66); +DEFINE_GUID(CODECAPI_GUID_AVEncPCM, 0x844be7f4, 0x26cf, 0x4779, 0xb3, 0x86, 0xcc, 0x05, 0xd1, 0x87, 0x99, 0x0c); +DEFINE_GUID(CODECAPI_GUID_AVEncSDDS, 0x1dc1b82f, 0x11c8, 0x4c71, 0xb7, 0xb6, 0xee, 0x3e, 0xb9, 0xbc, 0x2b, 0x94); + #endif /* __CODECAPI_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6143
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index db967b17ec2..7eb5426e5a9 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -84,4 +84,17 @@ DEFINE_GUID(CODECAPI_GUID_AVEncMLP, 0x05f73e29, 0xf0d1, 0x431e, DEFINE_GUID(CODECAPI_GUID_AVEncPCM, 0x844be7f4, 0x26cf, 0x4779, 0xb3, 0x86, 0xcc, 0x05, 0xd1, 0x87, 0x99, 0x0c); DEFINE_GUID(CODECAPI_GUID_AVEncSDDS, 0x1dc1b82f, 0x11c8, 0x4c71, 0xb7, 0xb6, 0xee, 0x3e, 0xb9, 0xbc, 0x2b, 0x94); +DEFINE_GUID(CODECAPI_AVEncCommonFormatConstraint, 0x57cbb9b8, 0x116f, 0x4951, 0xb4, 0x0c, 0xc2, 0xa0, 0x35, 0xed, 0x8f, 0x17); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatUnSpecified, 0xaf46a35a, 0x6024, 0x4525, 0xa4, 0x8a, 0x09, 0x4b, 0x97, 0xf5, 0xb3, 0xc2); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatDVD_V, 0xcc9598c4, 0xe7fe, 0x451d, 0xb1, 0xca, 0x76, 0x1b, 0xc8, 0x40, 0xb7, 0xf3); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatDVD_DashVR, 0xe55199d6, 0x044c, 0x4dae, 0xa4, 0x88, 0x53, 0x1e, 0xd3, 0x06, 0x23, 0x5b); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatDVD_PlusVR, 0xe74c6f2e, 0xec37, 0x478d, 0x9a, 0xf4, 0xa5, 0xe1, 0x35, 0xb6, 0x27, 0x1c); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatVCD, 0x95035bf7, 0x9d90, 0x40ff, 0xad, 0x5c, 0x5c, 0xf8, 0xcf, 0x71, 0xca, 0x1d); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatSVCD, 0x51d85818, 0x8220, 0x448c, 0x80, 0x66, 0xd6, 0x9b, 0xed, 0x16, 0xc9, 0xad); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatATSC, 0x8d7b897c, 0xa019, 0x4670, 0xaa, 0x76, 0x2e, 0xdc, 0xac, 0x7a, 0xc2, 0x96); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatDVB, 0x71830d8f, 0x6c33, 0x430d, 0x84, 0x4b, 0xc2, 0x70, 0x5b, 0xaa, 0xe6, 0xdb); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatMP3, 0x349733cd, 0xeb08, 0x4dc2, 0x81, 0x97, 0xe4, 0x98, 0x35, 0xef, 0x82, 0x8b); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatHighMAT, 0x1eabe760, 0xfb2b, 0x4928, 0x90, 0xd1, 0x78, 0xdb, 0x88, 0xee, 0xe8, 0x89); +DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatHighMPV, 0xa2d25db8, 0xb8f9, 0x42c2, 0x8b, 0xc7, 0x0b, 0x93, 0xcf, 0x60, 0x47, 0x88); + #endif /* __CODECAPI_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6143
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 7eb5426e5a9..6cc50c2aae0 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -61,6 +61,23 @@ enum eAVEncH264VLevel eAVEncH264VLevel5_2 = 52 }; +enum eAVEncCommonRateControlMode +{ + eAVEncCommonRateControlMode_CBR = 0, + eAVEncCommonRateControlMode_PeakConstrainedVBR = 1, + eAVEncCommonRateControlMode_UnconstrainedVBR = 2, + eAVEncCommonRateControlMode_Quality = 3, + eAVEncCommonRateControlMode_LowDelayVBR = 4, + eAVEncCommonRateControlMode_GlobalVBR = 5, + eAVEncCommonRateControlMode_GlobalLowDelayVBR = 6, +}; + +enum eAVEncCommonStreamEndHandling +{ + eAVEncCommonStreamEndHandling_DiscardPartial = 0, + eAVEncCommonStreamEndHandling_EnsureComplete = 1, +}; + DEFINE_GUID(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); @@ -97,4 +114,23 @@ DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatMP3, 0x349733cd, 0xeb08, 0x4d DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatHighMAT, 0x1eabe760, 0xfb2b, 0x4928, 0x90, 0xd1, 0x78, 0xdb, 0x88, 0xee, 0xe8, 0x89); DEFINE_GUID(CODECAPI_GUID_AVEncCommonFormatHighMPV, 0xa2d25db8, 0xb8f9, 0x42c2, 0x8b, 0xc7, 0x0b, 0x93, 0xcf, 0x60, 0x47, 0x88); +DEFINE_GUID(CODECAPI_AVEncCommonRateControlMode, 0x1c0608e9, 0x370c, 0x4710, 0x8a, 0x58, 0xcb, 0x61, 0x81, 0xc4, 0x24, 0x23); +DEFINE_GUID(CODECAPI_AVEncCommonLowLatency, 0x9d3ecd55, 0x89e8, 0x490a, 0x97, 0x0a, 0x0c, 0x95, 0x48, 0xd5, 0xa5, 0x6e); +DEFINE_GUID(CODECAPI_AVEncCommonMultipassMode, 0x22533d4c, 0x47e1, 0x41b5, 0x93, 0x52, 0xa2, 0xb7, 0x78, 0x0e, 0x7a, 0xc4); +DEFINE_GUID(CODECAPI_AVEncCommonPassStart, 0x6a67739f, 0x4eb5, 0x4385, 0x99, 0x28, 0xf2, 0x76, 0xa9, 0x39, 0xef, 0x95); +DEFINE_GUID(CODECAPI_AVEncCommonPassEnd, 0x0e3d01bc, 0xc85c, 0x467d, 0x8b, 0x60, 0xc4, 0x10, 0x12, 0xee, 0x3b, 0xf6); +DEFINE_GUID(CODECAPI_AVEncCommonRealTime, 0x143a0ff6, 0xa131, 0x43da, 0xb8, 0x1e, 0x98, 0xfb, 0xb8, 0xec, 0x37, 0x8e); +DEFINE_GUID(CODECAPI_AVEncCommonQuality, 0xfcbf57a3, 0x7ea5, 0x4b0c, 0x96, 0x44, 0x69, 0xb4, 0x0c, 0x39, 0xc3, 0x91); +DEFINE_GUID(CODECAPI_AVEncCommonQualityVsSpeed, 0x98332df8, 0x03cd, 0x476b, 0x89, 0xfa, 0x3f, 0x9e, 0x44, 0x2d, 0xec, 0x9f); +DEFINE_GUID(CODECAPI_AVEncCommonTranscodeEncodingProfile, 0x6947787C, 0xF508, 0x4EA9, 0xB1, 0xE9, 0xA1, 0xFE, 0x3A, 0x49, 0xFB, 0xC9); +DEFINE_GUID(CODECAPI_AVEncCommonMeanBitRate, 0xf7222374, 0x2144, 0x4815, 0xb5, 0x50, 0xa3, 0x7f, 0x8e, 0x12, 0xee, 0x52); +DEFINE_GUID(CODECAPI_AVEncCommonMeanBitRateInterval, 0xbfaa2f0c, 0xcb82, 0x4bc0, 0x84, 0x74, 0xf0, 0x6a, 0x8a, 0x0d, 0x02, 0x58); +DEFINE_GUID(CODECAPI_AVEncCommonMaxBitRate, 0x9651eae4, 0x39b9, 0x4ebf, 0x85, 0xef, 0xd7, 0xf4, 0x44, 0xec, 0x74, 0x65); +DEFINE_GUID(CODECAPI_AVEncCommonMinBitRate, 0x101405b2, 0x2083, 0x4034, 0xa8, 0x06, 0xef, 0xbe, 0xdd, 0xd7, 0xc9, 0xff); +DEFINE_GUID(CODECAPI_AVEncCommonBufferSize, 0x0db96574, 0xb6a4, 0x4c8b, 0x81, 0x06, 0x37, 0x73, 0xde, 0x03, 0x10, 0xcd); +DEFINE_GUID(CODECAPI_AVEncCommonBufferInLevel, 0xd9c5c8db, 0xfc74, 0x4064, 0x94, 0xe9, 0xcd, 0x19, 0xf9, 0x47, 0xed, 0x45); +DEFINE_GUID(CODECAPI_AVEncCommonBufferOutLevel, 0xccae7f49, 0xd0bc, 0x4e3d, 0xa5, 0x7e, 0xfb, 0x57, 0x40, 0x14, 0x00, 0x69); +DEFINE_GUID(CODECAPI_AVEncCommonStreamEndHandling, 0x6aad30af, 0x6ba8, 0x4ccc, 0x8f, 0xca, 0x18, 0xd1, 0x9b, 0xea, 0xeb, 0x1c); +DEFINE_GUID(CODECAPI_AVEncStatCommonCompletedPasses, 0x3e5de533, 0x9df7, 0x438c, 0x85, 0x4f, 0x9f, 0x7d, 0xd3, 0x68, 0x3d, 0x34); + #endif /* __CODECAPI_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6143
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 6cc50c2aae0..67978b505b0 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -133,4 +133,8 @@ DEFINE_GUID(CODECAPI_AVEncCommonBufferOutLevel, 0xccae7f49, 0xd0bc, 0x DEFINE_GUID(CODECAPI_AVEncCommonStreamEndHandling, 0x6aad30af, 0x6ba8, 0x4ccc, 0x8f, 0xca, 0x18, 0xd1, 0x9b, 0xea, 0xeb, 0x1c); DEFINE_GUID(CODECAPI_AVEncStatCommonCompletedPasses, 0x3e5de533, 0x9df7, 0x438c, 0x85, 0x4f, 0x9f, 0x7d, 0xd3, 0x68, 0x3d, 0x34); +DEFINE_GUID(CODECAPI_AVEncH264CABACEnable, 0xee6cad62, 0xd305, 0x4248, 0xa5, 0xe, 0xe1, 0xb2, 0x55, 0xf7, 0xca, 0xf8); +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); + #endif /* __CODECAPI_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6143
From: Ziqing Hui <zhui(a)codeweavers.com> --- include/codecapi.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/codecapi.h b/include/codecapi.h index 67978b505b0..3df2bb09ce1 100644 --- a/include/codecapi.h +++ b/include/codecapi.h @@ -78,6 +78,13 @@ enum eAVEncCommonStreamEndHandling eAVEncCommonStreamEndHandling_EnsureComplete = 1, }; +enum eAVEncVideoOutputFrameRateConversion +{ + eAVEncVideoOutputFrameRateConversion_Disable = 0, + eAVEncVideoOutputFrameRateConversion_Enable = 1, + eAVEncVideoOutputFrameRateConversion_Alias = 2 +}; + DEFINE_GUID(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); @@ -137,4 +144,7 @@ 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_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); + #endif /* __CODECAPI_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6143
participants (2)
-
Ziqing Hui -
Ziqing Hui (＠zhui)