X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=52cf70f6aaced56a9ac6588430ccdb9380b6ce2b;hb=fb65325fa7865b45d2799f3a916fcbae517e38cf;hp=b1b08f74465db6e418fd6a8e495800991a072514;hpb=cf1c846ba0680f8341faa764a20c132ffc0169af;p=nageru diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp index b1b08f7..52cf70f 100644 --- a/nageru/kaeru.cpp +++ b/nageru/kaeru.cpp @@ -18,6 +18,10 @@ #include #include +extern "C" { +#include +} + 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 create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x264_encoder, AudioEncoder *audio_encoder) +unique_ptr 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); @@ -158,10 +162,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 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; } @@ -169,7 +171,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); } } @@ -220,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 audio_encoder; @@ -230,7 +232,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 x264_encoder(new X264Encoder(oformat)); + unique_ptr x264_encoder(new X264Encoder(oformat, /*use_separate_disk_params=*/false)); unique_ptr http_mux = create_mux(&httpd, oformat, x264_encoder.get(), audio_encoder.get()); if (global_flags.transcode_audio) { audio_encoder->add_mux(http_mux.get());