AVStream *avstream_video = avformat_new_stream(avctx, nullptr);
if (avstream_video == nullptr) {
fprintf(stderr, "avformat_new_stream() failed\n");
- exit(1);
+ abort();
}
avstream_video->time_base = AVRational{1, time_base};
avstream_video->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
if (video_codec == CODEC_H264) {
avstream_video->codecpar->codec_id = AV_CODEC_ID_H264;
- } else if (video_codec == CODEC_NV12) {
- avstream_video->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
- avstream_video->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag(AV_PIX_FMT_NV12);
+ } else if (video_codec == CODEC_AV1) {
+ avstream_video->codecpar->codec_id = AV_CODEC_ID_AV1;
} else {
assert(video_codec == CODEC_MJPEG);
avstream_video->codecpar->codec_id = AV_CODEC_ID_MJPEG;
avstream_video->codecpar->field_order = AV_FIELD_PROGRESSIVE;
if (!video_extradata.empty()) {
- avstream_video->codecpar->extradata = (uint8_t *)av_malloc(video_extradata.size());
+ avstream_video->codecpar->extradata = (uint8_t *)av_malloc(video_extradata.size() + AV_INPUT_BUFFER_PADDING_SIZE);
avstream_video->codecpar->extradata_size = video_extradata.size();
memcpy(avstream_video->codecpar->extradata, video_extradata.data(), video_extradata.size());
}
AVStream *avstream_audio = avformat_new_stream(avctx, nullptr);
if (avstream_audio == nullptr) {
fprintf(stderr, "avformat_new_stream() failed\n");
- exit(1);
+ abort();
}
avstream_audio->time_base = AVRational{1, time_base};
if (avcodec_parameters_copy(avstream_audio->codecpar, audio_codecpar) < 0) {
fprintf(stderr, "avcodec_parameters_copy() failed\n");
- exit(1);
+ abort();
}
streams.push_back(avstream_audio);
}
AVStream *avstream_subtitles = avformat_new_stream(avctx, nullptr);
if (avstream_subtitles == nullptr) {
fprintf(stderr, "avformat_new_stream() failed\n");
- exit(1);
+ abort();
}
avstream_subtitles->time_base = AVRational{1, time_base};
avstream_subtitles->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
for (pair<string, string> opt : opts) {
av_dict_set(&options, opt.first.c_str(), opt.second.c_str(), 0);
}
- if (avformat_write_header(avctx, &options) < 0) {
- fprintf(stderr, "avformat_write_header() failed\n");
- exit(1);
+ int err = avformat_write_header(avctx, &options);
+ if (err < 0) {
+ char errbuf[AV_ERROR_MAX_STRING_SIZE];
+ av_strerror(err, errbuf, sizeof(errbuf));
+ fprintf(stderr, "avformat_write_header() failed: %s\n", errbuf);
+ exit(EXIT_FAILURE);
}
for (MuxMetrics *metric : metrics) {
metric->metric_written_bytes += avctx->pb->pos;
void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational timebase, int stream_index_override)
{
+ assert(pts >= dts);
+
AVPacket pkt_copy;
av_init_packet(&pkt_copy);
if (av_packet_ref(&pkt_copy, &pkt) < 0) {
fprintf(stderr, "av_copy_packet() failed\n");
- exit(1);
+ abort();
}
if (stream_index_override != -1) {
pkt_copy.stream_index = stream_index_override;
}
}
int64_t old_pos = avctx->pb->pos;
- if (av_interleaved_write_frame(avctx, const_cast<AVPacket *>(&pkt)) < 0) {
- fprintf(stderr, "av_interleaved_write_frame() failed\n");
- abort();
+ int err = av_interleaved_write_frame(avctx, const_cast<AVPacket *>(&pkt));
+ if (err < 0) {
+ char errbuf[AV_ERROR_MAX_STRING_SIZE];
+ av_strerror(err, errbuf, sizeof(errbuf));
+ fprintf(stderr, "av_interleaved_write_frame() failed: %s\n", errbuf);
+ exit(EXIT_FAILURE);
}
avio_flush(avctx->pb);
for (MuxMetrics *metric : metrics) {