Force --http-coarse-timebase on.

This isn't really something the user should have to think about;
it's hard to see a situation where having this off would give
a real advantage.

diff --git a/flags.cpp b/flags.cpp
index 2d8e37f5d8ff25944ce99e6942bfa2fe3aba0e60..70c85b16c6fa5cbf8c63271e3d64edaa7ed66357 100644 (file)
--- a/flags.cpp
+++ b/flags.cpp
@@ -116,8 +116,6 @@ void usage(Program program)
                fprintf(stderr, "      --no-transcode-audio        copy encoded audio raw from the source stream\n");
                fprintf(stderr, "                                    (requires --http-audio-codec= to be set)\n");
        }
-       fprintf(stderr, "      --http-coarse-timebase      use less timebase for HTTP (recommended for muxers\n");
-       fprintf(stderr, "                                  that handle large pts poorly, like e.g. MP4)\n");
        if (program == PROGRAM_NAGERU) {
                fprintf(stderr, "      --flat-audio                start with most audio processing turned off\n");
                fprintf(stderr, "                                    (can be overridden by e.g. --enable-limiter)\n");
@@ -189,7 +187,6 @@ void parse_flags(Program program, int argc, char * const argv[])
                { "x264-vbv-max-bitrate", required_argument, 0, OPTION_X264_VBV_MAX_BITRATE },
                { "x264-param", required_argument, 0, OPTION_X264_PARAM },
                { "http-mux", required_argument, 0, OPTION_HTTP_MUX },
-               { "http-coarse-timebase", no_argument, 0, OPTION_HTTP_COARSE_TIMEBASE },
                { "http-audio-codec", required_argument, 0, OPTION_HTTP_AUDIO_CODEC },
                { "http-audio-bitrate", required_argument, 0, OPTION_HTTP_AUDIO_BITRATE },
                { "http-port", required_argument, 0, OPTION_HTTP_PORT },
@@ -292,9 +289,6 @@ void parse_flags(Program program, int argc, char * const argv[])
                case OPTION_HTTP_MUX:
                        global_flags.stream_mux_name = optarg;
                        break;
-               case OPTION_HTTP_COARSE_TIMEBASE:
-                       global_flags.stream_coarse_timebase = true;
-                       break;
                case OPTION_HTTP_AUDIO_CODEC:
                        global_flags.stream_audio_codec_name = optarg;
                        break;

diff --git a/kaeru.cpp b/kaeru.cpp
index 168cf1d6033b40801992186cb92fea47fca08729..011818d35832741321e4ce2b0970fa712a0e62af 100644 (file)
--- a/kaeru.cpp
+++ b/kaeru.cpp
@@ -69,8 +69,7 @@ unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x
        string video_extradata = x264_encoder->get_global_headers();
 
        unique_ptr<Mux> mux;
-       int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE;
-       mux.reset(new Mux(avctx, global_flags.width, global_flags.height, Mux::CODEC_H264, video_extradata, audio_encoder->get_codec_parameters().get(), time_base,
+       mux.reset(new Mux(avctx, global_flags.width, global_flags.height, Mux::CODEC_H264, video_extradata, audio_encoder->get_codec_parameters().get(), COARSE_TIMEBASE,
                /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
        stream_mux_metrics.init({{ "destination", "http" }});
        return mux;

diff --git a/video_encoder.cpp b/video_encoder.cpp
index d2f5dbe43d5a625583a3f9b60bf19f768a679a54..2ce5580fec3f456d33a1ed81f5fdf015b3c02ad2 100644 (file)
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -193,8 +193,7 @@ void VideoEncoder::open_output_stream()
                video_extradata = x264_encoder->get_global_headers();
        }
 
-       int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE;
-       stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), time_base,
+       stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), COARSE_TIMEBASE,
                /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
        stream_mux_metrics.init({{ "destination", "http" }});
 }