From c8c2e85f9c4518c6d81275e16df32969aece33ce Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 18 Apr 2016 16:16:41 +0200 Subject: [PATCH] Make it possible to set x264 preset/tune from the command line. --- defs.h | 5 ++++- flags.cpp | 10 ++++++++++ flags.h | 2 ++ x264encode.cpp | 3 ++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/defs.h b/defs.h index 0e5378c..aa577bb 100644 --- a/defs.h +++ b/defs.h @@ -28,10 +28,13 @@ // For mov, you want this at 10MB or so (for the reason mentioned above), // but for nut, there's no flushing, so such a large mux buffer would cause // the output to be very uneven. -#define MUX_BUFFER_SIZE 65536 +#define MUX_BUFFER_SIZE 10485760 // In number of frames. Comes in addition to any internal queues in x264 // (frame threading, lookahead, etc.). #define X264_QUEUE_LENGTH 50 +#define X264_DEFAULT_PRESET "ultrafast" +#define X264_DEFAULT_TUNE "film" + #endif // !defined(_DEFS_H) diff --git a/flags.cpp b/flags.cpp index 853f6fb..01f563f 100644 --- a/flags.cpp +++ b/flags.cpp @@ -17,6 +17,8 @@ void usage() fprintf(stderr, " ($DISPLAY spec or /dev/dri/render* path)\n"); fprintf(stderr, " --http-uncompressed-video send uncompressed NV12 video to HTTP clients\n"); fprintf(stderr, " --http-x264-video send x264-compressed video to HTTP clients\n"); + fprintf(stderr, " --x264-preset x264 quality preset (default " X264_DEFAULT_PRESET ")\n"); + fprintf(stderr, " --x264-tune x264 tuning (default " X264_DEFAULT_TUNE ", can be blank)\n"); fprintf(stderr, " --http-mux=NAME mux to use for HTTP streams (default " DEFAULT_STREAM_MUX_NAME ")\n"); fprintf(stderr, " --http-audio-codec=NAME audio codec to use for HTTP streams\n"); fprintf(stderr, " (default is to use the same as for the recording)\n"); @@ -40,6 +42,8 @@ void parse_flags(int argc, char * const argv[]) { "va-display", required_argument, 0, 1000 }, { "http-uncompressed-video", no_argument, 0, 1001 }, { "http-x264-video", no_argument, 0, 1008 }, + { "x264-preset", required_argument, 0, 1009 }, + { "x264-tune", required_argument, 0, 1010 }, { "http-mux", required_argument, 0, 1004 }, { "http-coarse-timebase", no_argument, 0, 1005 }, { "http-audio-codec", required_argument, 0, 1006 }, @@ -83,6 +87,12 @@ void parse_flags(int argc, char * const argv[]) case 1008: global_flags.x264_video_to_http = true; break; + case 1009: + global_flags.x264_preset = optarg; + break; + case 1010: + global_flags.x264_tune = optarg; + break; case 1002: global_flags.flat_audio = true; break; diff --git a/flags.h b/flags.h index cfef0fa..b157822 100644 --- a/flags.h +++ b/flags.h @@ -17,6 +17,8 @@ struct Flags { bool stream_coarse_timebase = false; std::string stream_audio_codec_name; // Blank = use the same as for the recording. int stream_audio_codec_bitrate = DEFAULT_AUDIO_OUTPUT_BIT_RATE; // Ignored if stream_audio_codec_name is blank. + std::string x264_preset = X264_DEFAULT_PRESET; + std::string x264_tune = X264_DEFAULT_TUNE; }; extern Flags global_flags; diff --git a/x264encode.cpp b/x264encode.cpp index a72d940..cafb64d 100644 --- a/x264encode.cpp +++ b/x264encode.cpp @@ -2,6 +2,7 @@ #include #include "defs.h" +#include "flags.h" #include "mux.h" #include "timebase.h" #include "x264encode.h" @@ -60,7 +61,7 @@ void X264Encoder::end_encoding() void X264Encoder::init_x264() { x264_param_t param; - x264_param_default_preset(¶m, "ultrafast", "film"); // TODO: flags + x264_param_default_preset(¶m, global_flags.x264_preset.c_str(), global_flags.x264_tune.c_str()); param.i_width = WIDTH; param.i_height = HEIGHT; -- 2.39.2