Reorganize the vp8 directory.

The usual changes:
vp8/main/source -> vp8/
vp8/main/test -> vp8/test
vp8/main/interface -> vp8/include

All include paths etc. updated as needed.

BUG=none
TEST=trybots

Review URL: https://webrtc-codereview.appspot.com/704004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2536 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/video_coding/codecs/test/video_codecs_test_framework.gypi

@@ -53,7 +53,7 @@
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(webrtc_root)/test/metrics.gyp:metrics',
             '<(webrtc_root)/test/test.gyp:test_support_main',
-            '<(webrtc_vp8_dir)/main/source/vp8.gyp:webrtc_vp8',
+            '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',
           ],
           'sources': [
             'videoprocessor_integrationtest.cc',

src/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc

@@ -15,8 +15,8 @@
 #include "modules/video_coding/codecs/interface/video_codec_interface.h"
 #include "modules/video_coding/codecs/test/packet_manipulator.h"
 #include "modules/video_coding/codecs/test/videoprocessor.h"
-#include "modules/video_coding/codecs/vp8/main/interface/vp8.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
-#include "modules/video_coding/codecs/vp8/main/interface/vp8_common_types.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h"
 #include "modules/video_coding/main/interface/video_coding.h"
 #include "testsupport/fileutils.h"
 #include "testsupport/frame_reader.h"

src/modules/video_coding/codecs/tools/video_codecs_tools.gypi

@@ -18,7 +18,7 @@
             'webrtc_video_coding',
             '<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
             '<(webrtc_root)/test/metrics.gyp:metrics',
-            '<(webrtc_vp8_dir)/main/source/vp8.gyp:webrtc_vp8',
+            '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',
            ],
            'sources': [
              'video_quality_measurement.cc',

src/modules/video_coding/codecs/tools/video_quality_measurement.cc

@@ -24,7 +24,7 @@
 #include "modules/video_coding/codecs/test/packet_manipulator.h"
 #include "modules/video_coding/codecs/test/stats.h"
 #include "modules/video_coding/codecs/test/videoprocessor.h"
-#include "modules/video_coding/codecs/vp8/main/interface/vp8.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/main/interface/video_coding.h"
 #include "system_wrappers/interface/trace.h"
 #include "testsupport/frame_reader.h"

src/modules/video_coding/codecs/vp8/temporal_layers.cc

@@ -15,7 +15,7 @@
 
 #include "modules/interface/module_common_types.h"
 #include "modules/video_coding/codecs/interface/video_codec_interface.h"
-#include "modules/video_coding/codecs/vp8/main/interface/vp8_common_types.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h"
 
 #include "vpx/vpx_encoder.h"
 #include "vpx/vp8cx.h"

src/modules/video_coding/codecs/vp8/test/benchmark.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_BENCHMARK_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_BENCHMARK_H_
 
-#include "../../../test_framework/benchmark.h"
+#include "modules/video_coding/codecs/test_framework/benchmark.h"
 
 class VP8Benchmark : public Benchmark
 {

src/modules/video_coding/codecs/vp8/test/normal_async_test.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_NORMAL_ASYNC_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_NORMAL_ASYNC_TEST_H_
 
-#include "../../../test_framework/normal_async_test.h"
+#include "modules/video_coding/codecs/test_framework/normal_async_test.h"
 
 class VP8NormalAsyncTest : public NormalAsyncTest
 {

src/modules/video_coding/codecs/vp8/test/packet_loss_test.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_PACKET_LOSS_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_PACKET_LOSS_TEST_H_
 
-#include "../../../test_framework/packet_loss_test.h"
+#include "modules/video_coding/codecs/test_framework/packet_loss_test.h"
 
 class VP8PacketLossTest : public PacketLossTest
 {

src/modules/video_coding/codecs/vp8/test/vp8_unittest.cc

@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "../../../test_framework/video_source.h"
+#include "modules/video_coding/codecs/test_framework/video_source.h"
 #include "gtest/gtest.h"
 #include "testsupport/fileutils.h"
 #include "vp8.h"

src/modules/video_coding/codecs/vp8/test/vp8_unittest.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_UNITTEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_VP8_UNITTEST_H_
 
-#include "../../../test_framework/unit_test.h"
+#include "modules/video_coding/codecs/test_framework/unit_test.h"
 
 class VP8UnitTest : public UnitTest
 {

src/modules/video_coding/codecs/vp8/vp8.gyp

@@ -8,8 +8,8 @@
 
 {
   'includes': [
-    '../../../../../../build/common.gypi',
+    '../../../../build/common.gypi',
-    '../../../test_framework/test_framework.gypi'
+    '../test_framework/test_framework.gypi'
   ],
   'targets': [
     {
@@ -21,12 +21,15 @@
         '<(webrtc_root)/common_video/common_video.gyp:webrtc_libyuv',
       ],
       'include_dirs': [
-        '../interface',
+        'include',
         '<(webrtc_root)/common_video/interface',
         '<(webrtc_root)/modules/video_coding/codecs/interface',
         '<(webrtc_root)/modules/interface',
       ],
       'conditions': [
+        # TODO(mikhal): Investigate this mechanism for handling differences
+        # between the Chromium and standalone builds.
+        # http://code.google.com/p/webrtc/issues/detail?id=201
         ['build_with_chromium==1', {
           'defines': [
             'WEBRTC_LIBVPX_VERSION=960' # Bali
@@ -43,7 +46,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
           '<(webrtc_root)/common_video/interface',
           '<(webrtc_root)/modules/video_coding/codecs/interface',
         ],
@@ -51,8 +54,8 @@
       'sources': [
         'reference_picture_selection.h',
         'reference_picture_selection.cc',
-        '../interface/vp8.h',
+        'include/vp8.h',
-        '../interface/vp8_common_types.h',
+        'include/vp8_common_types.h',
         'vp8.cc',
       ],
     },
@@ -74,21 +77,21 @@
           ],
          'sources': [
             # header files
-            '../test/benchmark.h',
+            'test/benchmark.h',
-            '../test/dual_decoder_test.h',
+            'test/dual_decoder_test.h',
-            '../test/normal_async_test.h',
+            'test/normal_async_test.h',
-            '../test/packet_loss_test.h',
+            'test/packet_loss_test.h',
-            '../test/rps_test.h',
+            'test/rps_test.h',
-            '../test/vp8_unittest.h',
+            'test/vp8_unittest.h',
 
            # source files
-            '../test/benchmark.cc',
+            'test/benchmark.cc',
-            '../test/dual_decoder_test.cc',
+            'test/dual_decoder_test.cc',
-            '../test/normal_async_test.cc',
+            'test/normal_async_test.cc',
-            '../test/packet_loss_test.cc',
+            'test/packet_loss_test.cc',
-            '../test/rps_test.cc',
+            'test/rps_test.cc',
-            '../test/tester.cc',
+            'test/tester.cc',
-            '../test/vp8_unittest.cc',
+            'test/vp8_unittest.cc',
           ],
         },
         {

src/modules/video_coding/main/source/media_opt_util.cc

@@ -16,7 +16,7 @@
 #include <limits.h>
 
 #include "modules/interface/module_common_types.h"
-#include "modules/video_coding/codecs/vp8/main/interface/vp8_common_types.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_common_types.h"
 #include "modules/video_coding/main/interface/video_coding_defines.h"
 #include "modules/video_coding/main/source/er_tables_xor.h"
 #include "modules/video_coding/main/source/fec_tables_xor.h"

src/modules/video_coding/main/source/video_coding.gypi

@@ -15,7 +15,7 @@
         'webrtc_i420',
         '<(webrtc_root)/common_video/common_video.gyp:webrtc_libyuv',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-        '<(webrtc_vp8_dir)/main/source/vp8.gyp:webrtc_vp8',
+        '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',
       ],
       'include_dirs': [
         '../interface',

src/modules/video_coding/main/source/video_coding_test.gypi

@@ -22,7 +22,7 @@
       ],
       'include_dirs': [
          '../../../interface',
-         '../../codecs/vp8/main/interface',
+         '../../codecs/vp8/include',
          '../../../../system_wrappers/interface',
           '../../../../common_video/interface',
          '../source',

webrtc.gyp

@@ -22,7 +22,7 @@
         'src/test/metrics.gyp:*',
         'src/test/test.gyp:*',
         'tools/e2e_quality/e2e_quality.gyp:*',
-        '<(webrtc_vp8_dir)/main/source/vp8.gyp:*'
+        '<(webrtc_vp8_dir)/vp8.gyp:*'
       ],
     },
   ],