cleanup of include order, std include comments on what function they are for, and guard naming to match folder

BUG=none
TEST=none
Review URL: http://webrtc-codereview.appspot.com/333028

git-svn-id: http://libyuv.googlecode.com/svn/trunk@125 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 123
+Version: 125
 License: BSD
 License File: LICENSE
 

include/libyuv/video_common.h

@@ -12,11 +12,8 @@
 * Common definitions for video, including fourcc and VideoFormat
 */
 
-
+#ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_
-#ifndef LIBYUV_SOURCE_VIDEO_COMMON_H_
+#define INCLUDE_LIBYUV_VIDEO_COMMON_H_
-#define LIBYUV_SOURCE_VIDEO_COMMON_H_
-
-#include <string>
 
 #include "libyuv/basic_types.h"
 
@@ -38,6 +35,7 @@ extern "C" {
 // Some good pages discussing FourCC codes:
 //   http://developer.apple.com/quicktime/icefloe/dispatch020.html
 //   http://www.fourcc.org/yuv.php
+//   http://linuxtv.org/downloads/v4l-dvb-apis/pixfmt.html
 enum FourCC {
   // Canonical fourcc codes used in our code.
   FOURCC_I420 = FOURCC('I', '4', '2', '0'),
@@ -93,4 +91,4 @@ uint32 CanonicalFourCC(uint32 fourcc);
 }  // namespace libyuv
 #endif
 
-#endif  // LIBYUV_SOURCE_VIDEO_COMMON_H_
+#endif  // INCLUDE_LIBYUV_VIDEO_COMMON_H_

source/convert.cc

@@ -13,7 +13,7 @@
 //#define SCALEOPT //Currently for windows only. June 2010
 
 #ifdef SCALEOPT
-#include <emmintrin.h>
+#include <emmintrin.h>  // Not currently used
 #endif
 
 #include "conversion_tables.h"
@@ -22,8 +22,8 @@
 #include "libyuv/format_conversion.h"
 #include "libyuv/planar_functions.h"
 #include "libyuv/rotate.h"
-#include "row.h"
 #include "libyuv/video_common.h"
+#include "row.h"
 
 #ifdef __cplusplus
 namespace libyuv {

source/cpu_id.cc

@@ -10,15 +10,15 @@
 
 #include "libyuv/cpu_id.h"
 
-#include <stdlib.h>  // for getenv
+#include <stdlib.h>  // For getenv()
 #ifdef _MSC_VER
-#include <intrin.h>
+#include <intrin.h>  // For __cpuid()
 #endif
 #ifdef __ANDROID__
-#include <cpu-features.h>
+#include <cpu-features.h>  // For android_getCpuFeatures()
 #endif
 
-#include "libyuv/basic_types.h"  // for CPU_X86
+#include "libyuv/basic_types.h"  // For CPU_X86
 
 // TODO(fbarchard): Use cpuid.h when gcc 4.4 is used on OSX and Linux.
 #if (defined(__pic__) || defined(__APPLE__)) && defined(__i386__)

source/format_conversion.cc

@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <assert.h>
+#include "libyuv/format_conversion.h"
+
+#include <assert.h>  // For assert()
 
 #include "libyuv/basic_types.h"
 #include "libyuv/cpu_id.h"
-#include "row.h"
 #include "libyuv/video_common.h"
+#include "row.h"
 
 #ifdef __cplusplus
 namespace libyuv {

source/planar_functions.cc

@@ -10,7 +10,7 @@
 
 #include "libyuv/planar_functions.h"
 
-#include <string.h>
+#include <string.h>  // For memcpy()
 
 #include "libyuv/cpu_id.h"
 #include "row.h"

source/rotate_neon.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "libyuv/basic_types.h"
 #include "row.h"
 
+#include "libyuv/basic_types.h"
+
 #ifdef __cplusplus
 namespace libyuv {
 extern "C" {