Revert "expose NVMPI num_capture_buffers (Jetson specific)"

This reverts commit e934d2f.
bmegli · Mar 29, 2023 · b738ccf · b738ccf
1 parent e934d2f
commit b738ccf
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -65,8 +65,6 @@ cd hardware-video-encoder
 mkdir build
 cd build
 cmake ..
-# alternatively specify FFMPEG_MODULE_PATH pointing to LGPL FFMPEG
-# cmake .. -DFFMPEG_MODULE_PATH=[directory_with_FindFFMPEG.cmake]
 make
 ```
 
@@ -126,8 +124,7 @@ There are just 4 functions and 3 user-visible data types:
 	                                     DEVICE, ENCODER, PIXEL_FORMAT, PROFILE, BFRAMES,
 	                                     BITRATE, QP, GOP_SIZE, COMPRESSION_LEVEL,
 	                                     VAAPI_LOW_POWER
-	                                     NVENC_PRESET, NVENC_DELAY, NVENC_ZEROLATENCY,
-	                                     NVMPI_NUM_CAPTURE_BUFFERS};
+	                                     NVENC_PRESET, NVENC_DELAY, NVENC_ZEROLATENCY};
 
 	struct hve *hardware_encoder=hve_init(&hardware_config);
 	struct hve_frame frame = { 0 };

diff --git a/examples/hve_encode_raw_h264.c b/examples/hve_encode_raw_h264.c
@@ -33,7 +33,6 @@ const int VAAPI_LOW_POWER=0; //alternative VAAPI limited low-power encoding path
 const char *NVENC_PRESET=NULL; //NVENC and codec specific, NULL / "" or like "default", "slow", "medium", "fast", "hp", "hq", "bd", "ll", "llhq", "llhp", "lossless", "losslesshp"
 const int NVENC_DELAY=0; //NVENC specific delay of frame output, 0 for default, -1 for 0 or positive value, set -1 to minimize latency
 const int NVENC_ZEROLATENCY=0; //NVENC specific no reordering delay if non-zero, enable to minimize latency
-const int NVMPI_NUM_CAPTURE_BUFFERS=0; //NVMPI specific number of buffers in the capture context if non-zero, smaller values may improve latency
 
 int encoding_loop(struct hve *hardware_encoder, FILE *output_file);
 int process_user_input(int argc, char* argv[]);
@@ -51,8 +50,7 @@ int main(int argc, char* argv[])
 	                                     DEVICE, ENCODER, PIXEL_FORMAT, PROFILE, BFRAMES,
 	                                     BITRATE, QP, GOP_SIZE, COMPRESSION_LEVEL,
 	                                     VAAPI_LOW_POWER,
-	                                     NVENC_PRESET, NVENC_DELAY, NVENC_ZEROLATENCY,
-	                                     NVMPI_NUM_CAPTURE_BUFFERS};
+	                                     NVENC_PRESET, NVENC_DELAY, NVENC_ZEROLATENCY};
 
 	struct hve *hardware_encoder;
 

diff --git a/examples/hve_encode_raw_hevc10.c b/examples/hve_encode_raw_hevc10.c
@@ -33,7 +33,6 @@ const int VAAPI_LOW_POWER=0; //alternative VAAPI limited low-power encoding path
 const char *NVENC_PRESET=NULL; //NVENC and codec specific, NULL / "" or like "default", "slow", "medium", "fast", "hp", "hq", "bd", "ll", "llhq", "llhp", "lossless", "losslesshp"
 const int NVENC_DELAY=0; //NVENC specific delay of frame output, 0 for default, -1 for 0 or positive value, set -1 to minimize latency
 const int NVENC_ZEROLATENCY=0; //NVENC specific no reordering delay if non-zero, enable to minimize latency
-const int NVMPI_NUM_CAPTURE_BUFFERS=0; //NVMPI specific number of buffers in the capture context if non-zero, smaller values may improve latency
 
 int encoding_loop(struct hve *hardware_encoder, FILE *output_file);
 int process_user_input(int argc, char* argv[]);
@@ -51,9 +50,7 @@ int main(int argc, char* argv[])
 	                                     DEVICE, ENCODER, PIXEL_FORMAT, PROFILE, BFRAMES,
 	                                     BITRATE, QP, GOP_SIZE, COMPRESSION_LEVEL,
 	                                     VAAPI_LOW_POWER,
-	                                     NVENC_PRESET, NVENC_DELAY, NVENC_ZEROLATENCY,
-	                                     NVMPI_NUM_CAPTURE_BUFFERS};
-
+	                                     NVENC_PRESET, NVENC_DELAY, NVENC_ZEROLATENCY};
 	struct hve *hardware_encoder;
 
 	//prepare file for raw HEVC output

diff --git a/hve.c b/hve.c
@@ -137,9 +137,6 @@ struct hve *hve_init(const struct hve_config *config)
 	if(config->nvenc_zerolatency && (av_dict_set_int(&opts, "zerolatency", config->nvenc_zerolatency != 0 , 0) < 0))
 		return hve_close_and_return_null(h, "failed to initialize option dictionary (NVENC zerolatency)");
 
-	if(config->nvmpi_num_capture_buffers && (av_dict_set_int(&opts, "num_capture_buffers", config->nvmpi_num_capture_buffers, 0) < 0))
-		return hve_close_and_return_null(h, "failed to initialize option dictionary (NVMPI num_capture_buffers)");
-
 	if((err = avcodec_open2(h->avctx, codec, &opts)) < 0)
 	{
 		av_dict_free(&opts);

diff --git a/hve.h b/hve.h
@@ -202,7 +202,6 @@ struct hve_config
 	const char *nvenc_preset; //!< NVENC and codec specific, NULL / "" or like "default", "slow", "medium", "fast", "hp", "hq", "bd", "ll", "llhq", "llhp", "lossless", "losslesshp"
 	int nvenc_delay; //NVENC specific delay of frame output, 0 for default, -1 for 0 or positive value, set -1 to minimize latency
 	int nvenc_zerolatency; //NVENC specific no reordering delay if non-zero, enable to minimize latency
-	int nvmpi_num_capture_buffers; //NVMPI specific number of buffers in the capture context if non-zero, smaller values may improve latency
 };
 
 /**