shithub: openh264

Info  •  Files  •  Log  •  Branches

Revert "ut_win32"

This reverts commit 462f56d4130f4061aa467e5e1178d44c276fdea9.

--- a/test/api/decode_encode_test.cpp

+++ b/test/api/decode_encode_test.cpp

@@ -96,9 +96,6 @@

 #if defined(ANDROID_NDK)

   std::string filename = std::string ("/sdcard/") + p.fileName;

   ASSERT_TRUE (Open (filename.c_str()));

-#elif defined(_WIN32)

-  std::string filename = std::string ("../../../../../") + p.fileName;

-  ASSERT_TRUE (Open (filename.c_str()));

 #else

   ASSERT_TRUE (Open (p.fileName));

 #endif

--- a/test/api/decoder_test.cpp

+++ b/test/api/decoder_test.cpp

@@ -56,9 +56,6 @@

 #if defined(ANDROID_NDK)

   std::string filename = std::string ("/sdcard/") + p.fileName;

   DecodeFile (filename.c_str(), this);

-#elif defined(_WIN32)

-   std::string filename = std::string ("../../../../../") + p.fileName;

-  DecodeFile (filename.c_str(), this);

 #else

   DecodeFile (p.fileName, this);

 #endif

--- a/test/api/encode_decode_api_test.cpp

+++ b/test/api/encode_decode_api_test.cpp

@@ -80,9 +80,6 @@

 #if defined(ANDROID_NDK)

   std::string filename = std::string ("/sdcard/") + p.fileName;

   ASSERT_TRUE (fileStream.Open (filename.c_str()));

-#elif defined(_WIN32)

-  std::string filename = std::string ("../../../../../") + p.fileName;

-  ASSERT_TRUE (fileStream.Open (filename.c_str()));

 #else

   ASSERT_TRUE (fileStream.Open (p.fileName));

 #endif

--- a/test/api/encoder_test.cpp

+++ b/test/api/encoder_test.cpp

@@ -60,9 +60,6 @@

 #if defined(ANDROID_NDK)

   std::string filename = std::string ("/sdcard/") + p.fileName;

   EncodeFile (filename.c_str(), p.usageType , p.width, p.height, p.frameRate, p.slices, p.denoise, p.layers, this);

-#elif defined(_WIN32)

-  std::string filename = std::string ("../../../../../") + p.fileName;

-  EncodeFile (filename.c_str(), p.usageType , p.width, p.height, p.frameRate, p.slices, p.denoise, p.layers, this);

 #else

   EncodeFile (p.fileName, p.usageType , p.width, p.height, p.frameRate, p.slices, p.denoise, p.layers, this);

 #endif