X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=dcb6f10674e280a70d8e19b394b03f1503538e2b;hb=c015224d38abb896d92c55f1b4517f0600828f68;hp=e8c0dc4ac1fe7e6769dea0b98377b29729c137b1;hpb=0d0e637698dc347c2fec4746affbcf02d51a31f8;p=nageru

diff --git a/main.cpp b/main.cpp
index e8c0dc4..dcb6f10 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,18 +16,26 @@ extern "C" {
 
 #include <QApplication>
 
+#include <movit/init.h>
+#include <movit/util.h>
+
 #include "clip_list.h"
+#include "context.h"
 #include "defs.h"
 #include "mainwindow.h"
 #include "ffmpeg_raii.h"
 #include "httpd.h"
 #include "player.h"
 #include "post_to_main_thread.h"
+#include "ref_counted_gl_sync.h"
+#include "timebase.h"
 #include "ui_mainwindow.h"
 
 using namespace std;
 using namespace std::chrono;
 
+std::mutex RefCountedGLsync::fence_lock;
+
 // TODO: Replace by some sort of GUI control, I guess.
 int64_t current_pts = 0;
 
@@ -40,7 +48,6 @@ string filename_for_frame(unsigned stream_idx, int64_t pts)
 
 mutex frame_mu;
 vector<int64_t> frames[MAX_STREAMS];
-QGLWidget *global_share_widget;
 HTTPD *global_httpd;
 
 int record_thread_func();
@@ -57,8 +64,8 @@ int main(int argc, char **argv)
 	fmt.setDepthBufferSize(0);
 	fmt.setStencilBufferSize(0);
 	fmt.setProfile(QSurfaceFormat::CoreProfile);
-	fmt.setMajorVersion(3);
-	fmt.setMinorVersion(1);
+	fmt.setMajorVersion(4);
+	fmt.setMinorVersion(5);
 
 	// Turn off vsync, since Qt generally gives us at most frame rate
 	// (display frequency) / (number of QGLWidgets active).
@@ -71,9 +78,20 @@ int main(int argc, char **argv)
 	QApplication app(argc, argv);
 	global_share_widget = new QGLWidget();
 	if (!global_share_widget->isValid()) {
-		fprintf(stderr, "Failed to initialize OpenGL. Futatabi needs at least OpenGL 3.1 to function properly.\n");
+		fprintf(stderr, "Failed to initialize OpenGL. Futatabi needs at least OpenGL 4.5 to function properly.\n");
 		exit(1);
 	}
+
+	// Initialize Movit.
+	{
+		QSurface *surface = create_surface();
+		QOpenGLContext *context = create_context(surface);
+		make_current(context, surface);
+		CHECK(movit::init_movit(MOVIT_SHADER_DIR, movit::MOVIT_DEBUG_OFF));
+		delete_context(context);
+		// TODO: Delete the surface, too.
+	}
+
 	MainWindow mainWindow;
 	mainWindow.show();
 
@@ -102,6 +120,12 @@ int record_thread_func()
 		if (av_read_frame(format_ctx.get(), &pkt) != 0) {
 			break;
 		}
+
+		// Convert pts to our own timebase.
+		// TODO: Figure out offsets, too.
+		AVRational stream_timebase = format_ctx->streams[pkt.stream_index]->time_base;
+		pkt.pts = av_rescale_q(pkt.pts, stream_timebase, AVRational{ 1, TIMEBASE });
+
 		//fprintf(stderr, "Got a frame from camera %d, pts = %ld, size = %d\n",
 		//	pkt.stream_index, pkt.pts, pkt.size);
 		string filename = filename_for_frame(pkt.stream_index, pkt.pts);
@@ -115,22 +139,22 @@ int record_thread_func()
 
 		post_to_main_thread([pkt] {
 			if (pkt.stream_index == 0) {
-				global_mainwindow->ui->input1_display->setFrame(pkt.stream_index, pkt.pts);
+				global_mainwindow->ui->input1_display->setFrame(pkt.stream_index, pkt.pts, /*interpolated=*/false);
 			} else if (pkt.stream_index == 1) {
-				global_mainwindow->ui->input2_display->setFrame(pkt.stream_index, pkt.pts);
+				global_mainwindow->ui->input2_display->setFrame(pkt.stream_index, pkt.pts, /*interpolated=*/false);
 			} else if (pkt.stream_index == 2) {
-				global_mainwindow->ui->input3_display->setFrame(pkt.stream_index, pkt.pts);
+				global_mainwindow->ui->input3_display->setFrame(pkt.stream_index, pkt.pts, /*interpolated=*/false);
 			} else if (pkt.stream_index == 3) {
-				global_mainwindow->ui->input4_display->setFrame(pkt.stream_index, pkt.pts);
+				global_mainwindow->ui->input4_display->setFrame(pkt.stream_index, pkt.pts, /*interpolated=*/false);
 			}
 		});
 
 		assert(pkt.stream_index < MAX_STREAMS);
 		frames[pkt.stream_index].push_back(pkt.pts);
 
-		// Hack. Assumes a given timebase.
+		// Hack. Remove when we're dealing with live streams.
 		if (last_pts != -1) {
-			this_thread::sleep_for(microseconds((pkt.pts - last_pts) * 1000000 / 12800));
+			this_thread::sleep_for(microseconds((pkt.pts - last_pts) * 1000000 / TIMEBASE));
 		}
 		last_pts = pkt.pts;
 		current_pts = pkt.pts;