Remove a workaround for FFmpeg before 5.0.

[nageru] / nageru / kaeru.cpp

diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index e4fba7f03630e399f0000c5b42c2ef2e837754f6..52cf70f6aaced56a9ac6588430ccdb9380b6ce2b 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 = 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);
@@ -138,9 +142,37 @@ void video_frame_callback(FFmpegCapture *video, X264Encoder *x264_encoder, Audio
        }
 }
 
-void audio_frame_callback(Mux *mux, const AVPacket *pkt, AVRational timebase)
+void raw_packet_callback(Mux *mux, int stream_index, const AVPacket *pkt, AVRational timebase)
+{
+       mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase, stream_index);
+}
+
+void filter_packet_callback(Mux *mux, int stream_index, AVBSFContext *bsfctx, const AVPacket *pkt, AVRational timebase)
 {
-       mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase, /*stream_index=*/1);
+       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);
+       if (err < 0) {
+               fprintf(stderr, "av_bsf_send_packet() failed with %d, ignoring\n", err);
+       }
+       for ( ;; ) {
+               AVPacketWithDeleter out_pkt = av_packet_alloc_unique();
+               err = av_bsf_receive_packet(bsfctx, out_pkt.get());
+               if (err == AVERROR(EAGAIN)) {
+                       break;
+               }
+               if (err < 0) {
+                       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);
+       }
 }
 
 void adjust_bitrate(int signal)
@@ -190,7 +222,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;
@@ -200,19 +232,39 @@ 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());
        }
-       x264_encoder->add_mux(http_mux.get());
+       if (global_flags.transcode_video) {
+               x264_encoder->add_mux(http_mux.get());
+       }
        global_x264_encoder = x264_encoder.get();
 
        FFmpegCapture video(argv[optind], global_flags.width, global_flags.height);
        video.set_pixel_format(FFmpegCapture::PixelFormat_NV12);
-       video.set_frame_callback(bind(video_frame_callback, &video, x264_encoder.get(), audio_encoder.get(), _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11));
+       if (global_flags.transcode_video) {
+               video.set_frame_callback(bind(video_frame_callback, &video, x264_encoder.get(), audio_encoder.get(), _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11));
+       } else {
+               video.set_video_callback(bind(raw_packet_callback, http_mux.get(), /*stream_index=*/0, _1, _2));
+       }
        if (!global_flags.transcode_audio && global_flags.enable_audio) {
-               video.set_audio_callback(bind(audio_frame_callback, http_mux.get(), _1, _2));
+               AVBSFContext *bsfctx = nullptr;
+               if (strcmp(oformat->name, "mp4") == 0 && strcmp(audio_encoder->get_codec()->name, "aac") == 0) {
+                       // We need to insert the aac_adtstoasc filter, seemingly (or we will get warnings to do so).
+                       const AVBitStreamFilter *filter = av_bsf_get_by_name("aac_adtstoasc");
+                       int err = av_bsf_alloc(filter, &bsfctx);
+                       if (err < 0) {
+                               fprintf(stderr, "av_bsf_alloc() failed with %d\n", err);
+                               exit(1);
+                       }
+               }
+               if (bsfctx == nullptr) {
+                       video.set_audio_callback(bind(raw_packet_callback, http_mux.get(), /*stream_index=*/1, _1, _2));
+               } else {
+                       video.set_audio_callback(bind(filter_packet_callback, http_mux.get(), /*stream_index=*/1, bsfctx, _1, _2));
+               }
        }
        video.configure_card();
        video.start_bm_capture();