Made sup exporter multi-threaded with OpenMP. <3

Originally committed to SVN as r1803.

aegisub/subtitle_format_dvd.cpp

@@ -44,6 +44,9 @@
 #include "subtitles_provider.h"
 #include "ass_dialogue.h"
 #include "ass_file.h"
+#ifdef _OPENMP
+#include <omp.h>
+#endif
 
 
 ///////////////
@@ -70,35 +73,51 @@ bool DVDSubtitleFormat::CanWriteFile(wxString filename) {
 
 
 ///////////////////////
-// Actually write them
+// Get subpicture list
-void DVDSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
+void DVDSubtitleFormat::GetSubPictureList(std::vector<SubPicture> &pics) {
 	// Create video frame
 	int w = 720;
 	int h = 480;
 	VideoProvider *video = new DummyVideoProvider(10,1,w,h,wxColour(255,0,0),false);
-	AegiVideoFrame srcFrame;
+	AegiVideoFrame srcFrame = video->GetFrame(0);
-	srcFrame.CopyFrom(video->GetFrame(0));
 	delete video;
 
-	// Subtitles
-	SubtitlesProvider *provider = SubtitlesProviderFactory::GetProvider();
-
 	// Prepare subtitles
 	CreateCopy();
 	SortLines();
 	//Merge(true,true,true);
-	provider->LoadSubtitles(GetAssFile());
 
-	// Write lines
+	// Count and index lines
 	using std::list;
-	int i = 0;
+	int count = 0;
+	std::vector<AssDialogue*> diags;
 	for (list<AssEntry*>::iterator cur=Line->begin();cur!=Line->end();cur++) {
 		AssDialogue *current = AssEntry::GetAsDialogue(*cur);
 		if (current) {
+			diags.push_back(current);
+			count++;
+		}
+	}
+	pics.resize(count);
+
+	SubtitlesProvider *provider = NULL;
+	provider = SubtitlesProviderFactory::GetProvider();
+	provider->LoadSubtitles(GetAssFile());
+
+	// Write lines
+	int i;
+	#pragma omp parallel for shared(diags,pics,provider) private(i)
+	for (i=0;i<count;i++) {
+		// Dialogue
+		AssDialogue *current = diags[i];
+
 		// Get the image
 		AegiVideoFrame dst;
 		dst.CopyFrom(srcFrame);
+		#pragma omp critical
+		{
 			provider->DrawSubtitles(dst,current->Start.GetMS()/1000.0);
+		}
 		wxImage img = dst.GetImage();
 		dst.Clear();
 
@@ -108,7 +127,7 @@ void DVDSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
 		const unsigned char *dataRead = data;
 		unsigned char *dataWrite = data;
 		int startY = 0;
-			int endY;
+		int endY = 0;
 		int startX = w;
 		int endX = 0;
 
@@ -172,13 +191,30 @@ void DVDSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
 			}
 		}
 		
+		// Get subpicture
+		wxImage subPic = img.GetSubImage(wxRect(startX,startY,endX-startX+1,endY-startY+1));
+
 		// Save image
-			img.GetSubImage(wxRect(startX,startY,endX-startX+1,endY-startY+1)).SaveFile(filename + wxString::Format(_T("%03i.png"),i));
+		if (startX > endX) endX = startX;
-			i++;
+		if (startY > endY) endY = startY;
-		}
+		pics[i].img = subPic;
+		pics[i].x = startX;
+		pics[i].y = startY;
 	}
 
 	// Clean up
 	delete provider;
 	srcFrame.Clear();
 }
+
+
+///////////////////////
+// Actually write them
+void DVDSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
+	// Get subpictures
+	std::vector<SubPicture> pics;
+	GetSubPictureList(pics);
+
+	// Dump as PNG
+	//for (size_t i=0;i<pics.size();i++) pics[i].img.SaveFile(filename + wxString::Format(_T("_%03i.png"),i));
+}

aegisub/subtitle_format_dvd.h

@@ -42,9 +42,20 @@
 #include "subtitle_format.h"
 
 
+////////////////
+// Helper class
+struct SubPicture {
+	wxImage img;
+	int x,y;
+};
+
+
 //////////////////////////
 // DVD subpictures writer
 class DVDSubtitleFormat : public SubtitleFormat {
+private:
+	void GetSubPictureList(std::vector<SubPicture> &pics);
+
 public:
 	wxString GetName();
 	wxArrayString GetWriteWildcards();