Add an option --http-coarse-timebase for streaming to MP4.

[nageru] / httpd.cpp

diff --git a/httpd.cpp b/httpd.cpp
index d9bc022bc9029844936b9a0a65490571a9ef7482..d860a58311a7ac467d5ccfef7d01b2bd4126434c 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -70,7 +70,7 @@ void HTTPD::open_output_file(const string &filename)
                exit(1);
        }
 
-       file_mux.reset(new Mux(avctx, width, height, Mux::CODEC_NV12));
+       file_mux.reset(new Mux(avctx, width, height, Mux::CODEC_H264, TIMEBASE));
 }
 
 void HTTPD::close_output_file()
@@ -92,9 +92,11 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
                                const char *version, const char *upload_data,
                                size_t *upload_data_size, void **con_cls)
 {
-       AVOutputFormat *oformat = av_guess_format(STREAM_MUX_NAME, nullptr, nullptr);
+       AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr);
        assert(oformat != nullptr);
-       HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height);
+
+       int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE;
+       HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height, time_base);
        {
                unique_lock<mutex> lock(streams_mutex);
                streams.insert(stream);
@@ -138,27 +140,27 @@ void HTTPD::request_completed(struct MHD_Connection *connection, void **con_cls,
        }
 }
 
-HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height, Codec codec)
+HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, int time_base)
        : avctx(avctx)
 {
-       AVCodec *codec_video = avcodec_find_encoder((codec == CODEC_H264) ? AV_CODEC_ID_H264 : AV_CODEC_ID_RAWVIDEO);
+       AVCodec *codec_video = avcodec_find_encoder((video_codec == CODEC_H264) ? AV_CODEC_ID_H264 : AV_CODEC_ID_RAWVIDEO);
        avstream_video = avformat_new_stream(avctx, codec_video);
        if (avstream_video == nullptr) {
                fprintf(stderr, "avformat_new_stream() failed\n");
                exit(1);
        }
-       avstream_video->time_base = AVRational{1, TIMEBASE};
+       avstream_video->time_base = AVRational{1, time_base};
        avstream_video->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-       if (codec == CODEC_H264) {
+       if (video_codec == CODEC_H264) {
                avstream_video->codec->codec_id = AV_CODEC_ID_H264;
        } else {
-               assert(codec == CODEC_NV12);
+               assert(video_codec == CODEC_NV12);
                avstream_video->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
                avstream_video->codec->codec_tag = avcodec_pix_fmt_to_codec_tag(AV_PIX_FMT_NV12);
        }
        avstream_video->codec->width = width;
        avstream_video->codec->height = height;
-       avstream_video->codec->time_base = AVRational{1, TIMEBASE};
+       avstream_video->codec->time_base = AVRational{1, time_base};
        avstream_video->codec->ticks_per_frame = 1;  // or 2?
 
        // Colorspace details. Closely correspond to settings in EffectChain_finalize,
@@ -181,13 +183,13 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height, Codec codec)
                fprintf(stderr, "avformat_new_stream() failed\n");
                exit(1);
        }
-       avstream_audio->time_base = AVRational{1, TIMEBASE};
+       avstream_audio->time_base = AVRational{1, time_base};
        avstream_audio->codec->bit_rate = AUDIO_OUTPUT_BIT_RATE;
        avstream_audio->codec->sample_rate = OUTPUT_FREQUENCY;
        avstream_audio->codec->sample_fmt = AUDIO_OUTPUT_SAMPLE_FMT;
        avstream_audio->codec->channels = 2;
        avstream_audio->codec->channel_layout = AV_CH_LAYOUT_STEREO;
-       avstream_audio->codec->time_base = AVRational{1, TIMEBASE};
+       avstream_audio->codec->time_base = AVRational{1, time_base};
        if (avctx->oformat->flags & AVFMT_GLOBALHEADER) {
                avstream_audio->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
        }
@@ -239,23 +241,23 @@ void HTTPD::Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts)
        av_packet_unref(&pkt_copy);
 }
 
-HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height)
+HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height, int time_base)
 {
        AVFormatContext *avctx = avformat_alloc_context();
        avctx->oformat = oformat;
        uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
        avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, &HTTPD::Stream::write_packet_thunk, nullptr);
 
-       Mux::Codec codec;
+       Mux::Codec video_codec;
        if (global_flags.uncompressed_video_to_http) {
-               codec = Mux::CODEC_NV12;
+               video_codec = Mux::CODEC_NV12;
        } else {
-               codec = Mux::CODEC_H264;
+               video_codec = Mux::CODEC_H264;
        }
 
        avctx->flags = AVFMT_FLAG_CUSTOM_IO;
 
-       mux.reset(new Mux(avctx, width, height, codec));
+       mux.reset(new Mux(avctx, width, height, video_codec, time_base));
 }
 
 ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max)
@@ -277,6 +279,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max)
                if (max >= len) {
                        // Consume the entire (rest of the) string.
                        memcpy(buf, s.data() + used_of_buffered_data, len);
+                       buf += len;
                        ret += len;
                        max -= len;
                        buffered_data.pop_front();
@@ -284,6 +287,7 @@ ssize_t HTTPD::Stream::reader_callback(uint64_t pos, char *buf, size_t max)
                } else {
                        // We don't need the entire string; just use the first part of it.
                        memcpy(buf, s.data() + used_of_buffered_data, max);
+                       buf += max;
                        used_of_buffered_data += max;
                        ret += max;
                        max = 0;