Add an option to defs.h to set ffmpeg mux options.

[nageru] / httpd.cpp

diff --git a/httpd.cpp b/httpd.cpp
index 38e685e6e8d0b4a2064590426a4714a24756f71c..689291e2c7628644f4f4b4ee5aa9c94cb870264d 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -1,14 +1,27 @@
-#include <string.h>
-#include <microhttpd.h>
 #include <assert.h>
+#include <microhttpd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/mem.h>
+#include <libavutil/pixfmt.h>
+#include <libavutil/rational.h>
+#include <libavutil/samplefmt.h>
 }
 
 #include "httpd.h"
+
+#include "defs.h"
 #include "timebase.h"
 
+struct MHD_Connection;
+struct MHD_Response;
+
 using namespace std;
 
 HTTPD::HTTPD(const char *output_filename, int width, int height)
@@ -56,7 +69,7 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
                                size_t *upload_data_size, void **con_cls)
 {
        printf("url %s\n", url);
-       AVOutputFormat *oformat = av_guess_format("mpegts", nullptr, nullptr);
+       AVOutputFormat *oformat = av_guess_format(STREAM_MUX_NAME, nullptr, nullptr);
        assert(oformat != nullptr);
        HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height);
        streams.push_back(stream);
@@ -89,21 +102,37 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height)
        avstream_video->codec->time_base = AVRational{1, TIMEBASE};
        avstream_video->codec->ticks_per_frame = 1;  // or 2?
 
-       AVCodec *codec_audio = avcodec_find_encoder(AV_CODEC_ID_MP3);
+       // Colorspace details. Closely correspond to settings in EffectChain_finalize,
+       // as noted in each comment.
+       // Note that the H.264 stream also contains this information and depending on the
+       // mux, this might simply get ignored. See sps_rbsp().
+       avstream_video->codec->color_primaries = AVCOL_PRI_BT709;  // RGB colorspace (inout_format.color_space).
+       avstream_video->codec->color_trc = AVCOL_TRC_UNSPECIFIED;  // Gamma curve (inout_format.gamma_curve).
+       avstream_video->codec->colorspace = AVCOL_SPC_SMPTE170M;  // YUV colorspace (output_ycbcr_format.luma_coefficients).
+       avstream_video->codec->color_range = AVCOL_RANGE_MPEG;  // Full vs. limited range (output_ycbcr_format.full_range).
+       avstream_video->codec->chroma_sample_location = AVCHROMA_LOC_LEFT;  // Chroma sample location. See chroma_offset_0[] in Mixer::subsample_chroma().
+       avstream_video->codec->field_order = AV_FIELD_PROGRESSIVE;
+
+       AVCodec *codec_audio = avcodec_find_encoder(AUDIO_OUTPUT_CODEC);
        avstream_audio = avformat_new_stream(avctx, codec_audio);
        if (avstream_audio == nullptr) {
                fprintf(stderr, "avformat_new_stream() failed\n");
                exit(1);
        }
        avstream_audio->time_base = AVRational{1, TIMEBASE};
-       avstream_audio->codec->bit_rate = 256000;
-       avstream_audio->codec->sample_rate = 48000;
-       avstream_audio->codec->sample_fmt = AV_SAMPLE_FMT_FLTP;
+       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};
 
-       if (avformat_write_header(avctx, NULL) < 0) {
+       AVDictionary *options = NULL;
+       vector<pair<string, string>> opts = MUX_OPTS;
+       for (pair<string, string> opt : opts) {
+               av_dict_set(&options, opt.first.c_str(), opt.second.c_str(), 0);
+       }
+       if (avformat_write_header(avctx, &options) < 0) {
                fprintf(stderr, "avformat_write_header() failed\n");
                exit(1);
        }