Include files from webrtc/.. paths in video_coding/.

BUG=1662 R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1783006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4348 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-16 12:32:05 +00:00
parent 4a44ea21d7
commit a4407329d4
108 changed files with 328 additions and 336 deletions
--- a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc
@ -8,7 +8,7 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "benchmark.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/benchmark.h"

 #include <cassert>
 #include <iostream>
@ -18,11 +18,11 @@
    #include <windows.h>
 #endif

-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "modules/video_coding/codecs/test_framework/video_source.h"
-#include "testsupport/fileutils.h"
-#include "testsupport/metrics/video_metrics.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/metrics/video_metrics.h"

 #define SSIM_CALC 0 // by default, don't compute SSIM

@ -301,4 +301,3 @@ Benchmark::CodecSpecific_InitBitrate()
        _encoder->SetRates(_bitRate, _inst.maxFramerate);
    }
 }
-
--- a/webrtc/modules/video_coding/codecs/test_framework/benchmark.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/benchmark.h
@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_BENCHMARK_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_BENCHMARK_H_

-#include "normal_async_test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h"

 class VideoSource;

@ -37,4 +37,3 @@ protected:
 };

 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_BENCHMARK_H_
-
--- a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.cc
@ -8,19 +8,19 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "normal_async_test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h"

 #include <assert.h>
-#include <string.h>
 #include <queue>
 #include <sstream>
+#include <string.h>
 #include <vector>

-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "gtest/gtest.h"
-#include "tick_util.h"
-#include "testsupport/fileutils.h"
-#include "typedefs.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/typedefs.h"

 using namespace webrtc;

--- a/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h
@ -11,13 +11,13 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_ASYNC_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_ASYNC_TEST_H_

-#include "common_types.h"
+#include "webrtc/common_types.h"

-#include "normal_test.h"
-#include "rw_lock_wrapper.h"
 #include <list>
 #include <map>
 #include <queue>
+#include "webrtc/modules/video_coding/codecs/test_framework/normal_test.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"

 class FrameQueueTuple
 {
--- a/webrtc/modules/video_coding/codecs/test_framework/normal_test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/normal_test.cc
@ -8,15 +8,15 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "normal_test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/normal_test.h"

-#include <time.h>
 #include <sstream>
 #include <string.h>
+#include <time.h>

-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/test/testsupport/fileutils.h"

 NormalTest::NormalTest()
 :
--- a/webrtc/modules/video_coding/codecs/test_framework/normal_test.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/normal_test.h
@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_TEST_H_

-#include "test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/test.h"

 class NormalTest : public CodecTest
 {
@ -43,4 +43,3 @@ protected:
 };

 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_NORMAL_TEST_H_
-
--- a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc
@ -8,11 +8,11 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "packet_loss_test.h"
-#include "video_source.h"
-#include <sstream>
 #include <cassert>
+#include <sstream>
 #include <string.h>
+#include "webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h"

 using namespace webrtc;

--- a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h
@ -13,7 +13,7 @@

 #include <list>

-#include "normal_async_test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/normal_async_test.h"

 class PacketLossTest : public NormalAsyncTest
 {
--- a/webrtc/modules/video_coding/codecs/test_framework/test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/test.cc
@ -8,13 +8,13 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/test.h"

 #include <cstring>
 #include <iostream>

-#include "testsupport/metrics/video_metrics.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/test/testsupport/metrics/video_metrics.h"

 using namespace webrtc;

--- a/webrtc/modules/video_coding/codecs/test_framework/test.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/test.h
@ -11,11 +11,11 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_

-#include "modules/interface/module_common_types.h"
-#include "video_codec_interface.h"
-#include <string>
-#include <fstream>
 #include <cstdlib>
+#include <fstream>
+#include <string>
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"

 class CodecTest
 {
--- a/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc
@ -14,11 +14,11 @@

 #include <cassert>

-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
-#include "tick_util.h"
-#include "unit_test.h"
-#include "video_source.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/unit_test.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/test/testsupport/fileutils.h"

 using namespace webrtc;

--- a/webrtc/modules/video_coding/codecs/test_framework/unit_test.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/unit_test.h
@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_UNIT_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_UNIT_TEST_H_

-#include "test.h"
-#include "event_wrapper.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/test.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"

 // Disable "conditional expression is constant" warnings on the perfectly
 // acceptable
@ -103,4 +103,3 @@ private:
 };

 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_UNIT_TEST_H_
-
--- a/webrtc/modules/video_coding/codecs/test_framework/video_source.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/video_source.cc
@ -8,12 +8,12 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "video_source.h"
+#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h"

 #include <stdio.h>

-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"

 VideoSource::VideoSource()
 :
--- a/webrtc/modules/video_coding/codecs/test_framework/video_source.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/video_source.h
@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_VIDEO_SOURCE_H_

 #include <string>
-#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"

 enum VideoSize
    {
@ -106,4 +106,3 @@ private:


 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_VIDEO_SOURCE_H_
-