X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=554259acd80a6a5bb8f7c17919100e388dd990ce;hb=f81ae3be1aae619fe4ad022f55d95a4a83ace076;hp=3d2db1c3ba810e3ffab95ef4e785b06c53dc4bbc;hpb=63bf3ae1ae557fc1e0a96f9bc20411d45fa56d27;p=nageru

diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index 3d2db1c..554259a 100644
--- a/nageru/kaeru.cpp
+++ b/nageru/kaeru.cpp
@@ -6,17 +6,46 @@
 #include "flags.h"
 #include "ffmpeg_capture.h"
 #include "mixer.h"
+#include "print_latency.h"
+#include "shared/ffmpeg_raii.h"
+#include "shared/httpd.h"
 #include "shared/mux.h"
 #include "quittable_sleeper.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 #include "x264_encoder.h"
 
 #include <assert.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
+#include <bmusb/bmusb.h>
 #include <chrono>
+#include <endian.h>
+#include <errno.h>
+#include <functional>
+#include <memory>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <string>
+#include <vector>
+
+extern "C" {
+#include <libavcodec/bsf.h>
+#include <libavcodec/codec_par.h>
+#include <libavcodec/packet.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+#include <libavformat/version.h>
+#include <libavutil/avutil.h>
+#include <libavutil/common.h>
+#include <libavutil/error.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/mem.h>
+#include <libavutil/rational.h>
+#include <libavutil/version.h>
+}
 
 using namespace bmusb;
 using namespace movit;
@@ -59,10 +88,10 @@ int write_packet(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType ty
 
 }  // namespace
 
-unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder)
+unique_ptr<Mux> create_mux(HTTPD *httpd, const AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder)
 {
 	AVFormatContext *avctx = avformat_alloc_context();
-	avctx->oformat = oformat;
+	avctx->oformat = oformat;  // const_cast is a hack to work in FFmpeg both before and after 5.0.
 
 	uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
 	avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, httpd, nullptr, nullptr, nullptr);
@@ -145,6 +174,12 @@ void raw_packet_callback(Mux *mux, int stream_index, const AVPacket *pkt, AVRati
 
 void filter_packet_callback(Mux *mux, int stream_index, AVBSFContext *bsfctx, const AVPacket *pkt, AVRational timebase)
 {
+	if (pkt->size <= 2 || pkt->data[0] != 0xff || (pkt->data[1] & 0xf0) != 0xf0) {
+		// Not ADTS data, so just pass it through.
+		mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase, stream_index);
+		return;
+	}
+
 	AVPacket *in_pkt = av_packet_clone(pkt);
 	unique_ptr<AVPacket, decltype(av_packet_unref) *> in_pkt_cleanup(in_pkt, av_packet_unref);
 	int err = av_bsf_send_packet(bsfctx, in_pkt);
@@ -152,10 +187,8 @@ void filter_packet_callback(Mux *mux, int stream_index, AVBSFContext *bsfctx, co
 		fprintf(stderr, "av_bsf_send_packet() failed with %d, ignoring\n", err);
 	}
 	for ( ;; ) {
-		AVPacket out_pkt;
-		unique_ptr<AVPacket, decltype(av_packet_unref) *> pkt_cleanup(&out_pkt, av_packet_unref);
-		av_init_packet(&out_pkt);
-		err = av_bsf_receive_packet(bsfctx, &out_pkt);
+		AVPacketWithDeleter out_pkt = av_packet_alloc_unique();
+		err = av_bsf_receive_packet(bsfctx, out_pkt.get());
 		if (err == AVERROR(EAGAIN)) {
 			break;
 		}
@@ -163,7 +196,7 @@ void filter_packet_callback(Mux *mux, int stream_index, AVBSFContext *bsfctx, co
 			fprintf(stderr, "av_bsf_receive_packet() failed with %d, ignoring\n", err);
 			return;
 		}
-		mux->add_packet(out_pkt, out_pkt.pts, out_pkt.dts == AV_NOPTS_VALUE ? out_pkt.pts : out_pkt.dts, timebase, stream_index);
+		mux->add_packet(*out_pkt, out_pkt->pts, out_pkt->dts == AV_NOPTS_VALUE ? out_pkt->pts : out_pkt->dts, timebase, stream_index);
 	}
 }
 
@@ -214,7 +247,7 @@ int main(int argc, char *argv[])
 
 	HTTPD httpd;
 
-	AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr);
+	const AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr);
 	assert(oformat != nullptr);
 
 	unique_ptr<AudioEncoder> audio_encoder;
@@ -224,7 +257,7 @@ int main(int argc, char *argv[])
 		audio_encoder.reset(new AudioEncoder(global_flags.stream_audio_codec_name, global_flags.stream_audio_codec_bitrate, oformat));
 	}
 
-	unique_ptr<X264Encoder> x264_encoder(new X264Encoder(oformat));
+	unique_ptr<X264Encoder> x264_encoder(new X264Encoder(oformat, /*use_separate_disk_params=*/false));
 	unique_ptr<Mux> http_mux = create_mux(&httpd, oformat, x264_encoder.get(), audio_encoder.get());
 	if (global_flags.transcode_audio) {
 		audio_encoder->add_mux(http_mux.get());