X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.cpp;h=da57ebb9d9f0cc882065fa1658bf55bc4d467194;hb=5435b5bc0a8d324d8eef9b9fc9952b5245b25a3f;hp=745da27486971b13414549033b3270fa00a37174;hpb=e20bf0f86703779f11d575f44173ff73544e1c2d;p=nageru

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index 745da27..da57ebb 100644
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -28,7 +28,7 @@ extern HTTPD *global_httpd;
 
 struct VectorDestinationManager {
 	jpeg_destination_mgr pub;
-	std::vector<uint8_t> dest;
+	string dest;
 
 	VectorDestinationManager()
 	{
@@ -62,7 +62,7 @@ struct VectorDestinationManager {
 	{
 		dest.resize(bytes_used + 4096);
 		dest.resize(dest.capacity());
-		pub.next_output_byte = dest.data() + bytes_used;
+		pub.next_output_byte = (uint8_t *)dest.data() + bytes_used;
 		pub.free_in_buffer = dest.size() - bytes_used;
 	}
 
@@ -78,7 +78,7 @@ struct VectorDestinationManager {
 };
 static_assert(std::is_standard_layout<VectorDestinationManager>::value, "");
 
-vector<uint8_t> encode_jpeg(const uint8_t *y_data, const uint8_t *cb_data, const uint8_t *cr_data, unsigned width, unsigned height)
+string encode_jpeg(const uint8_t *y_data, const uint8_t *cb_data, const uint8_t *cr_data, unsigned width, unsigned height)
 {
 	VectorDestinationManager dest;
 
@@ -241,6 +241,30 @@ VideoStream::~VideoStream()
 	if (last_flow_tex != 0) {
 		compute_flow->release_texture(last_flow_tex);
 	}
+
+	for (const unique_ptr<InterpolatedFrameResources> &resource : interpolate_resources) {
+		glUnmapNamedBuffer(resource->pbo);
+		check_error();
+		glDeleteBuffers(1, &resource->pbo);
+		check_error();
+		glDeleteFramebuffers(2, resource->input_fbos);
+		check_error();
+		glDeleteFramebuffers(1, &resource->fade_fbo);
+		check_error();
+		glDeleteTextures(1, &resource->input_tex);
+		check_error();
+		glDeleteTextures(1, &resource->gray_tex);
+		check_error();
+		glDeleteTextures(1, &resource->fade_y_output_tex);
+		check_error();
+		glDeleteTextures(1, &resource->fade_cbcr_output_tex);
+		check_error();
+		glDeleteTextures(1, &resource->cb_tex);
+		check_error();
+		glDeleteTextures(1, &resource->cr_tex);
+		check_error();
+	}
+	assert(interpolate_resources.size() == num_interpolate_slots);
 }
 
 void VideoStream::start()
@@ -311,18 +335,14 @@ void VideoStream::schedule_original_frame(steady_clock::time_point local_pts,
 {
 	fprintf(stderr, "output_pts=%ld  original      input_pts=%ld\n", output_pts, frame.pts);
 
-	// Preload the file from disk, so that the encoder thread does not get stalled.
-	// TODO: Consider sending it through the queue instead.
-	(void)frame_reader.read_frame(frame);
-
 	QueuedFrame qf;
 	qf.local_pts = local_pts;
 	qf.type = QueuedFrame::ORIGINAL;
 	qf.output_pts = output_pts;
-	qf.frame1 = frame;
 	qf.display_func = move(display_func);
 	qf.queue_spot_holder = move(queue_spot_holder);
 	qf.subtitle = subtitle;
+	qf.encoded_jpeg.reset(new string(frame_reader.read_frame(frame)));
 
 	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
@@ -615,9 +635,23 @@ void VideoStream::encode_thread_func()
 			frame_queue.pop_front();
 		}
 
+		// Hack: We mux the subtitle packet one time unit before the actual frame,
+		// so that Nageru is sure to get it first.
+		if (!qf.subtitle.empty()) {
+			AVPacket pkt;
+			av_init_packet(&pkt);
+			pkt.stream_index = mux->get_subtitle_stream_idx();
+			assert(pkt.stream_index != -1);
+			pkt.data = (uint8_t *)qf.subtitle.data();
+			pkt.size = qf.subtitle.size();
+			pkt.flags = 0;
+			pkt.duration = lrint(TIMEBASE / global_flags.output_framerate);  // Doesn't really matter for Nageru.
+			mux->add_packet(pkt, qf.output_pts - 1, qf.output_pts - 1);
+		}
+
 		if (qf.type == QueuedFrame::ORIGINAL) {
 			// Send the JPEG frame on, unchanged.
-			string jpeg = frame_reader.read_frame(qf.frame1);
+			string jpeg = move(*qf.encoded_jpeg);
 			AVPacket pkt;
 			av_init_packet(&pkt);
 			pkt.stream_index = 0;
@@ -625,15 +659,14 @@ void VideoStream::encode_thread_func()
 			pkt.size = jpeg.size();
 			pkt.flags = AV_PKT_FLAG_KEY;
 			mux->add_packet(pkt, qf.output_pts, qf.output_pts);
-
-			last_frame.assign(&jpeg[0], &jpeg[0] + jpeg.size());
+			last_frame = move(jpeg);
 		} else if (qf.type == QueuedFrame::FADED) {
 			glClientWaitSync(qf.fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED);
 
 			shared_ptr<Frame> frame = frame_from_pbo(qf.resources->pbo_contents, global_flags.width, global_flags.height);
 
 			// Now JPEG encode it, and send it on to the stream.
-			vector<uint8_t> jpeg = encode_jpeg(frame->y.get(), frame->cb.get(), frame->cr.get(), global_flags.width, global_flags.height);
+			string jpeg = encode_jpeg(frame->y.get(), frame->cb.get(), frame->cr.get(), global_flags.width, global_flags.height);
 
 			AVPacket pkt;
 			av_init_packet(&pkt);
@@ -653,7 +686,7 @@ void VideoStream::encode_thread_func()
 			}
 
 			// Now JPEG encode it, and send it on to the stream.
-			vector<uint8_t> jpeg = encode_jpeg(frame->y.get(), frame->cb.get(), frame->cr.get(), global_flags.width, global_flags.height);
+			string jpeg = encode_jpeg(frame->y.get(), frame->cb.get(), frame->cr.get(), global_flags.width, global_flags.height);
 			if (qf.flow_tex != 0) {
 				compute_flow->release_texture(qf.flow_tex);
 			}
@@ -681,19 +714,6 @@ void VideoStream::encode_thread_func()
 		} else {
 			assert(false);
 		}
-
-		if (!qf.subtitle.empty()) {
-			AVPacket pkt;
-			av_init_packet(&pkt);
-			pkt.stream_index = mux->get_subtitle_stream_idx();
-			assert(pkt.stream_index != -1);
-			pkt.data = (uint8_t *)qf.subtitle.data();
-			pkt.size = qf.subtitle.size();
-			pkt.flags = 0;
-			pkt.duration = lrint(TIMEBASE / global_flags.output_framerate);  // Doesn't really matter for Nageru.
-			mux->add_packet(pkt, qf.output_pts, qf.output_pts);
-		}
-
 		if (qf.display_func != nullptr) {
 			qf.display_func();
 		}