void audio_frame_callback(Mux *mux, const AVPacket *pkt, AVRational timebase)
{
- mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase);
+ mux->add_packet(*pkt, pkt->pts, pkt->dts == AV_NOPTS_VALUE ? pkt->pts : pkt->dts, timebase, /*stream_index=*/1);
}
void adjust_bitrate(int signal)
avformat_free_context(avctx);
}
-void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase)
+void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase, int stream_index_override)
{
AVPacket pkt_copy;
av_init_packet(&pkt_copy);
fprintf(stderr, "av_copy_packet() failed\n");
exit(1);
}
- if (pkt.stream_index == 0) {
+ if (stream_index_override != -1) {
+ pkt_copy.stream_index = stream_index_override;
+ }
+ if (pkt_copy.stream_index == 0) {
pkt_copy.pts = av_rescale_q(pts, timebase, avstream_video->time_base);
pkt_copy.dts = av_rescale_q(dts, timebase, avstream_video->time_base);
pkt_copy.duration = av_rescale_q(pkt.duration, timebase, avstream_video->time_base);
- } else if (pkt.stream_index == 1) {
+ } else if (pkt_copy.stream_index == 1) {
pkt_copy.pts = av_rescale_q(pts, timebase, avstream_audio->time_base);
pkt_copy.dts = av_rescale_q(dts, timebase, avstream_audio->time_base);
pkt_copy.duration = av_rescale_q(pkt.duration, timebase, avstream_audio->time_base);
// will be added to.
Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, const std::string &video_extradata, const AVCodecParameters *audio_codecpar, int time_base, std::function<void(int64_t)> write_callback, WriteStrategy write_strategy, const std::vector<MuxMetrics *> &metrics);
~Mux();
- void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase = { 1, TIMEBASE });
+ void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase = { 1, TIMEBASE }, int stream_index_override = -1);
// As long as the mux is plugged, it will not actually write anything to disk,
// just queue the packets. Once it is unplugged, the packets are reordered by pts