From: lordmulder <mulder2@gmx.de>
Date: Sun, 5 Feb 2012 20:52:23 +0000 (+0100)
Subject: Added workarounds for the unfortunate lack of Unicode support in (unpatched) x264... 
X-Git-Tag: v2.27~122
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ce9e090554ee3437d54631f31a2173fc6be8400;p=x264-launcher%2Fx264-launcher.git

Added workarounds for the unfortunate lack of Unicode support in (unpatched) x264 and Avisynth.
---

diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp
index 070c26a..961205c 100644
--- a/src/thread_encode.cpp
+++ b/src/thread_encode.cpp
@@ -32,6 +32,7 @@
 #include <QDir>
 #include <QProcess>
 #include <QMutex>
+#include <QTextCodec>
 
 /*
  * Static vars
@@ -274,7 +275,7 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool avs2yuv_x64, bool usePipe
 	if(usePipe)
 	{
 		QStringList cmdLine_Avisynth;
-		cmdLine_Avisynth << QDir::toNativeSeparators(m_sourceFileName);
+		cmdLine_Avisynth << pathToLocal(QDir::toNativeSeparators(m_sourceFileName));
 		cmdLine_Avisynth << "-";
 		processAvisynth.setStandardOutputProcess(&processEncode);
 
@@ -297,6 +298,8 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool avs2yuv_x64, bool usePipe
 	QRegExp regExpProgress("\\[(\\d+)\\.\\d+%\\].+frames");
 	QRegExp regExpFrameCnt("^(\\d+) frames:");
 	
+	QTextCodec *localCodec = QTextCodec::codecForName("System");
+
 	bool bTimeout = false;
 	bool bAborted = false;
 
@@ -367,7 +370,7 @@ bool EncodeThread::runEncodingPass(bool x264_x64, bool avs2yuv_x64, bool usePipe
 			QList<QByteArray> lines = processEncode.readLine().split('\r');
 			while(!lines.isEmpty())
 			{
-				QString text = QString::fromUtf8(lines.takeFirst().constData()).simplified();
+				QString text = localCodec->toUnicode(lines.takeFirst().constData()).simplified();
 				int offset = -1;
 				if((offset = regExpProgress.lastIndexIn(text)) >= 0)
 				{
@@ -489,7 +492,7 @@ QStringList EncodeThread::buildCommandLine(bool usePipe, unsigned int frames, co
 	if((pass == 1) || (pass == 2))
 	{
 		cmdLine << "--pass" << QString::number(pass);
-		cmdLine << "--stats" << QDir::toNativeSeparators(passLogFile);
+		cmdLine << "--stats" << pathToLocal(QDir::toNativeSeparators(passLogFile), true);
 	}
 
 	cmdLine << "--preset" << m_options->preset().toLower();
@@ -510,7 +513,7 @@ QStringList EncodeThread::buildCommandLine(bool usePipe, unsigned int frames, co
 		cmdLine.append(m_options->custom().split(" "));
 	}
 
-	cmdLine << "--output" << QDir::toNativeSeparators(m_outputFileName);
+	cmdLine << "--output" << pathToLocal(QDir::toNativeSeparators(m_outputFileName), true);
 	
 	if(usePipe)
 	{
@@ -521,8 +524,8 @@ QStringList EncodeThread::buildCommandLine(bool usePipe, unsigned int frames, co
 	}
 	else
 	{
-		cmdLine << "--index" << QDir::toNativeSeparators(indexFile);
-		cmdLine << QDir::toNativeSeparators(m_sourceFileName);
+		cmdLine << "--index" << pathToLocal(QDir::toNativeSeparators(indexFile), true, false);
+		cmdLine << pathToLocal(QDir::toNativeSeparators(m_sourceFileName));
 	}
 
 	return cmdLine;
@@ -730,7 +733,7 @@ bool EncodeThread::checkProperties(bool x64, unsigned int &frames)
 	QProcess process;
 	
 	QStringList cmdLine = QStringList() << "-frames" << "1";
-	cmdLine << QDir::toNativeSeparators(m_sourceFileName) << "NUL";
+	cmdLine << pathToLocal(QDir::toNativeSeparators(m_sourceFileName)) << "NUL";
 
 	log("Creating process:");
 	if(!startProcess(process, QString("%1/%2.exe").arg(m_binDir, x64 ? "avs2yuv_x64" : "avs2yuv"), cmdLine))
@@ -741,6 +744,8 @@ bool EncodeThread::checkProperties(bool x64, unsigned int &frames)
 	QRegExp regExpInt(": (\\d+)x(\\d+), (\\d+) fps, (\\d+) frames");
 	QRegExp regExpFrc(": (\\d+)x(\\d+), (\\d+)/(\\d+) fps, (\\d+) frames");
 	
+	QTextCodec *localCodec = QTextCodec::codecForName("System");
+
 	bool bTimeout = false;
 	bool bAborted = false;
 
@@ -775,7 +780,7 @@ bool EncodeThread::checkProperties(bool x64, unsigned int &frames)
 			QList<QByteArray> lines = process.readLine().split('\r');
 			while(!lines.isEmpty())
 			{
-				QString text = QString::fromUtf8(lines.takeFirst().constData()).simplified();
+				QString text = localCodec->toUnicode(lines.takeFirst().constData()).simplified();
 				int offset = -1;
 				if((offset = regExpInt.lastIndexIn(text)) >= 0)
 				{
@@ -900,6 +905,56 @@ void EncodeThread::setDetails(const QString &text)
 	emit detailsChanged(m_jobId, text);
 }
 
+QString EncodeThread::pathToLocal(const QString &longPath, bool create, bool keep)
+{
+	QTextCodec *localCodec = QTextCodec::codecForName("System");
+	
+	//Do NOT convert to short, if path can be represented in local Codepage
+	if(localCodec->toUnicode(localCodec->fromUnicode(longPath)).compare(longPath, Qt::CaseInsensitive) == 0)
+	{
+		return longPath;
+	}
+	
+	//Create dummy file, if required (only existing files can have a short path!)
+	QFile tempFile;
+	if((!QFileInfo(longPath).exists()) && create)
+	{
+		tempFile.setFileName(longPath);
+		tempFile.open(QIODevice::WriteOnly);
+	}
+	
+	QString shortPath;
+	DWORD buffSize = GetShortPathNameW(reinterpret_cast<const wchar_t*>(longPath.utf16()), NULL, NULL);
+	
+	if(buffSize > 0)
+	{
+		wchar_t *buffer = new wchar_t[buffSize];
+		DWORD result = GetShortPathNameW(reinterpret_cast<const wchar_t*>(longPath.utf16()), buffer, buffSize);
+
+		if(result > 0 && result < buffSize)
+		{
+			shortPath = QString::fromUtf16(reinterpret_cast<const unsigned short*>(buffer));
+		}
+
+		delete[] buffer;
+		buffer = NULL;
+	}
+
+	//Remove the dummy file now (FFMS2 fails, if index file does exist but is empty!)
+	if(tempFile.isOpen())
+	{
+		if(!keep) tempFile.remove();
+		tempFile.close();
+	}
+
+	if(shortPath.isEmpty())
+	{
+		log(tr("Warning: Failed to convert path \"%1\" to short!\n").arg(longPath));
+	}
+
+	return (shortPath.isEmpty() ? longPath : shortPath);
+}
+
 bool EncodeThread::startProcess(QProcess &process, const QString &program, const QStringList &args, bool mergeChannels)
 {
 	QMutexLocker lock(&m_mutex_startProcess);
diff --git a/src/thread_encode.h b/src/thread_encode.h
index cd35f32..3dcc19a 100644
--- a/src/thread_encode.h
+++ b/src/thread_encode.h
@@ -122,7 +122,9 @@ protected:
 	inline void setProgress(unsigned int newProgress);
 	inline void setDetails(const QString &text);
 	bool startProcess(QProcess &process, const QString &program, const QStringList &args, bool mergeChannels = true);
-	
+	QString pathToLocal(const QString &longPath, bool create = false, bool keep = true);
+
+	//Static functions
 	static QString commandline2string(const QString &program, const QStringList &arguments);
 
 signals: