X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fkaeru.cpp;h=3d2db1c3ba810e3ffab95ef4e785b06c53dc4bbc;hb=63bf3ae1ae557fc1e0a96f9bc20411d45fa56d27;hp=e4fba7f03630e399f0000c5b42c2ef2e837754f6;hpb=ecaec75dd52d076ba53cafa1fed716ebc0d93da6;p=nageru

diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index e4fba7f..3d2db1c 100644
--- a/nageru/kaeru.cpp
+++ b/nageru/kaeru.cpp
@@ -138,9 +138,33 @@ 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=*/1);
+	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)
+{
+	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 ( ;; ) {
+		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);
+		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)
@@ -205,14 +229,34 @@ int main(int argc, char *argv[])
 	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();