From: Seungha Yang Date: Wed, 2 Mar 2022 18:24:14 +0000 (+0900) Subject: nvcodec: Indent update X-Git-Tag: 1.22.0~2243 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b9274307a2ef72915fb96f2b0c19b752018286f;p=platform%2Fupstream%2Fgstreamer.git nvcodec: Indent update ... to prevent gnu indent version dependent diffs. Part-of: --- diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstcudaloader.c b/subprojects/gst-plugins-bad/sys/nvcodec/gstcudaloader.c index 4223ba1..f0eddfa 100644 --- a/subprojects/gst-plugins-bad/sys/nvcodec/gstcudaloader.c +++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstcudaloader.c @@ -40,87 +40,89 @@ GST_DEBUG_CATEGORY_EXTERN (gst_nvcodec_debug); } \ } G_STMT_END; +/* *INDENT-OFF* */ typedef struct _GstNvCodecCudaVTable { gboolean loaded; - CUresult (CUDAAPI * CuInit) (unsigned int Flags); - CUresult (CUDAAPI * CuGetErrorName) (CUresult error, const char **pStr); - CUresult (CUDAAPI * CuGetErrorString) (CUresult error, const char **pStr); + CUresult (CUDAAPI * CuInit) (unsigned int Flags); + CUresult (CUDAAPI * CuGetErrorName) (CUresult error, const char **pStr); + CUresult (CUDAAPI * CuGetErrorString) (CUresult error, const char **pStr); - CUresult (CUDAAPI * CuCtxCreate) (CUcontext * pctx, unsigned int flags, + CUresult (CUDAAPI * CuCtxCreate) (CUcontext * pctx, unsigned int flags, CUdevice dev); - CUresult (CUDAAPI * CuCtxDestroy) (CUcontext ctx); - CUresult (CUDAAPI * CuCtxPopCurrent) (CUcontext * pctx); - CUresult (CUDAAPI * CuCtxPushCurrent) (CUcontext ctx); + CUresult (CUDAAPI * CuCtxDestroy) (CUcontext ctx); + CUresult (CUDAAPI * CuCtxPopCurrent) (CUcontext * pctx); + CUresult (CUDAAPI * CuCtxPushCurrent) (CUcontext ctx); - CUresult (CUDAAPI * CuCtxEnablePeerAccess) (CUcontext peerContext, + CUresult (CUDAAPI * CuCtxEnablePeerAccess) (CUcontext peerContext, unsigned int Flags); - CUresult (CUDAAPI * CuCtxDisablePeerAccess) (CUcontext peerContext); - CUresult (CUDAAPI * CuGraphicsMapResources) (unsigned int count, + CUresult (CUDAAPI * CuCtxDisablePeerAccess) (CUcontext peerContext); + CUresult (CUDAAPI * CuGraphicsMapResources) (unsigned int count, CUgraphicsResource * resources, CUstream hStream); - CUresult (CUDAAPI * CuGraphicsUnmapResources) (unsigned int count, + CUresult (CUDAAPI * CuGraphicsUnmapResources) (unsigned int count, CUgraphicsResource * resources, CUstream hStream); - CUresult (CUDAAPI * CuGraphicsSubResourceGetMappedArray) (CUarray * pArray, + CUresult (CUDAAPI * CuGraphicsSubResourceGetMappedArray) (CUarray * pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel); - CUresult (CUDAAPI * CuGraphicsResourceGetMappedPointer) (CUdeviceptr * + CUresult (CUDAAPI * CuGraphicsResourceGetMappedPointer) (CUdeviceptr * pDevPtr, size_t * pSize, CUgraphicsResource resource); - CUresult (CUDAAPI * + CUresult (CUDAAPI * CuGraphicsUnregisterResource) (CUgraphicsResource resource); - CUresult (CUDAAPI * CuMemAlloc) (CUdeviceptr * dptr, unsigned int bytesize); - CUresult (CUDAAPI * CuMemAllocPitch) (CUdeviceptr * dptr, size_t * pPitch, + CUresult (CUDAAPI * CuMemAlloc) (CUdeviceptr * dptr, unsigned int bytesize); + CUresult (CUDAAPI * CuMemAllocPitch) (CUdeviceptr * dptr, size_t * pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes); - CUresult (CUDAAPI * CuMemAllocHost) (void **pp, unsigned int bytesize); - CUresult (CUDAAPI * CuMemcpy2D) (const CUDA_MEMCPY2D * pCopy); - CUresult (CUDAAPI * CuMemcpy2DAsync) (const CUDA_MEMCPY2D * pCopy, + CUresult (CUDAAPI * CuMemAllocHost) (void **pp, unsigned int bytesize); + CUresult (CUDAAPI * CuMemcpy2D) (const CUDA_MEMCPY2D * pCopy); + CUresult (CUDAAPI * CuMemcpy2DAsync) (const CUDA_MEMCPY2D * pCopy, CUstream hStream); - CUresult (CUDAAPI * CuMemFree) (CUdeviceptr dptr); - CUresult (CUDAAPI * CuMemFreeHost) (void *p); + CUresult (CUDAAPI * CuMemFree) (CUdeviceptr dptr); + CUresult (CUDAAPI * CuMemFreeHost) (void *p); - CUresult (CUDAAPI * CuStreamCreate) (CUstream * phStream, + CUresult (CUDAAPI * CuStreamCreate) (CUstream * phStream, unsigned int Flags); - CUresult (CUDAAPI * CuStreamDestroy) (CUstream hStream); - CUresult (CUDAAPI * CuStreamSynchronize) (CUstream hStream); + CUresult (CUDAAPI * CuStreamDestroy) (CUstream hStream); + CUresult (CUDAAPI * CuStreamSynchronize) (CUstream hStream); - CUresult (CUDAAPI * CuDeviceGet) (CUdevice * device, int ordinal); - CUresult (CUDAAPI * CuDeviceGetCount) (int *count); - CUresult (CUDAAPI * CuDeviceGetName) (char *name, int len, CUdevice dev); - CUresult (CUDAAPI * CuDeviceGetAttribute) (int *pi, + CUresult (CUDAAPI * CuDeviceGet) (CUdevice * device, int ordinal); + CUresult (CUDAAPI * CuDeviceGetCount) (int *count); + CUresult (CUDAAPI * CuDeviceGetName) (char *name, int len, CUdevice dev); + CUresult (CUDAAPI * CuDeviceGetAttribute) (int *pi, CUdevice_attribute attrib, CUdevice dev); - CUresult (CUDAAPI * CuDeviceCanAccessPeer) (int *canAccessPeer, + CUresult (CUDAAPI * CuDeviceCanAccessPeer) (int *canAccessPeer, CUdevice dev, CUdevice peerDev); - CUresult (CUDAAPI * CuDriverGetVersion) (int *driverVersion); + CUresult (CUDAAPI * CuDriverGetVersion) (int *driverVersion); - CUresult (CUDAAPI * CuModuleLoadData) (CUmodule * module, + CUresult (CUDAAPI * CuModuleLoadData) (CUmodule * module, const void *image); - CUresult (CUDAAPI * CuModuleUnload) (CUmodule module); - CUresult (CUDAAPI * CuModuleGetFunction) (CUfunction * hfunc, + CUresult (CUDAAPI * CuModuleUnload) (CUmodule module); + CUresult (CUDAAPI * CuModuleGetFunction) (CUfunction * hfunc, CUmodule hmod, const char *name); - CUresult (CUDAAPI * CuTexObjectCreate) (CUtexObject * pTexObject, + CUresult (CUDAAPI * CuTexObjectCreate) (CUtexObject * pTexObject, const CUDA_RESOURCE_DESC * pResDesc, const CUDA_TEXTURE_DESC * pTexDesc, const CUDA_RESOURCE_VIEW_DESC * pResViewDesc); - CUresult (CUDAAPI * CuTexObjectDestroy) (CUtexObject texObject); - CUresult (CUDAAPI * CuLaunchKernel) (CUfunction f, unsigned int gridDimX, + CUresult (CUDAAPI * CuTexObjectDestroy) (CUtexObject texObject); + CUresult (CUDAAPI * CuLaunchKernel) (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); - CUresult (CUDAAPI * CuGraphicsGLRegisterImage) (CUgraphicsResource * + CUresult (CUDAAPI * CuGraphicsGLRegisterImage) (CUgraphicsResource * pCudaResource, unsigned int image, unsigned int target, unsigned int Flags); - CUresult (CUDAAPI * CuGraphicsGLRegisterBuffer) (CUgraphicsResource * + CUresult (CUDAAPI * CuGraphicsGLRegisterBuffer) (CUgraphicsResource * pCudaResource, unsigned int buffer, unsigned int Flags); - CUresult (CUDAAPI * + CUresult (CUDAAPI * CuGraphicsResourceSetMapFlags) (CUgraphicsResource resource, unsigned int flags); - CUresult (CUDAAPI * CuGLGetDevices) (unsigned int *pCudaDeviceCount, + CUresult (CUDAAPI * CuGLGetDevices) (unsigned int *pCudaDeviceCount, CUdevice * pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList); } GstNvCodecCudaVTable; +/* *INDENT-ON* */ static GstNvCodecCudaVTable gst_cuda_vtable = { 0, }; @@ -305,6 +307,7 @@ CuGraphicsSubResourceGetMappedArray (CUarray * pArray, arrayIndex, mipLevel); } +/* *INDENT-OFF* */ CUresult CUDAAPI CuGraphicsResourceGetMappedPointer (CUdeviceptr * pDevPtr, size_t * pSize, CUgraphicsResource resource) @@ -314,6 +317,7 @@ CuGraphicsResourceGetMappedPointer (CUdeviceptr * pDevPtr, size_t * pSize, return gst_cuda_vtable.CuGraphicsResourceGetMappedPointer (pDevPtr, pSize, resource); } +/* *INDENT-ON* */ CUresult CUDAAPI CuGraphicsUnregisterResource (CUgraphicsResource resource) @@ -331,6 +335,7 @@ CuMemAlloc (CUdeviceptr * dptr, unsigned int bytesize) return gst_cuda_vtable.CuMemAlloc (dptr, bytesize); } +/* *INDENT-OFF* */ CUresult CUDAAPI CuMemAllocPitch (CUdeviceptr * dptr, size_t * pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes) @@ -340,6 +345,7 @@ CuMemAllocPitch (CUdeviceptr * dptr, size_t * pPitch, size_t WidthInBytes, return gst_cuda_vtable.CuMemAllocPitch (dptr, pPitch, WidthInBytes, Height, ElementSizeBytes); } +/* *INDENT-ON* */ CUresult CUDAAPI CuMemAllocHost (void **pp, unsigned int bytesize) diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstcudamemory.c b/subprojects/gst-plugins-bad/sys/nvcodec/gstcudamemory.c index b6b5acb..37d2eb0 100644 --- a/subprojects/gst-plugins-bad/sys/nvcodec/gstcudamemory.c +++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstcudamemory.c @@ -251,7 +251,10 @@ gst_cuda_memory_download_transfer (GstCudaMemory * mem) } gst_cuda_result (CuStreamSynchronize (NULL)); - return ! !mem->map_data; + if (!mem->map_data) + return FALSE; + + return TRUE; } static gpointer diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstcudascale.c b/subprojects/gst-plugins-bad/sys/nvcodec/gstcudascale.c index 6291488..ea89265 100644 --- a/subprojects/gst-plugins-bad/sys/nvcodec/gstcudascale.c +++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstcudascale.c @@ -156,8 +156,8 @@ gst_cuda_scale_fixate_caps (GstBaseTransform * base, GstPadDirection direction, { GstStructure *ins, *outs; const GValue *from_par, *to_par; - GValue fpar = { 0, }, tpar = { - 0,}; + GValue fpar = G_VALUE_INIT; + GValue tpar = G_VALUE_INIT; othercaps = gst_caps_truncate (othercaps); othercaps = gst_caps_make_writable (othercaps); diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstcuvidloader.c b/subprojects/gst-plugins-bad/sys/nvcodec/gstcuvidloader.c index 3c7505c..e957e06 100644 --- a/subprojects/gst-plugins-bad/sys/nvcodec/gstcuvidloader.c +++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstcuvidloader.c @@ -136,7 +136,10 @@ gst_cuvid_get_api_version (guint * api_major_ver, guint * api_minor_ver) gboolean gst_cuvid_can_get_decoder_caps (void) { - return ! !gst_cuvid_vtable.CuvidGetDecoderCaps; + if (gst_cuvid_vtable.CuvidGetDecoderCaps) + return TRUE; + + return FALSE; } CUresult CUDAAPI diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvrtcloader.c b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvrtcloader.c index 0cda03e..4861cde 100644 --- a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvrtcloader.c +++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvrtcloader.c @@ -42,22 +42,24 @@ GST_DEBUG_CATEGORY_EXTERN (gst_nvcodec_debug); } \ } G_STMT_END; +/* *INDENT-OFF* */ typedef struct _GstNvCodecNvrtcVtahle { gboolean loaded; - nvrtcResult (*NvrtcCompileProgram) (nvrtcProgram prog, int numOptions, + nvrtcResult (*NvrtcCompileProgram) (nvrtcProgram prog, int numOptions, const char **options); - nvrtcResult (*NvrtcCreateProgram) (nvrtcProgram * prog, const char *src, + nvrtcResult (*NvrtcCreateProgram) (nvrtcProgram * prog, const char *src, const char *name, int numHeaders, const char **headers, const char **includeNames); - nvrtcResult (*NvrtcDestroyProgram) (nvrtcProgram * prog); - nvrtcResult (*NvrtcGetPTX) (nvrtcProgram prog, char *ptx); - nvrtcResult (*NvrtcGetPTXSize) (nvrtcProgram prog, size_t * ptxSizeRet); - nvrtcResult (*NvrtcGetProgramLog) (nvrtcProgram prog, char *log); - nvrtcResult (*NvrtcGetProgramLogSize) (nvrtcProgram prog, + nvrtcResult (*NvrtcDestroyProgram) (nvrtcProgram * prog); + nvrtcResult (*NvrtcGetPTX) (nvrtcProgram prog, char *ptx); + nvrtcResult (*NvrtcGetPTXSize) (nvrtcProgram prog, size_t * ptxSizeRet); + nvrtcResult (*NvrtcGetProgramLog) (nvrtcProgram prog, char *log); + nvrtcResult (*NvrtcGetProgramLogSize) (nvrtcProgram prog, size_t * logSizeRet); } GstNvCodecNvrtcVtahle; +/* *INDENT-ON* */ static GstNvCodecNvrtcVtahle gst_nvrtc_vtable = { 0, }; @@ -174,6 +176,7 @@ NvrtcGetPTX (nvrtcProgram prog, char *ptx) return gst_nvrtc_vtable.NvrtcGetPTX (prog, ptx); } +/* *INDENT-OFF* */ nvrtcResult NvrtcGetPTXSize (nvrtcProgram prog, size_t * ptxSizeRet) { @@ -181,6 +184,7 @@ NvrtcGetPTXSize (nvrtcProgram prog, size_t * ptxSizeRet) return gst_nvrtc_vtable.NvrtcGetPTXSize (prog, ptxSizeRet); } +/* *INDENT-ON* */ nvrtcResult NvrtcGetProgramLog (nvrtcProgram prog, char *log) @@ -190,6 +194,7 @@ NvrtcGetProgramLog (nvrtcProgram prog, char *log) return gst_nvrtc_vtable.NvrtcGetProgramLog (prog, log); } +/* *INDENT-OFF* */ nvrtcResult NvrtcGetProgramLogSize (nvrtcProgram prog, size_t * logSizeRet) { @@ -197,3 +202,4 @@ NvrtcGetProgramLogSize (nvrtcProgram prog, size_t * logSizeRet) return gst_nvrtc_vtable.NvrtcGetProgramLogSize (prog, logSizeRet); } +/* *INDENT-ON* */