From 4ed4a7ed7e55c58cd6a1aec08fbeb6a9c8eb3872 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Sat, 21 Aug 2021 02:10:37 +0900 Subject: nvcodec: Get rid of G_GNUC_INTERNAL Our default symbol visibility is hidden, so G_GNUC_INTERNAL is pointless Part-of: --- sys/nvcodec/cuda-converter.h | 4 ---- sys/nvcodec/gstcudacontext.h | 6 ------ sys/nvcodec/gstcudafilter.h | 1 - sys/nvcodec/gstcudaloader.h | 41 ----------------------------------------- sys/nvcodec/gstcudanvrtc.h | 1 - sys/nvcodec/gstcudautils.h | 11 ----------- sys/nvcodec/gstcuvidloader.h | 17 +---------------- sys/nvcodec/gstnvbaseenc.h | 1 - sys/nvcodec/gstnvenc.h | 28 ---------------------------- sys/nvcodec/gstnvh264dec.h | 2 -- sys/nvcodec/gstnvh264enc.h | 1 - sys/nvcodec/gstnvh265dec.h | 2 -- sys/nvcodec/gstnvh265enc.h | 1 - sys/nvcodec/gstnvrtcloader.h | 8 -------- 14 files changed, 1 insertion(+), 123 deletions(-) diff --git a/sys/nvcodec/cuda-converter.h b/sys/nvcodec/cuda-converter.h index ee67f50b5..5508e5801 100644 --- a/sys/nvcodec/cuda-converter.h +++ b/sys/nvcodec/cuda-converter.h @@ -32,15 +32,12 @@ typedef struct _GstCudaConverter GstCudaConverter; "{ I420, YV12, NV12, NV21, P010_10LE, P016_LE, I420_10LE, Y444, Y444_16LE, " \ "BGRA, RGBA, RGBx, BGRx, ARGB, ABGR, RGB, BGR, BGR10A2_LE, RGB10A2_LE }" -G_GNUC_INTERNAL GstCudaConverter * gst_cuda_converter_new (GstVideoInfo * in_info, GstVideoInfo * out_info, GstCudaContext * cuda_ctx); -G_GNUC_INTERNAL void gst_cuda_converter_free (GstCudaConverter * convert); -G_GNUC_INTERNAL gboolean gst_cuda_converter_frame (GstCudaConverter * convert, const GstCudaMemory * src, GstVideoInfo * in_info, @@ -48,7 +45,6 @@ gboolean gst_cuda_converter_frame (GstCudaConverter * conve GstVideoInfo * out_info, CUstream cuda_stream); -G_GNUC_INTERNAL gboolean gst_cuda_converter_frame_unlocked (GstCudaConverter * convert, const GstCudaMemory * src, GstVideoInfo * in_info, diff --git a/sys/nvcodec/gstcudacontext.h b/sys/nvcodec/gstcudacontext.h index d91bee9ad..08a3a867c 100644 --- a/sys/nvcodec/gstcudacontext.h +++ b/sys/nvcodec/gstcudacontext.h @@ -60,22 +60,16 @@ struct _GstCudaContextClass GType gst_cuda_context_get_type (void); -G_GNUC_INTERNAL GstCudaContext * gst_cuda_context_new (gint device_id); -G_GNUC_INTERNAL gboolean gst_cuda_context_push (GstCudaContext * ctx); -G_GNUC_INTERNAL gboolean gst_cuda_context_pop (CUcontext * cuda_ctx); -G_GNUC_INTERNAL gpointer gst_cuda_context_get_handle (GstCudaContext * ctx); -G_GNUC_INTERNAL gint gst_cuda_context_get_texture_alignment (GstCudaContext * ctx); -G_GNUC_INTERNAL gboolean gst_cuda_context_can_access_peer (GstCudaContext * ctx, GstCudaContext * peer); diff --git a/sys/nvcodec/gstcudafilter.h b/sys/nvcodec/gstcudafilter.h index 174ecd639..4274e922f 100644 --- a/sys/nvcodec/gstcudafilter.h +++ b/sys/nvcodec/gstcudafilter.h @@ -24,7 +24,6 @@ G_BEGIN_DECLS -G_GNUC_INTERNAL void gst_cuda_filter_plugin_init (GstPlugin * plugin); G_END_DECLS diff --git a/sys/nvcodec/gstcudaloader.h b/sys/nvcodec/gstcudaloader.h index 510eb0335..74a78d312 100644 --- a/sys/nvcodec/gstcudaloader.h +++ b/sys/nvcodec/gstcudaloader.h @@ -26,150 +26,113 @@ G_BEGIN_DECLS -G_GNUC_INTERNAL gboolean gst_cuda_load_library (void); /* cuda.h */ -G_GNUC_INTERNAL CUresult CUDAAPI CuInit (unsigned int Flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuGetErrorName (CUresult error, const char **pStr); -G_GNUC_INTERNAL CUresult CUDAAPI CuGetErrorString (CUresult error, const char **pStr); -G_GNUC_INTERNAL CUresult CUDAAPI CuCtxCreate (CUcontext * pctx, unsigned int flags, CUdevice dev); -G_GNUC_INTERNAL CUresult CUDAAPI CuCtxDestroy (CUcontext ctx); -G_GNUC_INTERNAL CUresult CUDAAPI CuCtxPopCurrent (CUcontext * pctx); -G_GNUC_INTERNAL CUresult CUDAAPI CuCtxPushCurrent (CUcontext ctx); -G_GNUC_INTERNAL CUresult CUDAAPI CuCtxEnablePeerAccess (CUcontext peerContext, unsigned int Flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuCtxDisablePeerAccess (CUcontext peerContext); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsMapResources (unsigned int count, CUgraphicsResource * resources, CUstream hStream); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsUnmapResources (unsigned int count, CUgraphicsResource * resources, CUstream hStream); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsSubResourceGetMappedArray (CUarray * pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsResourceGetMappedPointer (CUdeviceptr * pDevPtr, size_t * pSize, CUgraphicsResource resource); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsUnregisterResource (CUgraphicsResource resource); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemAlloc (CUdeviceptr * dptr, unsigned int bytesize); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemAllocPitch (CUdeviceptr * dptr, size_t * pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemAllocHost (void **pp, unsigned int bytesize); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemcpy2D (const CUDA_MEMCPY2D * pCopy); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemcpy2DAsync (const CUDA_MEMCPY2D *pCopy, CUstream hStream); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemFree (CUdeviceptr dptr); -G_GNUC_INTERNAL CUresult CUDAAPI CuMemFreeHost (void *p); -G_GNUC_INTERNAL CUresult CUDAAPI CuStreamCreate (CUstream *phStream, unsigned int Flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuStreamDestroy (CUstream hStream); -G_GNUC_INTERNAL CUresult CUDAAPI CuStreamSynchronize (CUstream hStream); -G_GNUC_INTERNAL CUresult CUDAAPI CuDeviceGet (CUdevice * device, int ordinal); -G_GNUC_INTERNAL CUresult CUDAAPI CuDeviceGetCount (int *count); -G_GNUC_INTERNAL CUresult CUDAAPI CuDeviceGetName (char *name, int len, CUdevice dev); -G_GNUC_INTERNAL CUresult CUDAAPI CuDeviceGetAttribute (int *pi, CUdevice_attribute attrib, CUdevice dev); -G_GNUC_INTERNAL CUresult CUDAAPI CuDeviceCanAccessPeer (int *canAccessPeer, CUdevice dev, CUdevice peerDev); -G_GNUC_INTERNAL CUresult CUDAAPI CuDriverGetVersion (int * driverVersion); -G_GNUC_INTERNAL CUresult CUDAAPI CuModuleLoadData (CUmodule* module, const void *image); -G_GNUC_INTERNAL CUresult CUDAAPI CuModuleUnload (CUmodule module); -G_GNUC_INTERNAL CUresult CUDAAPI CuModuleGetFunction (CUfunction* hfunc, CUmodule hmod, const char* name); -G_GNUC_INTERNAL CUresult CUDAAPI CuTexObjectCreate (CUtexObject *pTexObject, const CUDA_RESOURCE_DESC *pResDesc, const CUDA_TEXTURE_DESC *pTexDesc, const CUDA_RESOURCE_VIEW_DESC *pResViewDesc); -G_GNUC_INTERNAL CUresult CUDAAPI CuTexObjectDestroy (CUtexObject texObject); -G_GNUC_INTERNAL CUresult CUDAAPI CuLaunchKernel (CUfunction f, unsigned int gridDimX, unsigned int gridDimY, @@ -183,22 +146,18 @@ CUresult CUDAAPI CuLaunchKernel (CUfunction f, void **extra); /* cudaGL.h */ -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsGLRegisterImage (CUgraphicsResource * pCudaResource, unsigned int image, unsigned int target, unsigned int Flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsGLRegisterBuffer (CUgraphicsResource * pCudaResource, unsigned int buffer, unsigned int Flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuGraphicsResourceSetMapFlags (CUgraphicsResource resource, unsigned int flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuGLGetDevices (unsigned int * pCudaDeviceCount, CUdevice * pCudaDevices, unsigned int cudaDeviceCount, diff --git a/sys/nvcodec/gstcudanvrtc.h b/sys/nvcodec/gstcudanvrtc.h index 0109c7ef7..473402386 100644 --- a/sys/nvcodec/gstcudanvrtc.h +++ b/sys/nvcodec/gstcudanvrtc.h @@ -26,7 +26,6 @@ G_BEGIN_DECLS -G_GNUC_INTERNAL gchar * gst_cuda_nvrtc_compile (const gchar * source); G_END_DECLS diff --git a/sys/nvcodec/gstcudautils.h b/sys/nvcodec/gstcudautils.h index e65b1e4a1..5906ffa44 100644 --- a/sys/nvcodec/gstcudautils.h +++ b/sys/nvcodec/gstcudautils.h @@ -99,51 +99,40 @@ typedef struct _GstCudaGraphicsResource gboolean mapped; } GstCudaGraphicsResource; -G_GNUC_INTERNAL gboolean gst_cuda_ensure_element_context (GstElement * element, gint device_id, GstCudaContext ** cuda_ctx); -G_GNUC_INTERNAL gboolean gst_cuda_handle_set_context (GstElement * element, GstContext * context, gint device_id, GstCudaContext ** cuda_ctx); -G_GNUC_INTERNAL gboolean gst_cuda_handle_context_query (GstElement * element, GstQuery * query, GstCudaContext * cuda_ctx); -G_GNUC_INTERNAL GstContext * gst_context_new_cuda_context (GstCudaContext * context); -G_GNUC_INTERNAL GQuark gst_cuda_quark_from_id (GstCudaQuarkId id); -G_GNUC_INTERNAL GstCudaGraphicsResource * gst_cuda_graphics_resource_new (GstCudaContext * context, GstObject * graphics_context, GstCudaGraphicsResourceType type); -G_GNUC_INTERNAL gboolean gst_cuda_graphics_resource_register_gl_buffer (GstCudaGraphicsResource * resource, guint buffer, CUgraphicsRegisterFlags flags); -G_GNUC_INTERNAL void gst_cuda_graphics_resource_unregister (GstCudaGraphicsResource * resource); -G_GNUC_INTERNAL CUgraphicsResource gst_cuda_graphics_resource_map (GstCudaGraphicsResource * resource, CUstream stream, CUgraphicsMapResourceFlags flags); -G_GNUC_INTERNAL void gst_cuda_graphics_resource_unmap (GstCudaGraphicsResource * resource, CUstream stream); -G_GNUC_INTERNAL void gst_cuda_graphics_resource_free (GstCudaGraphicsResource * resource); G_END_DECLS diff --git a/sys/nvcodec/gstcuvidloader.h b/sys/nvcodec/gstcuvidloader.h index eeb5d0597..6fe4d54af 100644 --- a/sys/nvcodec/gstcuvidloader.h +++ b/sys/nvcodec/gstcuvidloader.h @@ -27,65 +27,50 @@ G_BEGIN_DECLS /* cuvid.h */ -G_GNUC_INTERNAL gboolean gst_cuvid_load_library (guint api_major_ver, guint api_minor_ver); -G_GNUC_INTERNAL gboolean gst_cuvid_get_api_version (guint * api_major_ver, guint * api_minor_ver); -G_GNUC_INTERNAL gboolean gst_cuvid_can_get_decoder_caps (void); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidCtxLockCreate (CUvideoctxlock * pLock, CUcontext ctx); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidCtxLockDestroy (CUvideoctxlock lck); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidCtxLock (CUvideoctxlock lck, unsigned int reserved_flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidCtxUnlock (CUvideoctxlock lck, unsigned int reserved_flags); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidCreateDecoder (CUvideodecoder * phDecoder, CUVIDDECODECREATEINFO * pdci); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidDestroyDecoder (CUvideodecoder hDecoder); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidDecodePicture (CUvideodecoder hDecoder, CUVIDPICPARAMS * pPicParams); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidCreateVideoParser (CUvideoparser * pObj, CUVIDPARSERPARAMS * pParams); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidParseVideoData (CUvideoparser obj, CUVIDSOURCEDATAPACKET * pPacket); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidDestroyVideoParser (CUvideoparser obj); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidMapVideoFrame (CUvideodecoder hDecoder, int nPicIdx, guintptr * pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS * pVPP); -G_GNUC_INTERNAL CUresult CUDAAPI CuvidUnmapVideoFrame (CUvideodecoder hDecoder, guintptr DevPtr); -G_GNUC_INTERNAL + CUresult CUDAAPI CuvidGetDecoderCaps (CUVIDDECODECAPS * pdc); G_END_DECLS diff --git a/sys/nvcodec/gstnvbaseenc.h b/sys/nvcodec/gstnvbaseenc.h index 743db78cd..7c289fc81 100644 --- a/sys/nvcodec/gstnvbaseenc.h +++ b/sys/nvcodec/gstnvbaseenc.h @@ -182,7 +182,6 @@ typedef struct { NV_ENC_CONFIG * config); } GstNvBaseEncClass; -G_GNUC_INTERNAL GType gst_nv_base_enc_get_type (void); GType gst_nv_base_enc_register (const char * codec, diff --git a/sys/nvcodec/gstnvenc.h b/sys/nvcodec/gstnvenc.h index 6035ec300..839223d40 100644 --- a/sys/nvcodec/gstnvenc.h +++ b/sys/nvcodec/gstnvenc.h @@ -26,94 +26,66 @@ #include "gstcudaloader.h" #include "nvEncodeAPI.h" -G_GNUC_INTERNAL gboolean gst_nvenc_cmp_guid (GUID g1, GUID g2); -G_GNUC_INTERNAL NV_ENC_BUFFER_FORMAT gst_nvenc_get_nv_buffer_format (GstVideoFormat fmt); -G_GNUC_INTERNAL gboolean gst_nvenc_get_supported_input_formats (gpointer encoder, GUID codec_id, GValue ** formats); -G_GNUC_INTERNAL GValue * gst_nvenc_get_interlace_modes (gpointer enc, GUID codec_id); -G_GNUC_INTERNAL GValue * gst_nvenc_get_supported_codec_profiles (gpointer enc, GUID codec_id); -G_GNUC_INTERNAL void gst_nvenc_plugin_init (GstPlugin * plugin, guint device_index, CUcontext cuda_ctx); -G_GNUC_INTERNAL guint32 gst_nvenc_get_api_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_caps_param_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_encode_out_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_create_input_buffer_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_create_bitstream_buffer_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_create_mv_buffer_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_rc_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_config_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_initialize_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_reconfigure_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_preset_config_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_pic_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_meonly_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_lock_bitstream_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_lock_input_buffer_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_map_input_resource_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_registure_resource_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_stat_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_sequence_param_payload_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_event_params_version (void); -G_GNUC_INTERNAL guint32 gst_nvenc_get_open_encode_session_ex_params_version (void); -G_GNUC_INTERNAL gboolean gst_nvenc_load_library (guint * api_major_ver, guint * api_minor_ver); diff --git a/sys/nvcodec/gstnvh264dec.h b/sys/nvcodec/gstnvh264dec.h index c1cf8219c..bc2e956e4 100644 --- a/sys/nvcodec/gstnvh264dec.h +++ b/sys/nvcodec/gstnvh264dec.h @@ -33,10 +33,8 @@ G_BEGIN_DECLS typedef struct _GstNvH264Dec GstNvH264Dec; typedef struct _GstNvH264DecClass GstNvH264DecClass; -G_GNUC_INTERNAL GType gst_nv_h264_dec_get_type (void); -G_GNUC_INTERNAL void gst_nv_h264_dec_register (GstPlugin * plugin, guint device_id, guint rank, diff --git a/sys/nvcodec/gstnvh264enc.h b/sys/nvcodec/gstnvh264enc.h index 31b4d501d..882fd11f6 100644 --- a/sys/nvcodec/gstnvh264enc.h +++ b/sys/nvcodec/gstnvh264enc.h @@ -32,7 +32,6 @@ typedef struct { GstNvBaseEncClass video_encoder_class; } GstNvH264EncClass; -G_GNUC_INTERNAL void gst_nv_h264_enc_register (GstPlugin * plugin, guint device_id, guint rank, diff --git a/sys/nvcodec/gstnvh265dec.h b/sys/nvcodec/gstnvh265dec.h index 3cc0041ec..afca7f9f9 100644 --- a/sys/nvcodec/gstnvh265dec.h +++ b/sys/nvcodec/gstnvh265dec.h @@ -33,10 +33,8 @@ G_BEGIN_DECLS typedef struct _GstNvH265Dec GstNvH265Dec; typedef struct _GstNvH265DecClass GstNvH265DecClass; -G_GNUC_INTERNAL GType gst_nv_h265_dec_get_type (void); -G_GNUC_INTERNAL void gst_nv_h265_dec_register (GstPlugin * plugin, guint device_id, guint rank, diff --git a/sys/nvcodec/gstnvh265enc.h b/sys/nvcodec/gstnvh265enc.h index 80226a60a..d1637973a 100644 --- a/sys/nvcodec/gstnvh265enc.h +++ b/sys/nvcodec/gstnvh265enc.h @@ -37,7 +37,6 @@ typedef struct { GstNvBaseEncClass video_encoder_class; } GstNvH265EncClass; -G_GNUC_INTERNAL void gst_nv_h265_enc_register (GstPlugin * plugin, guint device_id, guint rank, diff --git a/sys/nvcodec/gstnvrtcloader.h b/sys/nvcodec/gstnvrtcloader.h index a85fad490..2f680bbae 100644 --- a/sys/nvcodec/gstnvrtcloader.h +++ b/sys/nvcodec/gstnvrtcloader.h @@ -25,15 +25,12 @@ G_BEGIN_DECLS -G_GNUC_INTERNAL gboolean gst_nvrtc_load_library (void); -G_GNUC_INTERNAL nvrtcResult NvrtcCompileProgram (nvrtcProgram prog, int numOptions, const char** options); -G_GNUC_INTERNAL nvrtcResult NvrtcCreateProgram (nvrtcProgram* prog, const char* src, const char* name, @@ -41,22 +38,17 @@ nvrtcResult NvrtcCreateProgram (nvrtcProgram* prog, const char** headers, const char** includeNames); -G_GNUC_INTERNAL nvrtcResult NvrtcDestroyProgram (nvrtcProgram* prog); -G_GNUC_INTERNAL nvrtcResult NvrtcGetPTX (nvrtcProgram prog, char* ptx); -G_GNUC_INTERNAL nvrtcResult NvrtcGetPTXSize (nvrtcProgram prog, size_t* ptxSizeRet); -G_GNUC_INTERNAL nvrtcResult NvrtcGetProgramLog (nvrtcProgram prog, char* log); -G_GNUC_INTERNAL nvrtcResult NvrtcGetProgramLogSize (nvrtcProgram prog, size_t* logSizeRet); -- cgit v1.2.1