nv-filters: Remove from video fx header redundant define

These defines were defined twice ... due to a botched rebase.
Formatting fixes too.

Signed-off-by: pkv <[email protected]>

plugins/nv-filters/nvidia-audiofx-filter.c

@@ -132,6 +132,7 @@ static void nvidia_audio_destroy(void *data)
 
 	if (ng->nvidia_sdk_dir_found)
 		pthread_mutex_lock(&ng->nvafx_mutex);
+
 	NvAFX_UninitializeLogger();
 	for (size_t i = 0; i < ng->channels; i++) {
 		if (ng->handle[0]) {
@@ -280,7 +281,7 @@ bool load_nvidia_afx(void)
 	bool new_sdk = nvafx_new_sdk;
 	LOAD_SYM(NvAFX_UninitializeLogger);
 	if (!nvafx_new_sdk || !new_sdk) {
-		blog(LOG_INFO, "[NVIDIA AUDIO FX]: sdk loaded but old redistributable detected; please upgrade.");
+		blog(LOG_INFO, "[NVIDIA AUDIO FX]: SDK loaded but old redistributable detected. Please upgrade.");
 		nvafx_new_sdk = false;
 	}
 #undef LOAD_SYM

plugins/nv-filters/nvidia-videofx-filter.c

@@ -261,6 +261,7 @@ static bool nvvfx_filter_create_internal(struct nvvfx_data *filter)
 	vfxErr = NvVFX_CudaStreamCreate(&filter->stream);
 	if (NVCV_SUCCESS != vfxErr)
 		log_nverror_destroy(filter, vfxErr);
+
 	if (id == S_FX_AIGS || id == S_FX_BG_BLUR) {
 		char buffer[MAX_PATH];
 		char modelDir[MAX_PATH];
@@ -541,6 +542,7 @@ static bool init_blur_images(struct nvvfx_data *filter)
 		NvVFX_SetImage(filter->handle_blur, NVVFX_INPUT_IMAGE_1, filter->A_dst_img);
 	else
 		NvVFX_SetImage(filter->handle_blur, NVVFX_INPUT_IMAGE_1, NULL);
+
 	NvVFX_SetImage(filter->handle_blur, NVVFX_OUTPUT_IMAGE, filter->blur_BGR_dst_img);
 
 	if (NvVFX_Load(filter->handle_blur) != NVCV_SUCCESS) {
@@ -1198,7 +1200,7 @@ bool load_nvidia_vfx(void)
 #define LOAD_SYM(sym) LOAD_SYM_FROM_LIB2(sym, nv_videofx, "NVVideoEffects.dll")
 	LOAD_SYM(NvVFX_ConfigureLogger);
 	if (!nvvfx_new_sdk) {
-		blog(LOG_INFO, "[NVIDIA VIDEO FX]: sdk loaded but old redistributable detected; please upgrade.");
+		blog(LOG_INFO, "[NVIDIA VIDEO FX]: SDK loaded but old redistributable detected. Please upgrade.");
 	}
 #undef LOAD_SYM
 

plugins/nv-filters/nvvfx-load.h

@@ -226,27 +226,6 @@ typedef enum NvCVImage_ComponentType {
 #define NVCV_CPU_PINNED 2 //!< The buffer is stored in pinned CPU memory.
 #define NVCV_CUDA_ARRAY 3 //!< A CUDA array is used for storage.
 
-/** Parameter selectors */
-#define NVVFX_INPUT_IMAGE_0 "SrcImage0"
-#define NVVFX_INPUT_IMAGE NVVFX_INPUT_IMAGE_0
-#define NVVFX_INPUT_IMAGE_1 "SrcImage1"
-#define NVVFX_OUTPUT_IMAGE_0 "DstImage0"
-#define NVVFX_OUTPUT_IMAGE NVVFX_OUTPUT_IMAGE_0
-#define NVVFX_MODEL_DIRECTORY "ModelDir"
-#define NVVFX_CUDA_STREAM "CudaStream"         //!< The CUDA stream to use
-#define NVVFX_CUDA_GRAPH "CudaGraph"           //!< Enable CUDA graph to use
-#define NVVFX_INFO "Info"                      //!< Get info about the effects
-#define NVVFX_SCALE "Scale"                    //!< Scale factor
-#define NVVFX_STRENGTH "Strength"              //!< Strength for different filters
-#define NVVFX_STRENGTH_LEVELS "StrengthLevels" //!< Number of strength levels
-#define NVVFX_MODE "Mode"                      //!< Mode for different filters
-#define NVVFX_TEMPORAL "Temporal"              //!< Temporal mode: 0=image, 1=video
-#define NVVFX_GPU "GPU"                        //!< Preferred GPU (optional)
-#define NVVFX_BATCH_SIZE "BatchSize"           //!< Batch Size (default 1)
-#define NVVFX_MODEL_BATCH "ModelBatch"
-#define NVVFX_STATE "State"          //!< State variable
-#define NVVFX_STATE_SIZE "StateSize" //!< Number of bytes needed to store state
-
 /** Logging support **/
 enum {
 	NVCV_LOG_FATAL,   //!< Message to be printed right before aborting due to an unrecoverable error.
@@ -342,7 +321,7 @@ typedef NvCV_Status NvVFX_API (*NvVFX_Load_t)(NvVFX_Handle effect);
 typedef NvCV_Status NvVFX_API (*NvVFX_CudaStreamCreate_t)(CUstream *stream);
 typedef NvCV_Status NvVFX_API (*NvVFX_CudaStreamDestroy_t)(CUstream stream);
 
-/* requires sdk version >= 0.7.0 */
+/* requires SDK version >= 0.7.0 */
 typedef NvCV_Status NvVFX_API (*NvVFX_AllocateState_t)(NvVFX_Handle effect, NvVFX_StateObjectHandle *handle);
 typedef NvCV_Status NvVFX_API (*NvVFX_DeallocateState_t)(NvVFX_Handle effect, NvVFX_StateObjectHandle handle);
 typedef NvCV_Status NvVFX_API (*NvVFX_ResetState_t)(NvVFX_Handle effect, NvVFX_StateObjectHandle handle);