From 613a7a0ead137ec8b9998beaa7d8aea5b65bc5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 4 May 2015 12:09:58 +0300 Subject: [PATCH 1/4] Convert a tab to a space in an #ifndef --- codec/common/inc/macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/common/inc/macros.h b/codec/common/inc/macros.h index 8a9c6f24..87a93ace 100644 --- 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 From 8d34c68ad68e14202bfe1d11e6e94c8c0604a4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 4 May 2015 12:24:06 +0300 Subject: [PATCH 2/4] Add a missing newline at the end of a file Some tools (like git) complain if a file lacks a newline at the end of a file, and some editors will automatically readd it when editing such files. --- test/encoder/EncUT_Sample.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/encoder/EncUT_Sample.cpp b/test/encoder/EncUT_Sample.cpp index 888f3af1..ca954a38 100644 --- a/test/encoder/EncUT_Sample.cpp +++ b/test/encoder/EncUT_Sample.cpp @@ -631,4 +631,4 @@ GENERATE_SadFour_UT (WelsSampleSadFour8x8_AArch64_neon, WELS_CPU_NEON, 8, 8) 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 From ad9e65b96aaa93a06f1b564a0714a648fd904c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 4 May 2015 11:52:48 +0300 Subject: [PATCH 3/4] Remove trailing whitespace in the iOS codec unittest files --- test/build/ios/codec_unittest/codec_unittest/AppDelegate.m | 2 +- test/build/ios/codec_unittest/codec_unittest/main.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/build/ios/codec_unittest/codec_unittest/AppDelegate.m b/test/build/ios/codec_unittest/codec_unittest/AppDelegate.m index 88e29440..aee01b1e 100644 --- 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. } diff --git a/test/build/ios/codec_unittest/codec_unittest/main.m b/test/build/ios/codec_unittest/codec_unittest/main.m index ffde8a8e..5c094c35 100644 --- a/test/build/ios/codec_unittest/codec_unittest/main.m +++ b/test/build/ios/codec_unittest/codec_unittest/main.m @@ -62,9 +62,9 @@ int main(int argc, char * argv[]) else NSLog(@"Unit test runing failed on devices"); abort(); - + #endif - + @autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } From 65d6826470e984b550ffdec4e4b25e29c8778bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 27 Apr 2015 14:25:47 +0300 Subject: [PATCH 4/4] Astyle a cpp file in the android test project This gets rid of indentation with tabs. --- codec/build/android/enc/jni/myjni.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/codec/build/android/enc/jni/myjni.cpp b/codec/build/android/enc/jni/myjni.cpp index 083ff54f..25d57549 100644 --- a/codec/build/android/enc/jni/myjni.cpp +++ b/codec/build/android/enc/jni/myjni.cpp @@ -11,21 +11,21 @@ extern "C" 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!+++"); }