#include <chrono>
#include <string>
+extern "C" {
+#include <libavcodec/bsf.h>
+}
+
using namespace bmusb;
using namespace movit;
using namespace std;
} // 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);
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);
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;
}
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);
}
}
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;
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());