Fix a warning wording in FFmpegCapture.

[nageru] / nageru / kaeru.cpp

diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index 3d2db1c3ba810e3ffab95ef4e785b06c53dc4bbc..9ff672d0f16ab946f1b7e03dce85f068af67f01d 100644 (file)
--- a/nageru/kaeru.cpp
+++ b/nageru/kaeru.cpp
@@ -18,6 +18,10 @@
 #include <chrono>
 #include <string>
 
+extern "C" {
+#include <libavcodec/bsf.h>
+}
+
 using namespace bmusb;
 using namespace movit;
 using namespace std;
@@ -59,10 +63,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 = const_cast<decltype(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 +149,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);
@@ -214,7 +224,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 +234,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());