X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=h264encode.h;h=eadfca7f50a9e8bd19ddb011793dab46ac9f3c7e;hb=a1f1d6374a7c519c7a8b412578c9b88d64edddd4;hp=2bbbed50f57069dfe4249eb0c31713d3d2d38cdc;hpb=d7bba4abb3d56893399578f0540b9ded0a28380f;p=nageru

diff --git a/h264encode.h b/h264encode.h
index 2bbbed5..eadfca7 100644
--- a/h264encode.h
+++ b/h264encode.h
@@ -81,11 +81,18 @@ private:
 		std::vector<float> audio;
 		int64_t pts, dts;
 	};
+	struct PendingFrame {
+		RefCountedGLsync fence;
+		std::vector<RefCountedFrame> input_frames;
+		int64_t pts;
+	};
 
 	void copy_thread_func();
+	void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num,
+	                  int frame_type, int64_t pts, int64_t dts);
 	void storage_task_thread();
 	void storage_task_enqueue(storage_task task);
-	int save_codeddata(storage_task task);
+	void save_codeddata(storage_task task);
 
 	std::thread copy_thread, storage_thread;
 
@@ -103,11 +110,6 @@ private:
 	//int ;
 	int current_storage_frame;
 
-	struct PendingFrame {
-		RefCountedGLsync fence;
-		std::vector<RefCountedFrame> input_frames;
-		int64_t pts;
-	};
 	std::map<int, PendingFrame> pending_video_frames;  // under frame_queue_mutex
 	std::map<int64_t, std::vector<float>> pending_audio_frames;  // under frame_queue_mutex
 	QSurface *surface;