diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index cd13a01388..3254015ca9 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -41,8 +41,8 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/transport.h" +#include "webrtc/video_frame.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_renderer.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index ca196de74e..308661a5c8 100644 --- a/webrtc/common_video/BUILD.gn +++ b/webrtc/common_video/BUILD.gn @@ -19,7 +19,6 @@ source_set("common_video") { sources = [ "i420_buffer_pool.cc", "i420_video_frame.cc", - "interface/i420_video_frame.h", "interface/i420_buffer_pool.h", "interface/video_frame_buffer.h", "libyuv/include/scaler.h", diff --git a/webrtc/common_video/common_video.gyp b/webrtc/common_video/common_video.gyp index 4577a80dbd..68f85aa41e 100644 --- a/webrtc/common_video/common_video.gyp +++ b/webrtc/common_video/common_video.gyp @@ -39,15 +39,15 @@ }], ], 'sources': [ + 'i420_buffer_pool.cc', + 'i420_video_frame.cc', 'interface/i420_buffer_pool.h', 'interface/i420_video_frame.h', 'interface/video_frame_buffer.h', - 'i420_buffer_pool.cc', - 'i420_video_frame.cc', - 'libyuv/include/webrtc_libyuv.h', 'libyuv/include/scaler.h', - 'libyuv/webrtc_libyuv.cc', + 'libyuv/include/webrtc_libyuv.h', 'libyuv/scaler.cc', + 'libyuv/webrtc_libyuv.cc', 'video_frame_buffer.cc', ], }, diff --git a/webrtc/common_video/i420_video_frame.cc b/webrtc/common_video/i420_video_frame.cc index 6fd5f3e67e..3b062072cc 100644 --- a/webrtc/common_video/i420_video_frame.cc +++ b/webrtc/common_video/i420_video_frame.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/video_frame.h" #include diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc index adbdb032df..1cb1e7d9f7 100644 --- a/webrtc/common_video/i420_video_frame_unittest.cc +++ b/webrtc/common_video/i420_video_frame_unittest.cc @@ -8,13 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include "webrtc/video_frame.h" + #include #include #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/bind.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/common_video/interface/i420_video_frame.h" namespace webrtc { diff --git a/webrtc/common_video/interface/i420_video_frame.h b/webrtc/common_video/interface/i420_video_frame.h deleted file mode 100644 index ba23c87a8f..0000000000 --- a/webrtc/common_video/interface/i420_video_frame.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef COMMON_VIDEO_INTERFACE_I420_VIDEO_FRAME_H -#define COMMON_VIDEO_INTERFACE_I420_VIDEO_FRAME_H - -// TODO(pbos): Remove this file and include webrtc/video_frame.h instead. -#include "webrtc/video_frame.h" - -#endif // COMMON_VIDEO_INTERFACE_I420_VIDEO_FRAME_H diff --git a/webrtc/common_video/libyuv/include/scaler.h b/webrtc/common_video/libyuv/include/scaler.h index 5dff5095a1..48f2b7a026 100644 --- a/webrtc/common_video/libyuv/include/scaler.h +++ b/webrtc/common_video/libyuv/include/scaler.h @@ -16,9 +16,9 @@ #define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ #include "webrtc/common_video/interface/i420_buffer_pool.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/include/webrtc_libyuv.h b/webrtc/common_video/libyuv/include/webrtc_libyuv.h index d8e931d1df..176585b7fe 100644 --- a/webrtc/common_video/libyuv/include/webrtc_libyuv.h +++ b/webrtc/common_video/libyuv/include/webrtc_libyuv.h @@ -19,8 +19,8 @@ #include "webrtc/common_types.h" // RawVideoTypes. #include "webrtc/common_video/rotation.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/libyuv_unittest.cc b/webrtc/common_video/libyuv/libyuv_unittest.cc index 583c81adb7..bf31cbacd4 100644 --- a/webrtc/common_video/libyuv/libyuv_unittest.cc +++ b/webrtc/common_video/libyuv/libyuv_unittest.cc @@ -13,10 +13,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/common_video/interface/i420_video_frame.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/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/utility/interface/file_player.h b/webrtc/modules/utility/interface/file_player.h index d812deb09e..f16bf68886 100644 --- a/webrtc/modules/utility/interface/file_player.h +++ b/webrtc/modules/utility/interface/file_player.h @@ -12,10 +12,10 @@ #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_ #include "webrtc/common_types.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { class FileCallback; diff --git a/webrtc/modules/utility/interface/file_recorder.h b/webrtc/modules/utility/interface/file_recorder.h index f0ceccb4c0..53a0c318af 100644 --- a/webrtc/modules/utility/interface/file_recorder.h +++ b/webrtc/modules/utility/interface/file_recorder.h @@ -12,13 +12,13 @@ #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_ #include "webrtc/common_types.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/media_file/interface/media_file_defines.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/include/video_capture_defines.h b/webrtc/modules/video_capture/include/video_capture_defines.h index 63a5b7a8bb..49d0ae7738 100644 --- a/webrtc/modules/video_capture/include/video_capture_defines.h +++ b/webrtc/modules/video_capture/include/video_capture_defines.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ #define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 2470b2d22e..e4b08a5dfc 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -15,7 +15,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/utility/interface/process_thread.h" #include "webrtc/modules/video_capture/ensure_initialized.h" @@ -26,6 +25,7 @@ #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/test/testsupport/gtest_disable.h" +#include "webrtc/video_frame.h" using rtc::scoped_ptr; using webrtc::CriticalSectionWrapper; diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/webrtc/modules/video_capture/video_capture_impl.h index fd4b39894f..7367b43e7d 100644 --- a/webrtc/modules/video_capture/video_capture_impl.h +++ b/webrtc/modules/video_capture/video_capture_impl.h @@ -15,12 +15,12 @@ * video_capture_impl.h */ -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/rotation.h" #include "webrtc/modules/video_capture/include/video_capture.h" #include "webrtc/modules/video_capture/video_capture_config.h" #include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h index da72febb4d..6acd2d4320 100644 --- a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h @@ -14,12 +14,12 @@ #include #include "webrtc/common_types.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/codecs/interface/video_error_codes.h" #include "webrtc/typedefs.h" #include "webrtc/video_decoder.h" #include "webrtc/video_encoder.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h index 63d736394e..cf55b75e61 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -13,7 +13,6 @@ #include -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/scaler.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" @@ -22,6 +21,7 @@ #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" +#include "webrtc/video_frame.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h index 51a3ac898e..56d6e61c25 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h @@ -16,12 +16,12 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common.h" -#include "webrtc/experiments.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/experiments.h" #include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" +#include "webrtc/video_frame.h" #include "gtest/gtest.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h index fe7cf43342..2ddae4bd3c 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h @@ -23,12 +23,12 @@ #include "vpx/vp8dx.h" #include "webrtc/common_video/interface/i420_buffer_pool.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h" #include "webrtc/modules/video_coding/utility/include/frame_dropper.h" #include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc index 8fe78d4b20..e2a0360d38 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc @@ -10,7 +10,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/video_image.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" @@ -18,6 +17,7 @@ #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/metrics/video_metrics.h" #include "webrtc/tools/simple_command_line_parser.h" +#include "webrtc/video_frame.h" class Vp8SequenceCoderEncodeCallback : public webrtc::EncodedImageCallback { public: diff --git a/webrtc/modules/video_coding/main/interface/video_coding.h b/webrtc/modules/video_coding/main/interface/video_coding.h index 4d01da9705..ebd5fdd568 100644 --- a/webrtc/modules/video_coding/main/interface/video_coding.h +++ b/webrtc/modules/video_coding/main/interface/video_coding.h @@ -21,11 +21,11 @@ #include #endif -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/interface/video_coding_defines.h b/webrtc/modules/video_coding/main/interface/video_coding_defines.h index 50478cadc5..26d05c8914 100644 --- a/webrtc/modules/video_coding/main/interface/video_coding_defines.h +++ b/webrtc/modules/video_coding/main/interface/video_coding_defines.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ #define WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_processing/main/interface/video_processing.h b/webrtc/modules/video_processing/main/interface/video_processing.h index fb6770b7a4..6c02003d2f 100644 --- a/webrtc/modules/video_processing/main/interface/video_processing.h +++ b/webrtc/modules/video_processing/main/interface/video_processing.h @@ -18,10 +18,10 @@ #ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H #define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_processing/main/interface/video_processing_defines.h" +#include "webrtc/video_frame.h" /** The module is largely intended to process video streams, except functionality diff --git a/webrtc/modules/video_processing/main/source/content_analysis.h b/webrtc/modules/video_processing/main/source/content_analysis.h index 54b5b45c4e..006d22d58b 100644 --- a/webrtc/modules/video_processing/main/source/content_analysis.h +++ b/webrtc/modules/video_processing/main/source/content_analysis.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H #define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_processing/main/interface/video_processing_defines.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_render/include/video_render_defines.h b/webrtc/modules/video_render/include/video_render_defines.h index 4eb8409fca..4479c3755d 100644 --- a/webrtc/modules/video_render/include/video_render_defines.h +++ b/webrtc/modules/video_render/include/video_render_defines.h @@ -11,10 +11,9 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_ -// Includes #include "webrtc/common_types.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/test/frame_generator.h b/webrtc/test/frame_generator.h index 969a358ffb..bbc9582f8e 100644 --- a/webrtc/test/frame_generator.h +++ b/webrtc/test/frame_generator.h @@ -13,8 +13,8 @@ #include #include -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" namespace webrtc { namespace test { diff --git a/webrtc/test/testsupport/metrics/video_metrics.cc b/webrtc/test/testsupport/metrics/video_metrics.cc index 0202a71ebe..86cd679f32 100644 --- a/webrtc/test/testsupport/metrics/video_metrics.cc +++ b/webrtc/test/testsupport/metrics/video_metrics.cc @@ -15,8 +15,8 @@ #include // min_element, max_element -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/video_frame.h" namespace webrtc { namespace test { diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 5624e45f80..ea59c60e35 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -16,7 +16,6 @@ #include "webrtc/base/checks.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/call.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/frame_callback.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" @@ -24,16 +23,17 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/test/call_test.h" #include "webrtc/test/configurable_frame_size_encoder.h" #include "webrtc/test/null_transport.h" #include "webrtc/test/testsupport/perf_test.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video/transport_adapter.h" +#include "webrtc/video_frame.h" #include "webrtc/video_send_stream.h" namespace webrtc { diff --git a/webrtc/video_engine/include/vie_capture.h b/webrtc/video_engine/include/vie_capture.h index 860467002e..53072c2b8b 100644 --- a/webrtc/video_engine/include/vie_capture.h +++ b/webrtc/video_engine/include/vie_capture.h @@ -19,8 +19,8 @@ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CAPTURE_H_ #include "webrtc/common_types.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/rotation.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_file_image.h b/webrtc/video_engine/vie_file_image.h index 1b5e1affcd..f5c8b8762d 100644 --- a/webrtc/video_engine/vie_file_image.h +++ b/webrtc/video_engine/vie_file_image.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_ #define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_ -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/typedefs.h" #include "webrtc/video_engine/include/vie_file.h" +#include "webrtc/video_frame.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_frame_provider_base.cc b/webrtc/video_engine/vie_frame_provider_base.cc index a9ee1a8063..ec2249e869 100644 --- a/webrtc/video_engine/vie_frame_provider_base.cc +++ b/webrtc/video_engine/vie_frame_provider_base.cc @@ -13,11 +13,11 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/video_engine/vie_defines.h" +#include "webrtc/video_frame.h" namespace webrtc {