Move audio codec choice into defs.h.

[nageru] / httpd.cpp

diff --git a/httpd.cpp b/httpd.cpp
index f266c63656d17cb14cce47c4886573159d61e5da..281bbcf0b05e7e1ebed86403016ff57f7d0eab61 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)
@@ -100,16 +113,16 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height)
        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(AV_CODEC_ID_MP3);
+       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};