Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ffnvcodec for openSUSE:Factory checked in at 2023-04-28 16:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffnvcodec (Old) and /work/SRC/openSUSE:Factory/.ffnvcodec.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffnvcodec" Fri Apr 28 16:22:54 2023 rev:15 rq:1083303 version:11.1.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ffnvcodec/ffnvcodec.changes 2022-01-27 23:16:32.755152674 +0100 +++ /work/SRC/openSUSE:Factory/.ffnvcodec.new.1533/ffnvcodec.changes 2023-04-28 16:23:19.081992613 +0200 @@ -1,0 +2,7 @@ +Wed Apr 26 19:10:54 UTC 2023 - Carsten Ziepke <kiel...@gmail.com> + +- Update to version 11.1.5.2: + * Add D3D11 interop functions + * Fix codestyle + +------------------------------------------------------------------- Old: ---- nv-codec-headers-11.1.5.1.tar.xz New: ---- nv-codec-headers-11.1.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffnvcodec.spec ++++++ --- /var/tmp/diff_new_pack.mi315y/_old 2023-04-28 16:23:22.382011875 +0200 +++ /var/tmp/diff_new_pack.mi315y/_new 2023-04-28 16:23:22.434012179 +0200 @@ -1,7 +1,7 @@ # # spec file for package ffnvcodec # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ffnvcodec -Version: 11.1.5.1 +Version: 11.1.5.2 Release: 0 Summary: FFmpeg version of NVIDIA codec API headers License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.mi315y/_old 2023-04-28 16:23:22.758014070 +0200 +++ /var/tmp/diff_new_pack.mi315y/_new 2023-04-28 16:23:22.782014210 +0200 @@ -4,12 +4,12 @@ <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">n([0-9\.]*)</param> - <param name="revision">n11.1.5.1</param> + <param name="revision">n11.1.5.2</param> </service> - <service mode="disabled" name="recompress"> + <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service mode="disabled" name="set_version" /> + <service name="set_version" mode="disabled"/> </services> ++++++ nv-codec-headers-11.1.5.1.tar.xz -> nv-codec-headers-11.1.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-11.1.5.1/ffnvcodec.pc.in new/nv-codec-headers-11.1.5.2/ffnvcodec.pc.in --- old/nv-codec-headers-11.1.5.1/ffnvcodec.pc.in 2022-01-11 03:00:49.000000000 +0100 +++ new/nv-codec-headers-11.1.5.2/ffnvcodec.pc.in 2022-11-01 13:09:36.000000000 +0100 @@ -3,5 +3,5 @@ Name: ffnvcodec Description: FFmpeg version of Nvidia Codec SDK headers -Version: 11.1.5.1 +Version: 11.1.5.2 Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-11.1.5.1/include/ffnvcodec/dynlink_cuda.h new/nv-codec-headers-11.1.5.2/include/ffnvcodec/dynlink_cuda.h --- old/nv-codec-headers-11.1.5.1/include/ffnvcodec/dynlink_cuda.h 2022-01-11 03:00:49.000000000 +0100 +++ new/nv-codec-headers-11.1.5.2/include/ffnvcodec/dynlink_cuda.h 2022-11-01 13:09:36.000000000 +0100 @@ -216,6 +216,13 @@ CU_EGL_COLOR_FORMAT_Y12V12U12_420_SEMIPLANAR = 0x19, } CUeglColorFormat; +typedef enum CUd3d11DeviceList_enum +{ + CU_D3D11_DEVICE_LIST_ALL = 1, + CU_D3D11_DEVICE_LIST_CURRENT_FRAME = 2, + CU_D3D11_DEVICE_LIST_NEXT_FRAME = 3, +} CUd3d11DeviceList; + #ifndef CU_UUID_HAS_BEEN_DEFINED #define CU_UUID_HAS_BEEN_DEFINED typedef struct CUuuid_st { @@ -442,7 +449,7 @@ typedef CUresult CUDAAPI tcuEventRecord(CUevent hEvent, CUstream hStream); typedef CUresult CUDAAPI tcuLaunchKernel(CUfunction f, unsigned int gridDimX, unsigned int gridDimY, unsigned int gridDimZ, unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ, unsigned int sharedMemBytes, CUstream hStream, void** kernelParams, void** extra); -typedef CUresult CUDAAPI tcuLinkCreate(unsigned int numOptions, CUjit_option* options, void** optionValues, CUlinkState* stateOut); +typedef CUresult CUDAAPI tcuLinkCreate(unsigned int numOptions, CUjit_option* options, void** optionValues, CUlinkState* stateOut); typedef CUresult CUDAAPI tcuLinkAddData(CUlinkState state, CUjitInputType type, void* data, size_t size, const char* name, unsigned int numOptions, CUjit_option* options, void** optionValues); typedef CUresult CUDAAPI tcuLinkComplete(CUlinkState state, void** cubinOut, size_t* sizeOut); typedef CUresult CUDAAPI tcuLinkDestroy(CUlinkState state); @@ -459,6 +466,7 @@ typedef CUresult CUDAAPI tcuGraphicsMapResources(unsigned int count, CUgraphicsResource* resources, CUstream hStream); typedef CUresult CUDAAPI tcuGraphicsUnmapResources(unsigned int count, CUgraphicsResource* resources, CUstream hStream); typedef CUresult CUDAAPI tcuGraphicsSubResourceGetMappedArray(CUarray* pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel); +typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *devPtrOut, size_t *sizeOut, CUgraphicsResource resource); typedef CUresult CUDAAPI tcuImportExternalMemory(CUexternalMemory* extMem_out, const CUDA_EXTERNAL_MEMORY_HANDLE_DESC* memHandleDesc); typedef CUresult CUDAAPI tcuDestroyExternalMemory(CUexternalMemory extMem); @@ -475,9 +483,13 @@ typedef CUresult CUDAAPI tcuArray3DCreate(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR* pAllocateArray); typedef CUresult CUDAAPI tcuArrayDestroy(CUarray hArray); -typedef CUresult CUDAAPI tcuEGLStreamProducerConnect (CUeglStreamConnection* conn, ffnv_EGLStreamKHR stream, ffnv_EGLint width, ffnv_EGLint height); -typedef CUresult CUDAAPI tcuEGLStreamProducerDisconnect (CUeglStreamConnection* conn); -typedef CUresult CUDAAPI tcuEGLStreamConsumerDisconnect (CUeglStreamConnection* conn); -typedef CUresult CUDAAPI tcuEGLStreamProducerPresentFrame (CUeglStreamConnection* conn, CUeglFrame eglframe, CUstream* pStream); -typedef CUresult CUDAAPI tcuEGLStreamProducerReturnFrame (CUeglStreamConnection* conn, CUeglFrame* eglframe, CUstream* pStream); +typedef CUresult CUDAAPI tcuEGLStreamProducerConnect(CUeglStreamConnection* conn, ffnv_EGLStreamKHR stream, ffnv_EGLint width, ffnv_EGLint height); +typedef CUresult CUDAAPI tcuEGLStreamProducerDisconnect(CUeglStreamConnection* conn); +typedef CUresult CUDAAPI tcuEGLStreamConsumerDisconnect(CUeglStreamConnection* conn); +typedef CUresult CUDAAPI tcuEGLStreamProducerPresentFrame(CUeglStreamConnection* conn, CUeglFrame eglframe, CUstream* pStream); +typedef CUresult CUDAAPI tcuEGLStreamProducerReturnFrame(CUeglStreamConnection* conn, CUeglFrame* eglframe, CUstream* pStream); + +typedef CUresult CUDAAPI tcuD3D11GetDevice(CUdevice *device, void *dxgiAdapter); +typedef CUresult CUDAAPI tcuD3D11GetDevices(unsigned int *deviceCountOut, CUdevice *devices, unsigned int deviceCount, void *d3d11device, CUd3d11DeviceList listType); +typedef CUresult CUDAAPI tcuGraphicsD3D11RegisterResource(CUgraphicsResource *cudaResourceOut, void *d3d11Resource, unsigned int flags); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nv-codec-headers-11.1.5.1/include/ffnvcodec/dynlink_loader.h new/nv-codec-headers-11.1.5.2/include/ffnvcodec/dynlink_loader.h --- old/nv-codec-headers-11.1.5.1/include/ffnvcodec/dynlink_loader.h 2022-01-11 03:00:49.000000000 +0100 +++ new/nv-codec-headers-11.1.5.2/include/ffnvcodec/dynlink_loader.h 2022-11-01 13:09:36.000000000 +0100 @@ -202,6 +202,7 @@ tcuGraphicsMapResources *cuGraphicsMapResources; tcuGraphicsUnmapResources *cuGraphicsUnmapResources; tcuGraphicsSubResourceGetMappedArray *cuGraphicsSubResourceGetMappedArray; + tcuGraphicsResourceGetMappedPointer *cuGraphicsResourceGetMappedPointer; tcuImportExternalMemory *cuImportExternalMemory; tcuDestroyExternalMemory *cuDestroyExternalMemory; @@ -225,6 +226,12 @@ tcuEGLStreamProducerPresentFrame *cuEGLStreamProducerPresentFrame; tcuEGLStreamProducerReturnFrame *cuEGLStreamProducerReturnFrame; +#if defined(_WIN32) || defined(__CYGWIN__) + tcuD3D11GetDevice *cuD3D11GetDevice; + tcuD3D11GetDevices *cuD3D11GetDevices; + tcuGraphicsD3D11RegisterResource *cuGraphicsD3D11RegisterResource; +#endif + FFNV_LIB_HANDLE lib; } CudaFunctions; #else @@ -358,6 +365,7 @@ LOAD_SYMBOL(cuGraphicsMapResources, tcuGraphicsMapResources, "cuGraphicsMapResources"); LOAD_SYMBOL(cuGraphicsUnmapResources, tcuGraphicsUnmapResources, "cuGraphicsUnmapResources"); LOAD_SYMBOL(cuGraphicsSubResourceGetMappedArray, tcuGraphicsSubResourceGetMappedArray, "cuGraphicsSubResourceGetMappedArray"); + LOAD_SYMBOL(cuGraphicsResourceGetMappedPointer, tcuGraphicsResourceGetMappedPointer, "cuGraphicsResourceGetMappedPointer_v2"); LOAD_SYMBOL_OPT(cuDeviceGetUuid, tcuDeviceGetUuid, "cuDeviceGetUuid"); LOAD_SYMBOL_OPT(cuImportExternalMemory, tcuImportExternalMemory, "cuImportExternalMemory"); @@ -381,6 +389,12 @@ LOAD_SYMBOL_OPT(cuEGLStreamProducerPresentFrame, tcuEGLStreamProducerPresentFrame, "cuEGLStreamProducerPresentFrame"); LOAD_SYMBOL_OPT(cuEGLStreamProducerReturnFrame, tcuEGLStreamProducerReturnFrame, "cuEGLStreamProducerReturnFrame"); +#if defined(_WIN32) || defined(__CYGWIN__) + LOAD_SYMBOL(cuD3D11GetDevice, tcuD3D11GetDevice, "cuD3D11GetDevice"); + LOAD_SYMBOL(cuD3D11GetDevices, tcuD3D11GetDevices, "cuD3D11GetDevices"); + LOAD_SYMBOL(cuGraphicsD3D11RegisterResource, tcuGraphicsD3D11RegisterResource, "cuGraphicsD3D11RegisterResource"); +#endif + GENERIC_LOAD_FUNC_FINALE(cuda); } #endif