X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=359bd7285d98c9cf50586e82ee73156551d9f134;hb=7135fa089d451be5114f65579a20e25df3831f5a;hp=3beff80e53dae05614868104f7f9ad3ad7b5ef25;hpb=f39a8c954aec316e8654fc1ed414d9b1dce9cb7e;p=nageru

diff --git a/httpd.cpp b/httpd.cpp
index 3beff80..359bd72 100644
--- 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)
@@ -94,9 +107,9 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height)
 	// 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_BT709;  // Gamma curve (inout_format.gamma_curve).
-	avstream_video->codec->colorspace = AVCOL_SPC_BT709;  // YUV colorspace (output_ycbcr_format.luma_coefficients).
-	avstream_video->codec->color_range = AVCOL_RANGE_JPEG;  // Full vs. limited range (output_ycbcr_format.full_range).
+	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;
 
@@ -108,7 +121,7 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height)
 	}
 	avstream_audio->time_base = AVRational{1, TIMEBASE};
 	avstream_audio->codec->bit_rate = 256000;
-	avstream_audio->codec->sample_rate = 48000;
+	avstream_audio->codec->sample_rate = OUTPUT_FREQUENCY;
 	avstream_audio->codec->sample_fmt = AV_SAMPLE_FMT_FLTP;
 	avstream_audio->codec->channels = 2;
 	avstream_audio->codec->channel_layout = AV_CH_LAYOUT_STEREO;