shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1925 from mstorsjo/misc-minor-whitespace

Misc minor whitespace fixes

--- a/codec/build/android/enc/jni/myjni.cpp

+++ b/codec/build/android/enc/jni/myjni.cpp

@@ -11,21 +11,21 @@

 JNIEXPORT void JNICALL Java_com_wels_enc_WelsEncTest_DoEncoderAutoTest

 (JNIEnv* env, jobject thiz, jstring jsIncfgName, jstring jsInlayerName, jstring jsInyuvName, jstring jsOutbitName) {

   /**************** Add the native codes/API *****************/

-  const char* argv[]={

-	(char*)("encConsole.exe"),

-	(char*) ((*env).GetStringUTFChars (jsIncfgName, NULL)),

-	(char*)("-org"),

-	(char*) ((*env).GetStringUTFChars (jsInyuvName, NULL)),

-	(char*)("-bf"),

-	(char*) ((*env).GetStringUTFChars (jsOutbitName, NULL)),

-	(char*)("-numl"),

-	(char*)("1"),

-    (char*)("-lconfig"),

-    (char*)("0"),

-	(char*) ((*env).GetStringUTFChars (jsInlayerName, NULL))

+  const char* argv[] = {

+    (char*) ("encConsole.exe"),

+    (char*) ((*env).GetStringUTFChars (jsIncfgName, NULL)),

+    (char*) ("-org"),

+    (char*) ((*env).GetStringUTFChars (jsInyuvName, NULL)),

+    (char*) ("-bf"),

+    (char*) ((*env).GetStringUTFChars (jsOutbitName, NULL)),

+    (char*) ("-numl"),

+    (char*) ("1"),

+    (char*) ("-lconfig"),

+    (char*) ("0"),

+    (char*) ((*env).GetStringUTFChars (jsInlayerName, NULL))

   };

   LOGI ("Start to run JNI module!+++");

-  EncMain(sizeof(argv)/sizeof(argv[0]),(char**)&argv[0]);

+  EncMain (sizeof (argv) / sizeof (argv[0]), (char**)&argv[0]);

   LOGI ("End to run JNI module!+++");

 }

--- a/codec/common/inc/macros.h

+++ b/codec/common/inc/macros.h

@@ -81,7 +81,7 @@

 #endif//_MSC_VER

-#ifndef	WELS_ALIGN

+#ifndef WELS_ALIGN

 #define WELS_ALIGN(x, n)	(((x)+(n)-1)&~((n)-1))

 #endif//WELS_ALIGN

--- a/test/build/ios/codec_unittest/codec_unittest/AppDelegate.m

+++ b/test/build/ios/codec_unittest/codec_unittest/AppDelegate.m

@@ -23,7 +23,7 @@

 - (void)applicationDidEnterBackground:(UIApplication *)application

 {

-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 

+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.

     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.

 }

--- a/test/build/ios/codec_unittest/codec_unittest/main.m

+++ b/test/build/ios/codec_unittest/codec_unittest/main.m

@@ -62,9 +62,9 @@

     else

         NSLog(@"Unit test runing failed on devices");

     abort();

-    

+

 #endif

-    

+

     @autoreleasepool {

         return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));

     }

--- a/test/encoder/EncUT_Sample.cpp

+++ b/test/encoder/EncUT_Sample.cpp

@@ -631,4 +631,4 @@

 GENERATE_SadFour_UT (WelsSampleSadFour8x16_AArch64_neon, WELS_CPU_NEON, 8, 16)

 GENERATE_SadFour_UT (WelsSampleSadFour16x8_AArch64_neon, WELS_CPU_NEON, 16, 8)

 GENERATE_SadFour_UT (WelsSampleSadFour16x16_AArch64_neon, WELS_CPU_NEON, 16, 16)

-#endif

\ No newline at end of file

+#endif