From 2557b86e7648ffebc5781df9f093ca5a84efc219 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Wed, 18 Nov 2015 22:00:21 +0100 Subject: [PATCH] modules/video_coding refactorings The main purpose was the interface-> include rename, but other files were also moved, eliminating the "main" dir. To avoid breaking downstream, the "interface" directories were copied into a new "video_coding/include" dir. The old headers got pragma warnings added about deprecation (a very short deprecation since I plan to remove them as soon downstream is updated). Other files also moved: video_coding/main/source -> video_coding video_coding/main/test -> video_coding/test BUG=webrtc:5095 TESTED=Passing compile-trybots with --clobber flag: git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=stefan@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1417283007 . Cr-Commit-Position: refs/heads/master@{#10694} --- talk/media/webrtc/fakewebrtcvideoengine.h | 2 +- webrtc/modules/modules.gyp | 28 +- webrtc/modules/video_coding/BUILD.gn | 102 ++-- .../{main/source => }/codec_database.cc | 4 +- .../{main/source => }/codec_database.h | 14 +- .../{main/source => }/codec_timer.cc | 2 +- .../{main/source => }/codec_timer.h | 0 .../video_coding/codecs/h264/include/h264.h | 2 +- .../video_coding/codecs/i420/include/i420.h | 2 +- .../mock/mock_video_codec_interface.h | 10 +- .../codecs/interface/video_codec_interface.h | 10 +- .../codecs/interface/video_error_codes.h | 8 +- .../codecs/test/packet_manipulator.h | 2 +- .../test/packet_manipulator_unittest.cc | 2 +- .../video_coding/codecs/test/videoprocessor.h | 2 +- .../test/videoprocessor_integrationtest.cc | 4 +- .../codecs/test/videoprocessor_unittest.cc | 4 +- .../codecs/tools/video_quality_measurement.cc | 2 +- .../codecs/vp8/default_temporal_layers.cc | 2 +- .../vp8/default_temporal_layers_unittest.cc | 2 +- .../video_coding/codecs/vp8/include/vp8.h | 2 +- .../codecs/vp8/realtime_temporal_layers.cc | 2 +- .../codecs/vp8/screenshare_layers.cc | 2 +- .../codecs/vp8/screenshare_layers_unittest.cc | 2 +- .../vp8/simulcast_encoder_adapter_unittest.cc | 2 +- .../codecs/vp8/simulcast_unittest.h | 2 +- .../video_coding/codecs/vp8/vp8_impl.cc | 2 +- .../video_coding/codecs/vp8/vp8_impl.h | 2 +- .../video_coding/codecs/vp9/include/vp9.h | 2 +- .../source => }/content_metrics_processing.cc | 4 +- .../source => }/content_metrics_processing.h | 0 .../{main/source => }/decoding_state.cc | 8 +- .../{main/source => }/decoding_state.h | 0 .../source => }/decoding_state_unittest.cc | 8 +- .../{main/source => }/encoded_frame.cc | 8 +- .../{main/source => }/encoded_frame.h | 4 +- .../{main/source => }/fec_tables_xor.h | 6 +- .../{main/source => }/frame_buffer.cc | 4 +- .../{main/source => }/frame_buffer.h | 14 +- .../{main/source => }/generic_decoder.cc | 6 +- .../{main/source => }/generic_decoder.h | 18 +- .../{main/source => }/generic_encoder.cc | 6 +- .../{main/source => }/generic_encoder.h | 4 +- .../include/mock/mock_vcm_callbacks.h | 35 ++ .../include/mock/mock_video_codec_interface.h | 77 +++ .../include/video_codec_interface.h | 101 ++++ .../video_coding/include/video_coding.h | 544 ++++++++++++++++++ .../include/video_coding_defines.h | 201 +++++++ .../video_coding/include/video_error_codes.h | 32 ++ .../{main/source => }/inter_frame_delay.cc | 2 +- .../{main/source => }/inter_frame_delay.h | 0 .../{main/source => }/internal_defines.h | 6 +- .../{main/source => }/jitter_buffer.cc | 16 +- .../{main/source => }/jitter_buffer.h | 18 +- .../{main/source => }/jitter_buffer_common.h | 0 .../source => }/jitter_buffer_unittest.cc | 12 +- .../{main/source => }/jitter_estimator.cc | 6 +- .../{main/source => }/jitter_estimator.h | 2 +- .../source => }/jitter_estimator_tests.cc | 2 +- .../main/interface/mock/mock_vcm_callbacks.h | 10 +- .../main/interface/video_coding.h | 10 +- .../main/interface/video_coding_defines.h | 8 +- .../modules/video_coding/main/source/OWNERS | 5 - .../{main/source => }/media_opt_util.cc | 8 +- .../{main/source => }/media_opt_util.h | 4 +- .../{main/source => }/media_optimization.cc | 6 +- .../{main/source => }/media_optimization.h | 12 +- .../media_optimization_unittest.cc | 2 +- .../{main/source => }/nack_fec_tables.h | 6 +- .../video_coding/{main/source => }/packet.cc | 2 +- .../video_coding/{main/source => }/packet.h | 2 +- .../{main/source => }/qm_select.cc | 8 +- .../{main/source => }/qm_select.h | 0 .../{main/source => }/qm_select_data.h | 6 +- .../{main/source => }/qm_select_unittest.cc | 2 +- .../{main/source => }/receiver.cc | 8 +- .../video_coding/{main/source => }/receiver.h | 16 +- .../{main/source => }/receiver_unittest.cc | 10 +- .../{main/source => }/rtt_filter.cc | 4 +- .../{main/source => }/rtt_filter.h | 0 .../{main/source => }/session_info.cc | 4 +- .../{main/source => }/session_info.h | 10 +- .../source => }/session_info_unittest.cc | 4 +- .../{main => }/test/plotJitterEstimate.m | 0 .../{main => }/test/plotReceiveTrace.m | 0 .../{main => }/test/plotTimingTest.m | 0 .../{main => }/test/receiver_tests.h | 6 +- .../{main => }/test/release_test.h | 6 +- .../{main => }/test/rtp_player.cc | 6 +- .../video_coding/{main => }/test/rtp_player.h | 2 +- .../source => }/test/stream_generator.cc | 6 +- .../{main/source => }/test/stream_generator.h | 10 +- .../video_coding/{main => }/test/subfigure.m | 0 .../video_coding/{main => }/test/test_util.cc | 4 +- .../video_coding/{main => }/test/test_util.h | 4 +- .../{main => }/test/tester_main.cc | 4 +- .../test/vcm_payload_sink_factory.cc | 4 +- .../test/vcm_payload_sink_factory.h | 9 +- .../{main => }/test/video_rtp_play.cc | 4 +- .../{main => }/test/video_source.h | 2 +- .../{main/source => }/timestamp_map.cc | 2 +- .../{main/source => }/timestamp_map.h | 0 .../video_coding/{main/source => }/timing.cc | 6 +- .../video_coding/{main/source => }/timing.h | 8 +- .../{main/source => }/timing_unittest.cc | 8 +- .../video_coding/utility/include/qp_parser.h | 2 +- webrtc/modules/video_coding/video_coding.gypi | 102 ++-- .../{main/source => }/video_coding_impl.cc | 10 +- .../{main/source => }/video_coding_impl.h | 18 +- .../video_coding_robustness_unittest.cc | 8 +- .../video_coding/video_coding_test.gypi | 16 +- .../{main/source => }/video_receiver.cc | 10 +- .../source => }/video_receiver_unittest.cc | 10 +- .../{main/source => }/video_sender.cc | 6 +- .../source => }/video_sender_unittest.cc | 10 +- .../test/configurable_frame_size_encoder.cc | 2 +- webrtc/test/fake_decoder.h | 2 +- webrtc/test/fake_encoder.cc | 2 +- .../video/encoded_frame_callback_adapter.cc | 2 +- webrtc/video/encoded_frame_callback_adapter.h | 2 +- webrtc/video/end_to_end_tests.cc | 2 +- webrtc/video/receive_statistics_proxy.cc | 2 +- webrtc/video/receive_statistics_proxy.h | 2 +- webrtc/video/send_statistics_proxy.h | 4 +- webrtc/video/video_capture_input.h | 4 +- webrtc/video/video_decoder_unittest.cc | 2 +- webrtc/video/video_encoder_unittest.cc | 2 +- webrtc/video_engine/vie_channel.cc | 2 +- webrtc/video_engine/vie_channel.h | 2 +- webrtc/video_engine/vie_encoder.cc | 8 +- webrtc/video_engine/vie_encoder.h | 3 +- webrtc/video_engine/vie_receiver.cc | 2 +- webrtc/video_engine/vie_sync_module.cc | 2 +- 133 files changed, 1423 insertions(+), 420 deletions(-) rename webrtc/modules/video_coding/{main/source => }/codec_database.cc (99%) rename webrtc/modules/video_coding/{main/source => }/codec_database.h (93%) rename webrtc/modules/video_coding/{main/source => }/codec_timer.cc (97%) rename webrtc/modules/video_coding/{main/source => }/codec_timer.h (100%) rename webrtc/modules/video_coding/{main/source => }/content_metrics_processing.cc (96%) rename webrtc/modules/video_coding/{main/source => }/content_metrics_processing.h (100%) rename webrtc/modules/video_coding/{main/source => }/decoding_state.cc (97%) rename webrtc/modules/video_coding/{main/source => }/decoding_state.h (100%) rename webrtc/modules/video_coding/{main/source => }/decoding_state_unittest.cc (99%) rename webrtc/modules/video_coding/{main/source => }/encoded_frame.cc (96%) rename webrtc/modules/video_coding/{main/source => }/encoded_frame.h (96%) rename webrtc/modules/video_coding/{main/source => }/fec_tables_xor.h (99%) rename webrtc/modules/video_coding/{main/source => }/frame_buffer.cc (99%) rename webrtc/modules/video_coding/{main/source => }/frame_buffer.h (84%) rename webrtc/modules/video_coding/{main/source => }/generic_decoder.cc (96%) rename webrtc/modules/video_coding/{main/source => }/generic_decoder.h (85%) rename webrtc/modules/video_coding/{main/source => }/generic_encoder.cc (98%) rename webrtc/modules/video_coding/{main/source => }/generic_encoder.h (96%) create mode 100644 webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h create mode 100644 webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h create mode 100644 webrtc/modules/video_coding/include/video_codec_interface.h create mode 100644 webrtc/modules/video_coding/include/video_coding.h create mode 100644 webrtc/modules/video_coding/include/video_coding_defines.h create mode 100644 webrtc/modules/video_coding/include/video_error_codes.h rename webrtc/modules/video_coding/{main/source => }/inter_frame_delay.cc (98%) rename webrtc/modules/video_coding/{main/source => }/inter_frame_delay.h (100%) rename webrtc/modules/video_coding/{main/source => }/internal_defines.h (89%) rename webrtc/modules/video_coding/{main/source => }/jitter_buffer.cc (98%) rename webrtc/modules/video_coding/{main/source => }/jitter_buffer.h (96%) rename webrtc/modules/video_coding/{main/source => }/jitter_buffer_common.h (100%) rename webrtc/modules/video_coding/{main/source => }/jitter_buffer_unittest.cc (99%) rename webrtc/modules/video_coding/{main/source => }/jitter_estimator.cc (98%) rename webrtc/modules/video_coding/{main/source => }/jitter_estimator.h (99%) rename webrtc/modules/video_coding/{main/source => }/jitter_estimator_tests.cc (98%) delete mode 100644 webrtc/modules/video_coding/main/source/OWNERS rename webrtc/modules/video_coding/{main/source => }/media_opt_util.cc (98%) rename webrtc/modules/video_coding/{main/source => }/media_opt_util.h (98%) rename webrtc/modules/video_coding/{main/source => }/media_optimization.cc (99%) rename webrtc/modules/video_coding/{main/source => }/media_optimization.h (94%) rename webrtc/modules/video_coding/{main/source => }/media_optimization_unittest.cc (98%) rename webrtc/modules/video_coding/{main/source => }/nack_fec_tables.h (85%) rename webrtc/modules/video_coding/{main/source => }/packet.cc (98%) rename webrtc/modules/video_coding/{main/source => }/packet.h (96%) rename webrtc/modules/video_coding/{main/source => }/qm_select.cc (99%) rename webrtc/modules/video_coding/{main/source => }/qm_select.h (100%) rename webrtc/modules/video_coding/{main/source => }/qm_select_data.h (96%) rename webrtc/modules/video_coding/{main/source => }/qm_select_unittest.cc (99%) rename webrtc/modules/video_coding/{main/source => }/receiver.cc (97%) rename webrtc/modules/video_coding/{main/source => }/receiver.h (84%) rename webrtc/modules/video_coding/{main/source => }/receiver_unittest.cc (98%) rename webrtc/modules/video_coding/{main/source => }/rtt_filter.cc (97%) rename webrtc/modules/video_coding/{main/source => }/rtt_filter.h (100%) rename webrtc/modules/video_coding/{main/source => }/session_info.cc (99%) rename webrtc/modules/video_coding/{main/source => }/session_info.h (95%) rename webrtc/modules/video_coding/{main/source => }/session_info_unittest.cc (99%) rename webrtc/modules/video_coding/{main => }/test/plotJitterEstimate.m (100%) rename webrtc/modules/video_coding/{main => }/test/plotReceiveTrace.m (100%) rename webrtc/modules/video_coding/{main => }/test/plotTimingTest.m (100%) rename webrtc/modules/video_coding/{main => }/test/receiver_tests.h (86%) rename webrtc/modules/video_coding/{main => }/test/release_test.h (72%) rename webrtc/modules/video_coding/{main => }/test/rtp_player.cc (98%) rename webrtc/modules/video_coding/{main => }/test/rtp_player.h (97%) rename webrtc/modules/video_coding/{main/source => }/test/stream_generator.cc (95%) rename webrtc/modules/video_coding/{main/source => }/test/stream_generator.h (85%) rename webrtc/modules/video_coding/{main => }/test/subfigure.m (100%) rename webrtc/modules/video_coding/{main => }/test/test_util.cc (96%) rename webrtc/modules/video_coding/{main => }/test/test_util.h (94%) rename webrtc/modules/video_coding/{main => }/test/tester_main.cc (94%) rename webrtc/modules/video_coding/{main => }/test/vcm_payload_sink_factory.cc (97%) rename webrtc/modules/video_coding/{main => }/test/vcm_payload_sink_factory.h (84%) rename webrtc/modules/video_coding/{main => }/test/video_rtp_play.cc (95%) rename webrtc/modules/video_coding/{main => }/test/video_source.h (98%) rename webrtc/modules/video_coding/{main/source => }/timestamp_map.cc (96%) rename webrtc/modules/video_coding/{main/source => }/timestamp_map.h (100%) rename webrtc/modules/video_coding/{main/source => }/timing.cc (97%) rename webrtc/modules/video_coding/{main/source => }/timing.h (95%) rename webrtc/modules/video_coding/{main/source => }/timing_unittest.cc (95%) rename webrtc/modules/video_coding/{main/source => }/video_coding_impl.cc (97%) rename webrtc/modules/video_coding/{main/source => }/video_coding_impl.h (93%) rename webrtc/modules/video_coding/{main/source => }/video_coding_robustness_unittest.cc (96%) rename webrtc/modules/video_coding/{main/source => }/video_receiver.cc (98%) rename webrtc/modules/video_coding/{main/source => }/video_receiver_unittest.cc (95%) rename webrtc/modules/video_coding/{main/source => }/video_sender.cc (98%) rename webrtc/modules/video_coding/{main/source => }/video_sender_unittest.cc (97%) diff --git a/talk/media/webrtc/fakewebrtcvideoengine.h b/talk/media/webrtc/fakewebrtcvideoengine.h index 8e4c7c87f8..e0d4db52f8 100644 --- a/talk/media/webrtc/fakewebrtcvideoengine.h +++ b/talk/media/webrtc/fakewebrtcvideoengine.h @@ -41,7 +41,7 @@ #include "webrtc/base/gunit.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/thread_annotations.h" -#include "webrtc/modules/video_coding/codecs/interface/video_error_codes.h" +#include "webrtc/modules/video_coding/include/video_error_codes.h" #include "webrtc/video_decoder.h" #include "webrtc/video_encoder.h" diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index cf78b12710..7e4556bf33 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -283,20 +283,20 @@ 'video_coding/codecs/vp8/simulcast_unittest.cc', 'video_coding/codecs/vp8/simulcast_unittest.h', 'video_coding/codecs/vp9/screenshare_layers_unittest.cc', - 'video_coding/main/interface/mock/mock_vcm_callbacks.h', - 'video_coding/main/source/decoding_state_unittest.cc', - 'video_coding/main/source/jitter_buffer_unittest.cc', - 'video_coding/main/source/jitter_estimator_tests.cc', - 'video_coding/main/source/media_optimization_unittest.cc', - 'video_coding/main/source/receiver_unittest.cc', - 'video_coding/main/source/session_info_unittest.cc', - 'video_coding/main/source/timing_unittest.cc', - 'video_coding/main/source/video_coding_robustness_unittest.cc', - 'video_coding/main/source/video_receiver_unittest.cc', - 'video_coding/main/source/video_sender_unittest.cc', - 'video_coding/main/source/qm_select_unittest.cc', - 'video_coding/main/source/test/stream_generator.cc', - 'video_coding/main/source/test/stream_generator.h', + 'video_coding/include/mock/mock_vcm_callbacks.h', + 'video_coding/decoding_state_unittest.cc', + 'video_coding/jitter_buffer_unittest.cc', + 'video_coding/jitter_estimator_tests.cc', + 'video_coding/media_optimization_unittest.cc', + 'video_coding/receiver_unittest.cc', + 'video_coding/session_info_unittest.cc', + 'video_coding/timing_unittest.cc', + 'video_coding/video_coding_robustness_unittest.cc', + 'video_coding/video_receiver_unittest.cc', + 'video_coding/video_sender_unittest.cc', + 'video_coding/qm_select_unittest.cc', + 'video_coding/test/stream_generator.cc', + 'video_coding/test/stream_generator.h', 'video_coding/utility/quality_scaler_unittest.cc', 'video_processing/main/test/unit_test/brightness_detection_test.cc', 'video_processing/main/test/unit_test/content_metrics_test.cc', diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn index 05fc57b00d..609675f4e0 100644 --- a/webrtc/modules/video_coding/BUILD.gn +++ b/webrtc/modules/video_coding/BUILD.gn @@ -10,57 +10,57 @@ import("../../build/webrtc.gni") source_set("video_coding") { sources = [ - "main/interface/video_coding.h", - "main/interface/video_coding_defines.h", - "main/source/codec_database.cc", - "main/source/codec_database.h", - "main/source/codec_timer.cc", - "main/source/codec_timer.h", - "main/source/content_metrics_processing.cc", - "main/source/content_metrics_processing.h", - "main/source/decoding_state.cc", - "main/source/decoding_state.h", - "main/source/encoded_frame.cc", - "main/source/encoded_frame.h", - "main/source/fec_tables_xor.h", - "main/source/frame_buffer.cc", - "main/source/frame_buffer.h", - "main/source/generic_decoder.cc", - "main/source/generic_decoder.h", - "main/source/generic_encoder.cc", - "main/source/generic_encoder.h", - "main/source/inter_frame_delay.cc", - "main/source/inter_frame_delay.h", - "main/source/internal_defines.h", - "main/source/jitter_buffer.cc", - "main/source/jitter_buffer.h", - "main/source/jitter_buffer_common.h", - "main/source/jitter_estimator.cc", - "main/source/jitter_estimator.h", - "main/source/media_opt_util.cc", - "main/source/media_opt_util.h", - "main/source/media_optimization.cc", - "main/source/media_optimization.h", - "main/source/nack_fec_tables.h", - "main/source/packet.cc", - "main/source/packet.h", - "main/source/qm_select.cc", - "main/source/qm_select.h", - "main/source/qm_select_data.h", - "main/source/receiver.cc", - "main/source/receiver.h", - "main/source/rtt_filter.cc", - "main/source/rtt_filter.h", - "main/source/session_info.cc", - "main/source/session_info.h", - "main/source/timestamp_map.cc", - "main/source/timestamp_map.h", - "main/source/timing.cc", - "main/source/timing.h", - "main/source/video_coding_impl.cc", - "main/source/video_coding_impl.h", - "main/source/video_receiver.cc", - "main/source/video_sender.cc", + "codec_database.cc", + "codec_database.h", + "codec_timer.cc", + "codec_timer.h", + "content_metrics_processing.cc", + "content_metrics_processing.h", + "decoding_state.cc", + "decoding_state.h", + "encoded_frame.cc", + "encoded_frame.h", + "fec_tables_xor.h", + "frame_buffer.cc", + "frame_buffer.h", + "generic_decoder.cc", + "generic_decoder.h", + "generic_encoder.cc", + "generic_encoder.h", + "include/video_coding.h", + "include/video_coding_defines.h", + "inter_frame_delay.cc", + "inter_frame_delay.h", + "internal_defines.h", + "jitter_buffer.cc", + "jitter_buffer.h", + "jitter_buffer_common.h", + "jitter_estimator.cc", + "jitter_estimator.h", + "media_opt_util.cc", + "media_opt_util.h", + "media_optimization.cc", + "media_optimization.h", + "nack_fec_tables.h", + "packet.cc", + "packet.h", + "qm_select.cc", + "qm_select.h", + "qm_select_data.h", + "receiver.cc", + "receiver.h", + "rtt_filter.cc", + "rtt_filter.h", + "session_info.cc", + "session_info.h", + "timestamp_map.cc", + "timestamp_map.h", + "timing.cc", + "timing.h", + "video_coding_impl.cc", + "video_coding_impl.h", + "video_receiver.cc", + "video_sender.cc", ] configs += [ "../..:common_config" ] diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/codec_database.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/codec_database.cc rename to webrtc/modules/video_coding/codec_database.cc index 7aa2a76798..d3e2ce4565 100644 --- a/webrtc/modules/video_coding/main/source/codec_database.cc +++ b/webrtc/modules/video_coding/codec_database.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/codec_database.h" +#include "webrtc/modules/video_coding/codec_database.h" #include @@ -27,7 +27,7 @@ #ifdef VIDEOCODEC_VP9 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #endif -#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/internal_defines.h" namespace { const size_t kDefaultPayloadSize = 1440; diff --git a/webrtc/modules/video_coding/main/source/codec_database.h b/webrtc/modules/video_coding/codec_database.h similarity index 93% rename from webrtc/modules/video_coding/main/source/codec_database.h rename to webrtc/modules/video_coding/codec_database.h index 93aa9c3ba8..132e30f3b1 100644 --- a/webrtc/modules/video_coding/main/source/codec_database.h +++ b/webrtc/modules/video_coding/codec_database.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_CODEC_DATABASE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_CODEC_DATABASE_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ +#define WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ #include #include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/generic_decoder.h" -#include "webrtc/modules/video_coding/main/source/generic_encoder.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/generic_decoder.h" +#include "webrtc/modules/video_coding/generic_encoder.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -181,4 +181,4 @@ class VCMCodecDataBase { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_CODEC_DATABASE_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_ diff --git a/webrtc/modules/video_coding/main/source/codec_timer.cc b/webrtc/modules/video_coding/codec_timer.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/codec_timer.cc rename to webrtc/modules/video_coding/codec_timer.cc index 57985c71e7..e987594ead 100644 --- a/webrtc/modules/video_coding/main/source/codec_timer.cc +++ b/webrtc/modules/video_coding/codec_timer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/codec_timer.h" +#include "webrtc/modules/video_coding/codec_timer.h" #include diff --git a/webrtc/modules/video_coding/main/source/codec_timer.h b/webrtc/modules/video_coding/codec_timer.h similarity index 100% rename from webrtc/modules/video_coding/main/source/codec_timer.h rename to webrtc/modules/video_coding/codec_timer.h diff --git a/webrtc/modules/video_coding/codecs/h264/include/h264.h b/webrtc/modules/video_coding/codecs/h264/include/h264.h index 3f52839a6c..50ca57c1c9 100644 --- a/webrtc/modules/video_coding/codecs/h264/include/h264.h +++ b/webrtc/modules/video_coding/codecs/h264/include/h264.h @@ -23,7 +23,7 @@ #endif // defined(WEBRTC_IOS) || defined(WEBRTC_MAC) -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/i420/include/i420.h b/webrtc/modules/video_coding/codecs/i420/include/i420.h index 8990ccf878..165eff691c 100644 --- a/webrtc/modules/video_coding/codecs/i420/include/i420.h +++ b/webrtc/modules/video_coding/codecs/i420/include/i420.h @@ -13,7 +13,7 @@ #include -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h index b3af479421..69a9375704 100644 --- a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h @@ -8,13 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ + +#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; use video_coding/include") #include #include "testing/gmock/include/gmock/gmock.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -74,4 +76,4 @@ class MockVideoDecoder : public VideoDecoder { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ 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 1e7de1f16b..a7bf62fdad 100644 --- a/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h @@ -8,14 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H +#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ + +#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; use video_coding/include") #include #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/interface/video_error_codes.h" +#include "webrtc/modules/video_coding/include/video_error_codes.h" #include "webrtc/typedefs.h" #include "webrtc/video_decoder.h" #include "webrtc/video_encoder.h" @@ -98,4 +100,4 @@ struct CodecSpecificInfo } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_CODEC_INTERFACE_H +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ diff --git a/webrtc/modules/video_coding/codecs/interface/video_error_codes.h b/webrtc/modules/video_coding/codecs/interface/video_error_codes.h index 28e5a32d43..38924dc113 100644 --- a/webrtc/modules/video_coding/codecs/interface/video_error_codes.h +++ b/webrtc/modules/video_coding/codecs/interface/video_error_codes.h @@ -8,8 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H -#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H +#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ + +#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; use video_coding/include") // NOTE: in sync with video_coding_module_defines.h @@ -29,4 +31,4 @@ #define WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE -13 #define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14 -#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_VIDEO_ERROR_CODES_H +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h index 16a9dc22ef..dfad2e9f61 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h @@ -13,7 +13,7 @@ #include -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/testsupport/packet_reader.h" diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc index ace7bc0507..2f9d30e49e 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc @@ -13,7 +13,7 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" #include "webrtc/test/testsupport/unittest_utils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h index 582d903343..6b2180ccda 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -16,7 +16,7 @@ #include "webrtc/base/checks.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" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/stats.h" #include "webrtc/system_wrappers/include/tick_util.h" diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index d95cc48d6d..c1fd78e61e 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -12,13 +12,13 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc index 88b5467f1f..7dec809ef8 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -10,10 +10,10 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/test/testsupport/mock/mock_frame_reader.h" #include "webrtc/test/testsupport/mock/mock_frame_writer.h" #include "webrtc/test/testsupport/packet_reader.h" diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc index 22be5a83cc..8bc6e5faa9 100644 --- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc +++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc @@ -26,7 +26,7 @@ #include "webrtc/modules/video_coding/codecs/test/stats.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc index 47f0cf38ce..a47dae0d3f 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc @@ -14,7 +14,7 @@ #include #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" #include "vpx/vpx_encoder.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc index 34121cbcf6..b7a6b66849 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc @@ -10,7 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" #include "vpx/vpx_encoder.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/include/vp8.h b/webrtc/modules/video_coding/codecs/vp8/include/vp8.h index f5dae471d2..ab22db358f 100644 --- a/webrtc/modules/video_coding/codecs/vp8/include/vp8.h +++ b/webrtc/modules/video_coding/codecs/vp8/include/vp8.h @@ -13,7 +13,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_H_ -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/realtime_temporal_layers.cc b/webrtc/modules/video_coding/codecs/vp8/realtime_temporal_layers.cc index 15b5af9200..7ecc07d1ef 100644 --- a/webrtc/modules/video_coding/codecs/vp8/realtime_temporal_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/realtime_temporal_layers.cc @@ -12,7 +12,7 @@ #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc index 0fbb2a6c40..88380c6d28 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc @@ -14,7 +14,7 @@ #include "webrtc/base/checks.h" #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc index 628e336568..74e725a55c 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc @@ -12,7 +12,7 @@ #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" #include "webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc index 218b5e2d1a..b88ac2efbf 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc @@ -11,7 +11,7 @@ #include #include "testing/gmock/include/gmock/gmock.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h" #include "webrtc/modules/video_coding/codecs/vp8/vp8_factory.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h index 2577badd83..90f6449c07 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h @@ -18,7 +18,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/include/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" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index db8961744a..605b4d16fe 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -25,7 +25,7 @@ #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h index 6c8043f5d8..78dfdb5047 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.h @@ -23,7 +23,7 @@ #include "vpx/vp8dx.h" #include "webrtc/common_video/include/i420_buffer_pool.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/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" diff --git a/webrtc/modules/video_coding/codecs/vp9/include/vp9.h b/webrtc/modules/video_coding/codecs/vp9/include/vp9.h index cd77f72dcb..1d241ed52f 100644 --- a/webrtc/modules/video_coding/codecs/vp9/include/vp9.h +++ b/webrtc/modules/video_coding/codecs/vp9/include/vp9.h @@ -12,7 +12,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_H_ -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/content_metrics_processing.cc b/webrtc/modules/video_coding/content_metrics_processing.cc similarity index 96% rename from webrtc/modules/video_coding/main/source/content_metrics_processing.cc rename to webrtc/modules/video_coding/content_metrics_processing.cc index ae5e633316..3b94098b87 100644 --- a/webrtc/modules/video_coding/main/source/content_metrics_processing.cc +++ b/webrtc/modules/video_coding/content_metrics_processing.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/content_metrics_processing.h" +#include "webrtc/modules/video_coding/content_metrics_processing.h" #include #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" namespace webrtc { ////////////////////////////////// diff --git a/webrtc/modules/video_coding/main/source/content_metrics_processing.h b/webrtc/modules/video_coding/content_metrics_processing.h similarity index 100% rename from webrtc/modules/video_coding/main/source/content_metrics_processing.h rename to webrtc/modules/video_coding/content_metrics_processing.h diff --git a/webrtc/modules/video_coding/main/source/decoding_state.cc b/webrtc/modules/video_coding/decoding_state.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/decoding_state.cc rename to webrtc/modules/video_coding/decoding_state.cc index bdc632933c..0e021ad213 100644 --- a/webrtc/modules/video_coding/main/source/decoding_state.cc +++ b/webrtc/modules/video_coding/decoding_state.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/decoding_state.h" +#include "webrtc/modules/video_coding/decoding_state.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/frame_buffer.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/frame_buffer.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/decoding_state.h b/webrtc/modules/video_coding/decoding_state.h similarity index 100% rename from webrtc/modules/video_coding/main/source/decoding_state.h rename to webrtc/modules/video_coding/decoding_state.h diff --git a/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc b/webrtc/modules/video_coding/decoding_state_unittest.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/decoding_state_unittest.cc rename to webrtc/modules/video_coding/decoding_state_unittest.cc index 9dfb3133aa..5f5d0d38b1 100644 --- a/webrtc/modules/video_coding/main/source/decoding_state_unittest.cc +++ b/webrtc/modules/video_coding/decoding_state_unittest.cc @@ -12,10 +12,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/decoding_state.h" -#include "webrtc/modules/video_coding/main/source/frame_buffer.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/decoding_state.h" +#include "webrtc/modules/video_coding/frame_buffer.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/encoded_frame.cc b/webrtc/modules/video_coding/encoded_frame.cc similarity index 96% rename from webrtc/modules/video_coding/main/source/encoded_frame.cc rename to webrtc/modules/video_coding/encoded_frame.cc index 89a8777013..611007afeb 100644 --- a/webrtc/modules/video_coding/main/source/encoded_frame.cc +++ b/webrtc/modules/video_coding/encoded_frame.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/generic_encoder.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/generic_encoder.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/encoded_frame.h b/webrtc/modules/video_coding/encoded_frame.h similarity index 96% rename from webrtc/modules/video_coding/main/source/encoded_frame.h rename to webrtc/modules/video_coding/encoded_frame.h index 28c56433a2..f311db2e68 100644 --- a/webrtc/modules/video_coding/main/source/encoded_frame.h +++ b/webrtc/modules/video_coding/encoded_frame.h @@ -16,8 +16,8 @@ #include "webrtc/common_types.h" #include "webrtc/common_video/include/video_image.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/fec_tables_xor.h b/webrtc/modules/video_coding/fec_tables_xor.h similarity index 99% rename from webrtc/modules/video_coding/main/source/fec_tables_xor.h rename to webrtc/modules/video_coding/fec_tables_xor.h index 28c67b4565..8121a3503a 100644 --- a/webrtc/modules/video_coding/main/source/fec_tables_xor.h +++ b/webrtc/modules/video_coding/fec_tables_xor.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_SOURCE_FEC_TABLES_XOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_SOURCE_FEC_TABLES_XOR_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_FEC_TABLES_XOR_H_ +#define WEBRTC_MODULES_VIDEO_CODING_FEC_TABLES_XOR_H_ // This is a private header for media_opt_util.cc. // It should not be included by other files. @@ -6478,4 +6478,4 @@ static const unsigned char kCodeRateXORTable[kSizeCodeRateXORTable] = { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_FEC_TABLES_XOR_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_FEC_TABLES_XOR_H_ diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.cc b/webrtc/modules/video_coding/frame_buffer.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/frame_buffer.cc rename to webrtc/modules/video_coding/frame_buffer.cc index c03ccdf21f..012a8acbee 100644 --- a/webrtc/modules/video_coding/main/source/frame_buffer.cc +++ b/webrtc/modules/video_coding/frame_buffer.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/frame_buffer.h" +#include "webrtc/modules/video_coding/frame_buffer.h" #include #include #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.h b/webrtc/modules/video_coding/frame_buffer.h similarity index 84% rename from webrtc/modules/video_coding/main/source/frame_buffer.h rename to webrtc/modules/video_coding/frame_buffer.h index ee38a2e798..f5a707efe4 100644 --- a/webrtc/modules/video_coding/main/source/frame_buffer.h +++ b/webrtc/modules/video_coding/frame_buffer.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_FRAME_BUFFER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_FRAME_BUFFER_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ +#define WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/main/source/session_info.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/session_info.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -89,4 +89,4 @@ class VCMFrameBuffer : public VCMEncodedFrame { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_FRAME_BUFFER_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_ diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.cc b/webrtc/modules/video_coding/generic_decoder.cc similarity index 96% rename from webrtc/modules/video_coding/main/source/generic_decoder.cc rename to webrtc/modules/video_coding/generic_decoder.cc index 790bf130a1..092d0546ca 100644 --- a/webrtc/modules/video_coding/main/source/generic_decoder.cc +++ b/webrtc/modules/video_coding/generic_decoder.cc @@ -10,9 +10,9 @@ #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/generic_decoder.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/generic_decoder.h" +#include "webrtc/modules/video_coding/internal_defines.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.h b/webrtc/modules/video_coding/generic_decoder.h similarity index 85% rename from webrtc/modules/video_coding/main/source/generic_decoder.h rename to webrtc/modules/video_coding/generic_decoder.h index 7788425d44..d79b5e59f2 100644 --- a/webrtc/modules/video_coding/main/source/generic_decoder.h +++ b/webrtc/modules/video_coding/generic_decoder.h @@ -12,10 +12,10 @@ #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/timestamp_map.h" -#include "webrtc/modules/video_coding/main/source/timing.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/timestamp_map.h" +#include "webrtc/modules/video_coding/timing.h" namespace webrtc { @@ -69,25 +69,25 @@ public: ~VCMGenericDecoder(); /** - * Initialize the decoder with the information from the VideoCodec + * Initialize the decoder with the information from the VideoCodec */ int32_t InitDecode(const VideoCodec* settings, int32_t numberOfCores); /** - * Decode to a raw I420 frame, + * Decode to a raw I420 frame, * - * inputVideoBuffer reference to encoded video frame + * inputVideoBuffer reference to encoded video frame */ int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs); /** - * Free the decoder memory + * Free the decoder memory */ int32_t Release(); /** - * Reset the decoder state, prepare for a new call + * Reset the decoder state, prepare for a new call */ int32_t Reset(); diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.cc b/webrtc/modules/video_coding/generic_encoder.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/generic_encoder.cc rename to webrtc/modules/video_coding/generic_encoder.cc index c0acac5612..c8180f35a2 100644 --- a/webrtc/modules/video_coding/main/source/generic_encoder.cc +++ b/webrtc/modules/video_coding/generic_encoder.cc @@ -12,9 +12,9 @@ #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" #include "webrtc/engine_configurations.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/generic_encoder.h" -#include "webrtc/modules/video_coding/main/source/media_optimization.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/generic_encoder.h" +#include "webrtc/modules/video_coding/media_optimization.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.h b/webrtc/modules/video_coding/generic_encoder.h similarity index 96% rename from webrtc/modules/video_coding/main/source/generic_encoder.h rename to webrtc/modules/video_coding/generic_encoder.h index 3a7132860f..0d8ad50b5f 100644 --- a/webrtc/modules/video_coding/main/source/generic_encoder.h +++ b/webrtc/modules/video_coding/generic_encoder.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_ENCODER_H_ -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include diff --git a/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h b/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h new file mode 100644 index 0000000000..47b94c0ce1 --- /dev/null +++ b/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h @@ -0,0 +1,35 @@ +/* + * 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ + +#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/typedefs.h" + +namespace webrtc { + +class MockVCMFrameTypeCallback : public VCMFrameTypeCallback { + public: + MOCK_METHOD0(RequestKeyFrame, int32_t()); + MOCK_METHOD1(SliceLossIndicationRequest, + int32_t(const uint64_t pictureId)); +}; + +class MockPacketRequestCallback : public VCMPacketRequestCallback { + public: + MOCK_METHOD2(ResendPackets, int32_t(const uint16_t* sequenceNumbers, + uint16_t length)); +}; + +} // namespace webrtc + +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ diff --git a/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h new file mode 100644 index 0000000000..1eb228c052 --- /dev/null +++ b/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h @@ -0,0 +1,77 @@ +/* + * 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ + +#include + +#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/typedefs.h" + +namespace webrtc { + +class MockEncodedImageCallback : public EncodedImageCallback { + public: + MOCK_METHOD3(Encoded, int32_t(const EncodedImage& encodedImage, + const CodecSpecificInfo* codecSpecificInfo, + const RTPFragmentationHeader* fragmentation)); +}; + +class MockVideoEncoder : public VideoEncoder { + public: + MOCK_CONST_METHOD2(Version, int32_t(int8_t *version, int32_t length)); + MOCK_METHOD3(InitEncode, int32_t(const VideoCodec* codecSettings, + int32_t numberOfCores, + size_t maxPayloadSize)); + MOCK_METHOD3(Encode, + int32_t(const VideoFrame& inputImage, + const CodecSpecificInfo* codecSpecificInfo, + const std::vector* frame_types)); + MOCK_METHOD1(RegisterEncodeCompleteCallback, + int32_t(EncodedImageCallback* callback)); + MOCK_METHOD0(Release, int32_t()); + MOCK_METHOD0(Reset, int32_t()); + MOCK_METHOD2(SetChannelParameters, int32_t(uint32_t packetLoss, int64_t rtt)); + MOCK_METHOD2(SetRates, int32_t(uint32_t newBitRate, uint32_t frameRate)); + MOCK_METHOD1(SetPeriodicKeyFrames, int32_t(bool enable)); +}; + +class MockDecodedImageCallback : public DecodedImageCallback { + public: + MOCK_METHOD1(Decoded, int32_t(VideoFrame& decodedImage)); + MOCK_METHOD2(Decoded, int32_t(VideoFrame& decodedImage, + int64_t decode_time_ms)); + MOCK_METHOD1(ReceivedDecodedReferenceFrame, + int32_t(const uint64_t pictureId)); + MOCK_METHOD1(ReceivedDecodedFrame, + int32_t(const uint64_t pictureId)); +}; + +class MockVideoDecoder : public VideoDecoder { + public: + MOCK_METHOD2(InitDecode, int32_t(const VideoCodec* codecSettings, + int32_t numberOfCores)); + MOCK_METHOD5(Decode, int32_t(const EncodedImage& inputImage, + bool missingFrames, + const RTPFragmentationHeader* fragmentation, + const CodecSpecificInfo* codecSpecificInfo, + int64_t renderTimeMs)); + MOCK_METHOD1(RegisterDecodeCompleteCallback, + int32_t(DecodedImageCallback* callback)); + MOCK_METHOD0(Release, int32_t()); + MOCK_METHOD0(Reset, int32_t()); + MOCK_METHOD0(Copy, VideoDecoder*()); +}; + +} // namespace webrtc + +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ diff --git a/webrtc/modules/video_coding/include/video_codec_interface.h b/webrtc/modules/video_coding/include/video_codec_interface.h new file mode 100644 index 0000000000..787e64164e --- /dev/null +++ b/webrtc/modules/video_coding/include/video_codec_interface.h @@ -0,0 +1,101 @@ +/* + * 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ + +#include + +#include "webrtc/common_types.h" +#include "webrtc/modules/include/module_common_types.h" +#include "webrtc/modules/video_coding/include/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 +{ + +class RTPFragmentationHeader; // forward declaration + +// Note: if any pointers are added to this struct, it must be fitted +// with a copy-constructor. See below. +struct CodecSpecificInfoVP8 { + bool hasReceivedSLI; + uint8_t pictureIdSLI; + bool hasReceivedRPSI; + uint64_t pictureIdRPSI; + int16_t pictureId; // Negative value to skip pictureId. + bool nonReference; + uint8_t simulcastIdx; + uint8_t temporalIdx; + bool layerSync; + int tl0PicIdx; // Negative value to skip tl0PicIdx. + int8_t keyIdx; // Negative value to skip keyIdx. +}; + +struct CodecSpecificInfoVP9 { + bool has_received_sli; + uint8_t picture_id_sli; + bool has_received_rpsi; + uint64_t picture_id_rpsi; + int16_t picture_id; // Negative value to skip pictureId. + + bool inter_pic_predicted; // This layer frame is dependent on previously + // coded frame(s). + bool flexible_mode; + bool ss_data_available; + + int tl0_pic_idx; // Negative value to skip tl0PicIdx. + uint8_t temporal_idx; + uint8_t spatial_idx; + bool temporal_up_switch; + bool inter_layer_predicted; // Frame is dependent on directly lower spatial + // layer frame. + uint8_t gof_idx; + + // SS data. + size_t num_spatial_layers; // Always populated. + bool spatial_layer_resolution_present; + uint16_t width[kMaxVp9NumberOfSpatialLayers]; + uint16_t height[kMaxVp9NumberOfSpatialLayers]; + GofInfoVP9 gof; + + // Frame reference data. + uint8_t num_ref_pics; + uint8_t p_diff[kMaxVp9RefPics]; +}; + +struct CodecSpecificInfoGeneric { + uint8_t simulcast_idx; +}; + +struct CodecSpecificInfoH264 {}; + +union CodecSpecificInfoUnion { + CodecSpecificInfoGeneric generic; + CodecSpecificInfoVP8 VP8; + CodecSpecificInfoVP9 VP9; + CodecSpecificInfoH264 H264; +}; + +// Note: if any pointers are added to this struct or its sub-structs, it +// must be fitted with a copy-constructor. This is because it is copied +// in the copy-constructor of VCMEncodedFrame. +struct CodecSpecificInfo +{ + VideoCodecType codecType; + CodecSpecificInfoUnion codecSpecific; +}; + +} // namespace webrtc + +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ diff --git a/webrtc/modules/video_coding/include/video_coding.h b/webrtc/modules/video_coding/include/video_coding.h new file mode 100644 index 0000000000..f19475cc05 --- /dev/null +++ b/webrtc/modules/video_coding/include/video_coding.h @@ -0,0 +1,544 @@ +/* + * 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ + +#if defined(WEBRTC_WIN) +// This is a workaround on Windows due to the fact that some Windows +// headers define CreateEvent as a macro to either CreateEventW or CreateEventA. +// This can cause problems since we use that name as well and could +// declare them as one thing here whereas in another place a windows header +// may have been included and then implementing CreateEvent() causes compilation +// errors. So for consistency, we include the main windows header here. +#include +#endif + +#include "webrtc/modules/include/module.h" +#include "webrtc/modules/include/module_common_types.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/video_frame.h" + +namespace webrtc +{ + +class Clock; +class EncodedImageCallback; +class VideoEncoder; +class VideoDecoder; +struct CodecSpecificInfo; + +class EventFactory { + public: + virtual ~EventFactory() {} + + virtual EventWrapper* CreateEvent() = 0; +}; + +class EventFactoryImpl : public EventFactory { + public: + virtual ~EventFactoryImpl() {} + + virtual EventWrapper* CreateEvent() { + return EventWrapper::Create(); + } +}; + +// Used to indicate which decode with errors mode should be used. +enum VCMDecodeErrorMode { + kNoErrors, // Never decode with errors. Video will freeze + // if nack is disabled. + kSelectiveErrors, // Frames that are determined decodable in + // VCMSessionInfo may be decoded with missing + // packets. As not all incomplete frames will be + // decodable, video will freeze if nack is disabled. + kWithErrors // Release frames as needed. Errors may be + // introduced as some encoded frames may not be + // complete. +}; + +class VideoCodingModule : public Module +{ +public: + enum SenderNackMode { + kNackNone, + kNackAll, + kNackSelective + }; + + enum ReceiverRobustness { + kNone, + kHardNack, + kSoftNack, + kReferenceSelection + }; + + static VideoCodingModule* Create( + Clock* clock, + VideoEncoderRateObserver* encoder_rate_observer, + VCMQMSettingsCallback* qm_settings_callback); + + static VideoCodingModule* Create(Clock* clock, EventFactory* event_factory); + + static void Destroy(VideoCodingModule* module); + + // Get number of supported codecs + // + // Return value : Number of supported codecs + static uint8_t NumberOfCodecs(); + + // Get supported codec settings with using id + // + // Input: + // - listId : Id or index of the codec to look up + // - codec : Memory where the codec settings will be stored + // + // Return value : VCM_OK, on success + // VCM_PARAMETER_ERROR if codec not supported or id too high + static int32_t Codec(const uint8_t listId, VideoCodec* codec); + + // Get supported codec settings using codec type + // + // Input: + // - codecType : The codec type to get settings for + // - codec : Memory where the codec settings will be stored + // + // Return value : VCM_OK, on success + // VCM_PARAMETER_ERROR if codec not supported + static int32_t Codec(VideoCodecType codecType, VideoCodec* codec); + + /* + * Sender + */ + + // Registers a codec to be used for encoding. Calling this + // API multiple times overwrites any previously registered codecs. + // + // NOTE: Must be called on the thread that constructed the VCM instance. + // + // Input: + // - sendCodec : Settings for the codec to be registered. + // - numberOfCores : The number of cores the codec is allowed + // to use. + // - maxPayloadSize : The maximum size each payload is allowed + // to have. Usually MTU - overhead. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterSendCodec(const VideoCodec* sendCodec, + uint32_t numberOfCores, + uint32_t maxPayloadSize) = 0; + + // Get the current send codec in use. + // + // If a codec has not been set yet, the |id| property of the return value + // will be 0 and |name| empty. + // + // NOTE: This method intentionally does not hold locks and minimizes data + // copying. It must be called on the thread where the VCM was constructed. + virtual const VideoCodec& GetSendCodec() const = 0; + + // DEPRECATED: Use GetSendCodec() instead. + // + // API to get the current send codec in use. + // + // Input: + // - currentSendCodec : Address where the sendCodec will be written. + // + // Return value : VCM_OK, on success. + // < 0, on error. + // + // NOTE: The returned codec information is not guaranteed to be current when + // the call returns. This method acquires a lock that is aligned with + // video encoding, so it should be assumed to be allowed to block for + // several milliseconds. + virtual int32_t SendCodec(VideoCodec* currentSendCodec) const = 0; + + // DEPRECATED: Use GetSendCodec() instead. + // + // API to get the current send codec type + // + // Return value : Codec type, on success. + // kVideoCodecUnknown, on error or if no send codec is set + // NOTE: Same notes apply as for SendCodec() above. + virtual VideoCodecType SendCodec() const = 0; + + // Register an external encoder object. This can not be used together with + // external decoder callbacks. + // + // Input: + // - externalEncoder : Encoder object to be used for encoding frames inserted + // with the AddVideoFrame API. + // - payloadType : The payload type bound which this encoder is bound to. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder, + uint8_t payloadType, + bool internalSource = false) = 0; + + // API to get currently configured encoder target bitrate in bits/s. + // + // Return value : 0, on success. + // < 0, on error. + virtual int Bitrate(unsigned int* bitrate) const = 0; + + // API to get currently configured encoder target frame rate. + // + // Return value : 0, on success. + // < 0, on error. + virtual int FrameRate(unsigned int* framerate) const = 0; + + // Sets the parameters describing the send channel. These parameters are inputs to the + // Media Optimization inside the VCM and also specifies the target bit rate for the + // encoder. Bit rate used by NACK should already be compensated for by the user. + // + // Input: + // - target_bitrate : The target bitrate for VCM in bits/s. + // - lossRate : Fractions of lost packets the past second. + // (loss rate in percent = 100 * packetLoss / 255) + // - rtt : Current round-trip time in ms. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t SetChannelParameters(uint32_t target_bitrate, + uint8_t lossRate, + int64_t rtt) = 0; + + // Sets the parameters describing the receive channel. These parameters are inputs to the + // Media Optimization inside the VCM. + // + // Input: + // - rtt : Current round-trip time in ms. + // with the most amount available bandwidth in a conference + // scenario + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t SetReceiveChannelParameters(int64_t rtt) = 0; + + // Register a transport callback which will be called to deliver the encoded data and + // side information. + // + // Input: + // - transport : The callback object to register. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterTransportCallback(VCMPacketizationCallback* transport) = 0; + + // Register video output information callback which will be called to deliver information + // about the video stream produced by the encoder, for instance the average frame rate and + // bit rate. + // + // Input: + // - outputInformation : The callback object to register. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterSendStatisticsCallback( + VCMSendStatisticsCallback* sendStats) = 0; + + // Register a video protection callback which will be called to deliver + // the requested FEC rate and NACK status (on/off). + // + // Input: + // - protection : The callback object to register. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterProtectionCallback(VCMProtectionCallback* protection) = 0; + + // Enable or disable a video protection method. + // + // Input: + // - videoProtection : The method to enable or disable. + // - enable : True if the method should be enabled, false if + // it should be disabled. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t SetVideoProtection(VCMVideoProtection videoProtection, + bool enable) = 0; + + // Add one raw video frame to the encoder. This function does all the necessary + // processing, then decides what frame type to encode, or if the frame should be + // dropped. If the frame should be encoded it passes the frame to the encoder + // before it returns. + // + // Input: + // - videoFrame : Video frame to encode. + // - codecSpecificInfo : Extra codec information, e.g., pre-parsed in-band signaling. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t AddVideoFrame( + const VideoFrame& videoFrame, + const VideoContentMetrics* contentMetrics = NULL, + const CodecSpecificInfo* codecSpecificInfo = NULL) = 0; + + // Next frame encoded should be an intra frame (keyframe). + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t IntraFrameRequest(int stream_index) = 0; + + // Frame Dropper enable. Can be used to disable the frame dropping when the encoder + // over-uses its bit rate. This API is designed to be used when the encoded frames + // are supposed to be stored to an AVI file, or when the I420 codec is used and the + // target bit rate shouldn't affect the frame rate. + // + // Input: + // - enable : True to enable the setting, false to disable it. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t EnableFrameDropper(bool enable) = 0; + + + /* + * Receiver + */ + + // Register possible receive codecs, can be called multiple times for different codecs. + // The module will automatically switch between registered codecs depending on the + // payload type of incoming frames. The actual decoder will be created when needed. + // + // Input: + // - receiveCodec : Settings for the codec to be registered. + // - numberOfCores : Number of CPU cores that the decoder is allowed to use. + // - requireKeyFrame : Set this to true if you don't want any delta frames + // to be decoded until the first key frame has been decoded. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, + int32_t numberOfCores, + bool requireKeyFrame = false) = 0; + + // Register an externally defined decoder/renderer object. Can be a decoder only or a + // decoder coupled with a renderer. Note that RegisterReceiveCodec must be called to + // be used for decoding incoming streams. + // + // Input: + // - externalDecoder : The external decoder/renderer object. + // - payloadType : The payload type which this decoder should be + // registered to. + // - internalRenderTiming : True if the internal renderer (if any) of the decoder + // object can make sure to render at a given time in ms. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterExternalDecoder(VideoDecoder* externalDecoder, + uint8_t payloadType, + bool internalRenderTiming) = 0; + + // Register a receive callback. Will be called whenever there is a new frame ready + // for rendering. + // + // Input: + // - receiveCallback : The callback object to be used by the module when a + // frame is ready for rendering. + // De-register with a NULL pointer. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterReceiveCallback(VCMReceiveCallback* receiveCallback) = 0; + + // Register a receive statistics callback which will be called to deliver information + // about the video stream received by the receiving side of the VCM, for instance the + // average frame rate and bit rate. + // + // Input: + // - receiveStats : The callback object to register. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterReceiveStatisticsCallback( + VCMReceiveStatisticsCallback* receiveStats) = 0; + + // Register a decoder timing callback which will be called to deliver + // information about the timing of the decoder in the receiving side of the + // VCM, for instance the current and maximum frame decode latency. + // + // Input: + // - decoderTiming : The callback object to register. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterDecoderTimingCallback( + VCMDecoderTimingCallback* decoderTiming) = 0; + + // Register a frame type request callback. This callback will be called when the + // module needs to request specific frame types from the send side. + // + // Input: + // - frameTypeCallback : The callback object to be used by the module when + // requesting a specific type of frame from the send side. + // De-register with a NULL pointer. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t RegisterFrameTypeCallback( + VCMFrameTypeCallback* frameTypeCallback) = 0; + + // Registers a callback which is called whenever the receive side of the VCM + // encounters holes in the packet sequence and needs packets to be retransmitted. + // + // Input: + // - callback : The callback to be registered in the VCM. + // + // Return value : VCM_OK, on success. + // <0, on error. + virtual int32_t RegisterPacketRequestCallback( + VCMPacketRequestCallback* callback) = 0; + + // Waits for the next frame in the jitter buffer to become complete + // (waits no longer than maxWaitTimeMs), then passes it to the decoder for decoding. + // Should be called as often as possible to get the most out of the decoder. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t Decode(uint16_t maxWaitTimeMs = 200) = 0; + + // Registers a callback which conveys the size of the render buffer. + virtual int RegisterRenderBufferSizeCallback( + VCMRenderBufferSizeCallback* callback) = 0; + + // Reset the decoder state to the initial state. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t ResetDecoder() = 0; + + // API to get the codec which is currently used for decoding by the module. + // + // Input: + // - currentReceiveCodec : Settings for the codec to be registered. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const = 0; + + // API to get the codec type currently used for decoding by the module. + // + // Return value : codecy type, on success. + // kVideoCodecUnknown, on error or if no receive codec is registered + virtual VideoCodecType ReceiveCodec() const = 0; + + // Insert a parsed packet into the receiver side of the module. Will be placed in the + // jitter buffer waiting for the frame to become complete. Returns as soon as the packet + // has been placed in the jitter buffer. + // + // Input: + // - incomingPayload : Payload of the packet. + // - payloadLength : Length of the payload. + // - rtpInfo : The parsed header. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t IncomingPacket(const uint8_t* incomingPayload, + size_t payloadLength, + const WebRtcRTPHeader& rtpInfo) = 0; + + // Minimum playout delay (Used for lip-sync). This is the minimum delay required + // to sync with audio. Not included in VideoCodingModule::Delay() + // Defaults to 0 ms. + // + // Input: + // - minPlayoutDelayMs : Additional delay in ms. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t SetMinimumPlayoutDelay(uint32_t minPlayoutDelayMs) = 0; + + // Set the time required by the renderer to render a frame. + // + // Input: + // - timeMS : The time in ms required by the renderer to render a frame. + // + // Return value : VCM_OK, on success. + // < 0, on error. + virtual int32_t SetRenderDelay(uint32_t timeMS) = 0; + + // The total delay desired by the VCM. Can be less than the minimum + // delay set with SetMinimumPlayoutDelay. + // + // Return value : Total delay in ms, on success. + // < 0, on error. + virtual int32_t Delay() const = 0; + + // Returns the number of packets discarded by the jitter buffer due to being + // too late. This can include duplicated packets which arrived after the + // frame was sent to the decoder. Therefore packets which were prematurely + // NACKed will be counted. + virtual uint32_t DiscardedPackets() const = 0; + + + // Robustness APIs + + // Set the receiver robustness mode. The mode decides how the receiver + // responds to losses in the stream. The type of counter-measure (soft or + // hard NACK, dual decoder, RPS, etc.) is selected through the + // robustnessMode parameter. The errorMode parameter decides if it is + // allowed to display frames corrupted by losses. Note that not all + // combinations of the two parameters are feasible. An error will be + // returned for invalid combinations. + // Input: + // - robustnessMode : selected robustness mode. + // - errorMode : selected error mode. + // + // Return value : VCM_OK, on success; + // < 0, on error. + virtual int SetReceiverRobustnessMode(ReceiverRobustness robustnessMode, + VCMDecodeErrorMode errorMode) = 0; + + // Set the decode error mode. The mode decides which errors (if any) are + // allowed in decodable frames. Note that setting decode_error_mode to + // anything other than kWithErrors without enabling nack will cause + // long-term freezes (resulting from frequent key frame requests) if + // packet loss occurs. + virtual void SetDecodeErrorMode(VCMDecodeErrorMode decode_error_mode) = 0; + + // Sets the maximum number of sequence numbers that we are allowed to NACK + // and the oldest sequence number that we will consider to NACK. If a + // sequence number older than |max_packet_age_to_nack| is missing + // a key frame will be requested. A key frame will also be requested if the + // time of incomplete or non-continuous frames in the jitter buffer is above + // |max_incomplete_time_ms|. + virtual void SetNackSettings(size_t max_nack_list_size, + int max_packet_age_to_nack, + int max_incomplete_time_ms) = 0; + + // Setting a desired delay to the VCM receiver. Video rendering will be + // delayed by at least desired_delay_ms. + virtual int SetMinReceiverDelay(int desired_delay_ms) = 0; + + // Lets the sender suspend video when the rate drops below + // |threshold_bps|, and turns back on when the rate goes back up above + // |threshold_bps| + |window_bps|. + virtual void SuspendBelowMinBitrate() = 0; + + // Returns true if SuspendBelowMinBitrate is engaged and the video has been + // suspended due to bandwidth limitations; otherwise false. + virtual bool VideoSuspended() const = 0; + + virtual void RegisterPreDecodeImageCallback( + EncodedImageCallback* observer) = 0; + virtual void RegisterPostEncodeImageCallback( + EncodedImageCallback* post_encode_callback) = 0; + // Releases pending decode calls, permitting faster thread shutdown. + virtual void TriggerDecoderShutdown() = 0; +}; + +} // namespace webrtc + +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ diff --git a/webrtc/modules/video_coding/include/video_coding_defines.h b/webrtc/modules/video_coding/include/video_coding_defines.h new file mode 100644 index 0000000000..1b721441e2 --- /dev/null +++ b/webrtc/modules/video_coding/include/video_coding_defines.h @@ -0,0 +1,201 @@ +/* + * 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ + +#include "webrtc/modules/include/module_common_types.h" +#include "webrtc/typedefs.h" +#include "webrtc/video_frame.h" + +namespace webrtc { + +// Error codes +#define VCM_FRAME_NOT_READY 3 +#define VCM_REQUEST_SLI 2 +#define VCM_MISSING_CALLBACK 1 +#define VCM_OK 0 +#define VCM_GENERAL_ERROR -1 +#define VCM_LEVEL_EXCEEDED -2 +#define VCM_MEMORY -3 +#define VCM_PARAMETER_ERROR -4 +#define VCM_UNKNOWN_PAYLOAD -5 +#define VCM_CODEC_ERROR -6 +#define VCM_UNINITIALIZED -7 +#define VCM_NO_CODEC_REGISTERED -8 +#define VCM_JITTER_BUFFER_ERROR -9 +#define VCM_OLD_PACKET_ERROR -10 +#define VCM_NO_FRAME_DECODED -11 +#define VCM_ERROR_REQUEST_SLI -12 +#define VCM_NOT_IMPLEMENTED -20 + +enum { kDefaultStartBitrateKbps = 300 }; + +enum VCMVideoProtection { + kProtectionNone, + kProtectionNack, + kProtectionFEC, + kProtectionNackFEC, +}; + +enum VCMTemporalDecimation { + kBitrateOverUseDecimation, +}; + +struct VCMFrameCount { + uint32_t numKeyFrames; + uint32_t numDeltaFrames; +}; + +// Callback class used for sending data ready to be packetized +class VCMPacketizationCallback { + public: + virtual int32_t SendData(uint8_t payloadType, + const EncodedImage& encoded_image, + const RTPFragmentationHeader& fragmentationHeader, + const RTPVideoHeader* rtpVideoHdr) = 0; + + protected: + virtual ~VCMPacketizationCallback() { + } +}; + +// Callback class used for passing decoded frames which are ready to be rendered. +class VCMReceiveCallback { + public: + virtual int32_t FrameToRender(VideoFrame& videoFrame) = 0; + virtual int32_t ReceivedDecodedReferenceFrame( + const uint64_t pictureId) { + return -1; + } + // Called when the current receive codec changes. + virtual void OnIncomingPayloadType(int payload_type) {} + + protected: + virtual ~VCMReceiveCallback() { + } +}; + +// Callback class used for informing the user of the bit rate and frame rate produced by the +// encoder. +class VCMSendStatisticsCallback { + public: + virtual int32_t SendStatistics(const uint32_t bitRate, + const uint32_t frameRate) = 0; + + protected: + virtual ~VCMSendStatisticsCallback() { + } +}; + +// Callback class used for informing the user of the incoming bit rate and frame rate. +class VCMReceiveStatisticsCallback { + public: + virtual void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) = 0; + virtual void OnDiscardedPacketsUpdated(int discarded_packets) = 0; + virtual void OnFrameCountsUpdated(const FrameCounts& frame_counts) = 0; + + protected: + virtual ~VCMReceiveStatisticsCallback() { + } +}; + +// Callback class used for informing the user of decode timing info. +class VCMDecoderTimingCallback { + public: + virtual void OnDecoderTiming(int decode_ms, + int max_decode_ms, + int current_delay_ms, + int target_delay_ms, + int jitter_buffer_ms, + int min_playout_delay_ms, + int render_delay_ms) = 0; + + protected: + virtual ~VCMDecoderTimingCallback() {} +}; + +// Callback class used for telling the user about how to configure the FEC, +// and the rates sent the last second is returned to the VCM. +class VCMProtectionCallback { + public: + virtual int ProtectionRequest(const FecProtectionParams* delta_params, + const FecProtectionParams* key_params, + uint32_t* sent_video_rate_bps, + uint32_t* sent_nack_rate_bps, + uint32_t* sent_fec_rate_bps) = 0; + + protected: + virtual ~VCMProtectionCallback() { + } +}; + +class VideoEncoderRateObserver { + public: + virtual ~VideoEncoderRateObserver() {} + virtual void OnSetRates(uint32_t bitrate_bps, int framerate) = 0; +}; + +// Callback class used for telling the user about what frame type needed to continue decoding. +// Typically a key frame when the stream has been corrupted in some way. +class VCMFrameTypeCallback { + public: + virtual int32_t RequestKeyFrame() = 0; + virtual int32_t SliceLossIndicationRequest( + const uint64_t pictureId) { + return -1; + } + + protected: + virtual ~VCMFrameTypeCallback() { + } +}; + +// Callback class used for telling the user about which packet sequence numbers are currently +// missing and need to be resent. +class VCMPacketRequestCallback { + public: + virtual int32_t ResendPackets(const uint16_t* sequenceNumbers, + uint16_t length) = 0; + + protected: + virtual ~VCMPacketRequestCallback() { + } +}; + +// Callback used to inform the user of the the desired resolution +// as subscribed by Media Optimization (Quality Modes) +class VCMQMSettingsCallback { + public: + virtual int32_t SetVideoQMSettings(const uint32_t frameRate, + const uint32_t width, + const uint32_t height) = 0; + + virtual void SetTargetFramerate(int frame_rate) = 0; + + protected: + virtual ~VCMQMSettingsCallback() { + } +}; + +// Callback class used for telling the user about the size (in time) of the +// render buffer, that is the size in time of the complete continuous frames. +class VCMRenderBufferSizeCallback { + public: + virtual void RenderBufferSizeMs(int buffer_size_ms) = 0; + + protected: + virtual ~VCMRenderBufferSizeCallback() { + } +}; + +} // namespace webrtc + +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ diff --git a/webrtc/modules/video_coding/include/video_error_codes.h b/webrtc/modules/video_coding/include/video_error_codes.h new file mode 100644 index 0000000000..0e38937c31 --- /dev/null +++ b/webrtc/modules/video_coding/include/video_error_codes.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2011 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 WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ + +// NOTE: in sync with video_coding_module_defines.h + +// Define return values + +#define WEBRTC_VIDEO_CODEC_REQUEST_SLI 2 +#define WEBRTC_VIDEO_CODEC_NO_OUTPUT 1 +#define WEBRTC_VIDEO_CODEC_OK 0 +#define WEBRTC_VIDEO_CODEC_ERROR -1 +#define WEBRTC_VIDEO_CODEC_LEVEL_EXCEEDED -2 +#define WEBRTC_VIDEO_CODEC_MEMORY -3 +#define WEBRTC_VIDEO_CODEC_ERR_PARAMETER -4 +#define WEBRTC_VIDEO_CODEC_ERR_SIZE -5 +#define WEBRTC_VIDEO_CODEC_TIMEOUT -6 +#define WEBRTC_VIDEO_CODEC_UNINITIALIZED -7 +#define WEBRTC_VIDEO_CODEC_ERR_REQUEST_SLI -12 +#define WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE -13 +#define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14 + +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_ERROR_CODES_H_ diff --git a/webrtc/modules/video_coding/main/source/inter_frame_delay.cc b/webrtc/modules/video_coding/inter_frame_delay.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/inter_frame_delay.cc rename to webrtc/modules/video_coding/inter_frame_delay.cc index 4786917e16..97cdd8ac5b 100644 --- a/webrtc/modules/video_coding/main/source/inter_frame_delay.cc +++ b/webrtc/modules/video_coding/inter_frame_delay.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" +#include "webrtc/modules/video_coding/inter_frame_delay.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/inter_frame_delay.h b/webrtc/modules/video_coding/inter_frame_delay.h similarity index 100% rename from webrtc/modules/video_coding/main/source/inter_frame_delay.h rename to webrtc/modules/video_coding/inter_frame_delay.h diff --git a/webrtc/modules/video_coding/main/source/internal_defines.h b/webrtc/modules/video_coding/internal_defines.h similarity index 89% rename from webrtc/modules/video_coding/main/source/internal_defines.h rename to webrtc/modules/video_coding/internal_defines.h index adc940f20d..253752c1f5 100644 --- a/webrtc/modules/video_coding/main/source/internal_defines.h +++ b/webrtc/modules/video_coding/internal_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ #include "webrtc/typedefs.h" @@ -65,4 +65,4 @@ inline int32_t VCMId(const int32_t vcmId, const int32_t receiverId = 0) } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_INTERNAL_DEFINES_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_INTERNAL_DEFINES_H_ diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/jitter_buffer.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/jitter_buffer.cc rename to webrtc/modules/video_coding/jitter_buffer.cc index b5314de885..15195dbfdc 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc +++ b/webrtc/modules/video_coding/jitter_buffer.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" +#include "webrtc/modules/video_coding/jitter_buffer.h" #include @@ -18,13 +18,13 @@ #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/frame_buffer.h" -#include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/main/source/jitter_estimator.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/frame_buffer.h" +#include "webrtc/modules/video_coding/inter_frame_delay.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/jitter_estimator.h" +#include "webrtc/modules/video_coding/packet.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.h b/webrtc/modules/video_coding/jitter_buffer.h similarity index 96% rename from webrtc/modules/video_coding/main/source/jitter_buffer.h rename to webrtc/modules/video_coding/jitter_buffer.h index 228e786cd5..1d5edeb913 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.h +++ b/webrtc/modules/video_coding/jitter_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_JITTER_BUFFER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_JITTER_BUFFER_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ +#define WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ #include #include @@ -19,12 +19,12 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/modules/video_coding/main/source/decoding_state.h" -#include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" -#include "webrtc/modules/video_coding/main/source/jitter_estimator.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/video_coding/decoding_state.h" +#include "webrtc/modules/video_coding/inter_frame_delay.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/jitter_estimator.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" @@ -391,4 +391,4 @@ class VCMJitterBuffer { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_JITTER_BUFFER_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer_common.h b/webrtc/modules/video_coding/jitter_buffer_common.h similarity index 100% rename from webrtc/modules/video_coding/main/source/jitter_buffer_common.h rename to webrtc/modules/video_coding/jitter_buffer_common.h diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/jitter_buffer_unittest.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc rename to webrtc/modules/video_coding/jitter_buffer_unittest.cc index 4bb85cf16f..52151ea9aa 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc +++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc @@ -13,12 +13,12 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/main/source/frame_buffer.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" -#include "webrtc/modules/video_coding/main/source/media_opt_util.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/source/test/stream_generator.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/frame_buffer.h" +#include "webrtc/modules/video_coding/jitter_buffer.h" +#include "webrtc/modules/video_coding/media_opt_util.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/test/stream_generator.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/test/histogram.h" diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator.cc b/webrtc/modules/video_coding/jitter_estimator.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/jitter_estimator.cc rename to webrtc/modules/video_coding/jitter_estimator.cc index 5894c88d72..151166577c 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator.cc +++ b/webrtc/modules/video_coding/jitter_estimator.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/jitter_estimator.h" -#include "webrtc/modules/video_coding/main/source/rtt_filter.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/jitter_estimator.h" +#include "webrtc/modules/video_coding/rtt_filter.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/field_trial.h" diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator.h b/webrtc/modules/video_coding/jitter_estimator.h similarity index 99% rename from webrtc/modules/video_coding/main/source/jitter_estimator.h rename to webrtc/modules/video_coding/jitter_estimator.h index 46ed67ba1d..580e114458 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator.h +++ b/webrtc/modules/video_coding/jitter_estimator.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_ #include "webrtc/base/rollingaccumulator.h" -#include "webrtc/modules/video_coding/main/source/rtt_filter.h" +#include "webrtc/modules/video_coding/rtt_filter.h" #include "webrtc/typedefs.h" namespace webrtc diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc b/webrtc/modules/video_coding/jitter_estimator_tests.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc rename to webrtc/modules/video_coding/jitter_estimator_tests.cc index c69c4bcdad..3d46ce2bcd 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc +++ b/webrtc/modules/video_coding/jitter_estimator_tests.cc @@ -7,7 +7,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/jitter_estimator.h" +#include "webrtc/modules/video_coding/jitter_estimator.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h b/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h index 302d4a3a13..05a2939bd5 100644 --- a/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h +++ b/webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h @@ -8,11 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_INTERFACE_MOCK_MOCK_VCM_CALLBACKS_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_INTERFACE_MOCK_MOCK_VCM_CALLBACKS_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ + +#pragma message("WARNING: video_coding/main/interface is DEPRECATED; use video_coding/include") #include "testing/gmock/include/gmock/gmock.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -32,4 +34,4 @@ class MockPacketRequestCallback : public VCMPacketRequestCallback { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_INTERFACE_MOCK_MOCK_VCM_CALLBACKS_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ diff --git a/webrtc/modules/video_coding/main/interface/video_coding.h b/webrtc/modules/video_coding/main/interface/video_coding.h index 94a7b19198..e4b012e02e 100644 --- a/webrtc/modules/video_coding/main/interface/video_coding.h +++ b/webrtc/modules/video_coding/main/interface/video_coding.h @@ -8,8 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_INTERFACE_VIDEO_CODING_H_ -#define WEBRTC_MODULES_INTERFACE_VIDEO_CODING_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ + +#pragma message("WARNING: video_coding/main/interface is DEPRECATED; use video_coding/include") #if defined(WEBRTC_WIN) // This is a workaround on Windows due to the fact that some Windows @@ -23,7 +25,7 @@ #include "webrtc/modules/include/module.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/video_frame.h" @@ -541,4 +543,4 @@ public: } // namespace webrtc -#endif // WEBRTC_MODULES_INTERFACE_VIDEO_CODING_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ 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 c35bbc1f73..833a355fc2 100644 --- a/webrtc/modules/video_coding/main/interface/video_coding_defines.h +++ b/webrtc/modules/video_coding/main/interface/video_coding_defines.h @@ -8,8 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ -#define WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ +#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ + +#pragma message("WARNING: video_coding/main/interface is DEPRECATED; use video_coding/include") #include "webrtc/modules/include/module_common_types.h" #include "webrtc/typedefs.h" @@ -198,4 +200,4 @@ class VCMRenderBufferSizeCallback { } // namespace webrtc -#endif // WEBRTC_MODULES_INTERFACE_VIDEO_CODING_DEFINES_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ diff --git a/webrtc/modules/video_coding/main/source/OWNERS b/webrtc/modules/video_coding/main/source/OWNERS deleted file mode 100644 index 3ee6b4bf5f..0000000000 --- a/webrtc/modules/video_coding/main/source/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ - -# These are for the common case of adding or renaming files. If you're doing -# structural changes, please get a review from a reviewer in this file. -per-file *.gyp=* -per-file *.gypi=* diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.cc b/webrtc/modules/video_coding/media_opt_util.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/media_opt_util.cc rename to webrtc/modules/video_coding/media_opt_util.cc index 002958ecad..9bd722696a 100644 --- a/webrtc/modules/video_coding/main/source/media_opt_util.cc +++ b/webrtc/modules/video_coding/media_opt_util.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/media_opt_util.h" +#include "webrtc/modules/video_coding/media_opt_util.h" #include #include @@ -17,9 +17,9 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/modules/video_coding/main/source/fec_tables_xor.h" -#include "webrtc/modules/video_coding/main/source/nack_fec_tables.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/video_coding/fec_tables_xor.h" +#include "webrtc/modules/video_coding/nack_fec_tables.h" namespace webrtc { // Max value of loss rates in off-line model diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.h b/webrtc/modules/video_coding/media_opt_util.h similarity index 98% rename from webrtc/modules/video_coding/main/source/media_opt_util.h rename to webrtc/modules/video_coding/media_opt_util.h index 2085bbcde9..9be7167869 100644 --- a/webrtc/modules/video_coding/main/source/media_opt_util.h +++ b/webrtc/modules/video_coding/media_opt_util.h @@ -16,8 +16,8 @@ #include "webrtc/base/exp_filter.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/qm_select.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/main/source/media_optimization.cc b/webrtc/modules/video_coding/media_optimization.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/media_optimization.cc rename to webrtc/modules/video_coding/media_optimization.cc index bf0b144237..bc01b54843 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.cc +++ b/webrtc/modules/video_coding/media_optimization.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/media_optimization.h" +#include "webrtc/modules/video_coding/media_optimization.h" #include "webrtc/base/logging.h" -#include "webrtc/modules/video_coding/main/source/content_metrics_processing.h" -#include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/content_metrics_processing.h" +#include "webrtc/modules/video_coding/qm_select.h" #include "webrtc/modules/video_coding/utility/include/frame_dropper.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/video_coding/main/source/media_optimization.h b/webrtc/modules/video_coding/media_optimization.h similarity index 94% rename from webrtc/modules/video_coding/main/source/media_optimization.h rename to webrtc/modules/video_coding/media_optimization.h index 6ea5c01412..7bbdd3779b 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.h +++ b/webrtc/modules/video_coding/media_optimization.h @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_MEDIA_OPTIMIZATION_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_MEDIA_OPTIMIZATION_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ +#define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ #include #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/media_opt_util.h" -#include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/media_opt_util.h" +#include "webrtc/modules/video_coding/qm_select.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { @@ -177,4 +177,4 @@ class MediaOptimization { } // namespace media_optimization } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_MEDIA_OPTIMIZATION_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_ diff --git a/webrtc/modules/video_coding/main/source/media_optimization_unittest.cc b/webrtc/modules/video_coding/media_optimization_unittest.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/media_optimization_unittest.cc rename to webrtc/modules/video_coding/media_optimization_unittest.cc index be528d9932..f8bc5335c9 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization_unittest.cc +++ b/webrtc/modules/video_coding/media_optimization_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/main/source/media_optimization.h" +#include "webrtc/modules/video_coding/media_optimization.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/nack_fec_tables.h b/webrtc/modules/video_coding/nack_fec_tables.h similarity index 85% rename from webrtc/modules/video_coding/main/source/nack_fec_tables.h rename to webrtc/modules/video_coding/nack_fec_tables.h index b82bb1b4ba..54265ce232 100644 --- a/webrtc/modules/video_coding/main/source/nack_fec_tables.h +++ b/webrtc/modules/video_coding/nack_fec_tables.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_SOURCE_NACK_FEC_TABLES_H_ -#define WEBRTC_MODULES_VIDEO_CODING_SOURCE_NACK_FEC_TABLES_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ +#define WEBRTC_MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ namespace webrtc { @@ -123,4 +123,4 @@ const uint16_t VCMNackFecTable[100] = { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_NACK_FEC_TABLES_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_NACK_FEC_TABLES_H_ diff --git a/webrtc/modules/video_coding/main/source/packet.cc b/webrtc/modules/video_coding/packet.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/packet.cc rename to webrtc/modules/video_coding/packet.cc index 34384483be..282215df56 100644 --- a/webrtc/modules/video_coding/main/source/packet.cc +++ b/webrtc/modules/video_coding/packet.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/packet.h" #include diff --git a/webrtc/modules/video_coding/main/source/packet.h b/webrtc/modules/video_coding/packet.h similarity index 96% rename from webrtc/modules/video_coding/main/source/packet.h rename to webrtc/modules/video_coding/packet.h index 040cc88e72..9f00e8ef38 100644 --- a/webrtc/modules/video_coding/main/source/packet.h +++ b/webrtc/modules/video_coding/packet.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_VIDEO_CODING_PACKET_H_ #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/qm_select.cc b/webrtc/modules/video_coding/qm_select.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/qm_select.cc rename to webrtc/modules/video_coding/qm_select.cc index be8fcfc122..fb261fe1ee 100644 --- a/webrtc/modules/video_coding/main/source/qm_select.cc +++ b/webrtc/modules/video_coding/qm_select.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/qm_select.h" #include #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/qm_select_data.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/qm_select_data.h" #include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/qm_select.h b/webrtc/modules/video_coding/qm_select.h similarity index 100% rename from webrtc/modules/video_coding/main/source/qm_select.h rename to webrtc/modules/video_coding/qm_select.h diff --git a/webrtc/modules/video_coding/main/source/qm_select_data.h b/webrtc/modules/video_coding/qm_select_data.h similarity index 96% rename from webrtc/modules/video_coding/main/source/qm_select_data.h rename to webrtc/modules/video_coding/qm_select_data.h index dc6bce4811..3f7028ac0d 100644 --- a/webrtc/modules/video_coding/main/source/qm_select_data.h +++ b/webrtc/modules/video_coding/qm_select_data.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_SOURCE_QM_SELECT_DATA_H_ -#define WEBRTC_MODULES_VIDEO_CODING_SOURCE_QM_SELECT_DATA_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_DATA_H_ +#define WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_DATA_H_ /*************************************************************** *QMSelectData.h @@ -224,4 +224,4 @@ const float kSpatialErrVertVsHoriz = 0.1f; // percentage to favor H over V } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_SOURCE_QM_SELECT_DATA_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_QM_SELECT_DATA_H_ diff --git a/webrtc/modules/video_coding/main/source/qm_select_unittest.cc b/webrtc/modules/video_coding/qm_select_unittest.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/qm_select_unittest.cc rename to webrtc/modules/video_coding/qm_select_unittest.cc index 518df34716..61a12ef3e1 100644 --- a/webrtc/modules/video_coding/main/source/qm_select_unittest.cc +++ b/webrtc/modules/video_coding/qm_select_unittest.cc @@ -16,7 +16,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/qm_select.h" +#include "webrtc/modules/video_coding/qm_select.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver.cc b/webrtc/modules/video_coding/receiver.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/receiver.cc rename to webrtc/modules/video_coding/receiver.cc index e57ff1e49f..5314b30767 100644 --- a/webrtc/modules/video_coding/main/source/receiver.cc +++ b/webrtc/modules/video_coding/receiver.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/receiver.h" +#include "webrtc/modules/video_coding/receiver.h" #include @@ -16,9 +16,9 @@ #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/media_opt_util.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/media_opt_util.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver.h b/webrtc/modules/video_coding/receiver.h similarity index 84% rename from webrtc/modules/video_coding/main/source/receiver.h rename to webrtc/modules/video_coding/receiver.h index e2515d438f..bc2e026fef 100644 --- a/webrtc/modules/video_coding/main/source/receiver.h +++ b/webrtc/modules/video_coding/receiver.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_RECEIVER_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_RECEIVER_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ +#define WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ -#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/source/timing.h" +#include "webrtc/modules/video_coding/jitter_buffer.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/timing.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" namespace webrtc { @@ -89,4 +89,4 @@ class VCMReceiver { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_RECEIVER_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ diff --git a/webrtc/modules/video_coding/main/source/receiver_unittest.cc b/webrtc/modules/video_coding/receiver_unittest.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/receiver_unittest.cc rename to webrtc/modules/video_coding/receiver_unittest.cc index 359b241e72..82345c8d59 100644 --- a/webrtc/modules/video_coding/main/source/receiver_unittest.cc +++ b/webrtc/modules/video_coding/receiver_unittest.cc @@ -14,11 +14,11 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/checks.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/source/receiver.h" -#include "webrtc/modules/video_coding/main/source/test/stream_generator.h" -#include "webrtc/modules/video_coding/main/source/timing.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/receiver.h" +#include "webrtc/modules/video_coding/test/stream_generator.h" +#include "webrtc/modules/video_coding/timing.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/modules/video_coding/main/source/rtt_filter.cc b/webrtc/modules/video_coding/rtt_filter.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/rtt_filter.cc rename to webrtc/modules/video_coding/rtt_filter.cc index 5742e8fa89..30a6946f97 100644 --- a/webrtc/modules/video_coding/main/source/rtt_filter.cc +++ b/webrtc/modules/video_coding/rtt_filter.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/rtt_filter.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/rtt_filter.h" #include #include diff --git a/webrtc/modules/video_coding/main/source/rtt_filter.h b/webrtc/modules/video_coding/rtt_filter.h similarity index 100% rename from webrtc/modules/video_coding/main/source/rtt_filter.h rename to webrtc/modules/video_coding/rtt_filter.h diff --git a/webrtc/modules/video_coding/main/source/session_info.cc b/webrtc/modules/video_coding/session_info.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/session_info.cc rename to webrtc/modules/video_coding/session_info.cc index a8d3d585c6..bd204deee6 100644 --- a/webrtc/modules/video_coding/main/source/session_info.cc +++ b/webrtc/modules/video_coding/session_info.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/session_info.h" +#include "webrtc/modules/video_coding/session_info.h" #include "webrtc/base/logging.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/packet.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/session_info.h b/webrtc/modules/video_coding/session_info.h similarity index 95% rename from webrtc/modules/video_coding/main/source/session_info.h rename to webrtc/modules/video_coding/session_info.h index 37e9768660..b2f1df08bb 100644 --- a/webrtc/modules/video_coding/main/source/session_info.h +++ b/webrtc/modules/video_coding/session_info.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_SESSION_INFO_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_SESSION_INFO_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_SESSION_INFO_H_ +#define WEBRTC_MODULES_VIDEO_CODING_SESSION_INFO_H_ #include #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/packet.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/packet.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -169,4 +169,4 @@ class VCMSessionInfo { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_SESSION_INFO_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_SESSION_INFO_H_ diff --git a/webrtc/modules/video_coding/main/source/session_info_unittest.cc b/webrtc/modules/video_coding/session_info_unittest.cc similarity index 99% rename from webrtc/modules/video_coding/main/source/session_info_unittest.cc rename to webrtc/modules/video_coding/session_info_unittest.cc index 8d57287c93..490604843f 100644 --- a/webrtc/modules/video_coding/main/source/session_info_unittest.cc +++ b/webrtc/modules/video_coding/session_info_unittest.cc @@ -12,8 +12,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/source/session_info.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/session_info.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/test/plotJitterEstimate.m b/webrtc/modules/video_coding/test/plotJitterEstimate.m similarity index 100% rename from webrtc/modules/video_coding/main/test/plotJitterEstimate.m rename to webrtc/modules/video_coding/test/plotJitterEstimate.m diff --git a/webrtc/modules/video_coding/main/test/plotReceiveTrace.m b/webrtc/modules/video_coding/test/plotReceiveTrace.m similarity index 100% rename from webrtc/modules/video_coding/main/test/plotReceiveTrace.m rename to webrtc/modules/video_coding/test/plotReceiveTrace.m diff --git a/webrtc/modules/video_coding/main/test/plotTimingTest.m b/webrtc/modules/video_coding/test/plotTimingTest.m similarity index 100% rename from webrtc/modules/video_coding/main/test/plotTimingTest.m rename to webrtc/modules/video_coding/test/plotTimingTest.m diff --git a/webrtc/modules/video_coding/main/test/receiver_tests.h b/webrtc/modules/video_coding/test/receiver_tests.h similarity index 86% rename from webrtc/modules/video_coding/main/test/receiver_tests.h rename to webrtc/modules/video_coding/test/receiver_tests.h index 5335c998e7..9b9b377e08 100644 --- a/webrtc/modules/video_coding/main/test/receiver_tests.h +++ b/webrtc/modules/video_coding/test/receiver_tests.h @@ -14,9 +14,9 @@ #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/modules/video_coding/main/test/video_source.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/test/test_util.h" +#include "webrtc/modules/video_coding/test/video_source.h" #include "webrtc/typedefs.h" #include diff --git a/webrtc/modules/video_coding/main/test/release_test.h b/webrtc/modules/video_coding/test/release_test.h similarity index 72% rename from webrtc/modules/video_coding/main/test/release_test.h rename to webrtc/modules/video_coding/test/release_test.h index e90dcaef01..ab9b2159d9 100644 --- a/webrtc/modules/video_coding/main/test/release_test.h +++ b/webrtc/modules/video_coding/test/release_test.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef RELEASE_TEST_H -#define RELEASE_TEST_H +#ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_RELEASE_TEST_H_ +#define WEBRTC_MODULES_VIDEO_CODING_TEST_RELEASE_TEST_H_ int ReleaseTest(); int ReleaseTestPart2(); -#endif +#endif // WEBRTC_MODULES_VIDEO_CODING_TEST_RELEASE_TEST_H_ diff --git a/webrtc/modules/video_coding/main/test/rtp_player.cc b/webrtc/modules/video_coding/test/rtp_player.cc similarity index 98% rename from webrtc/modules/video_coding/main/test/rtp_player.cc rename to webrtc/modules/video_coding/test/rtp_player.cc index 5fed3b18c3..c9af450f57 100644 --- a/webrtc/modules/video_coding/main/test/rtp_player.cc +++ b/webrtc/modules/video_coding/test/rtp_player.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/test/rtp_player.h" +#include "webrtc/modules/video_coding/test/rtp_player.h" #include @@ -19,8 +19,8 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/rtp_file_reader.h" diff --git a/webrtc/modules/video_coding/main/test/rtp_player.h b/webrtc/modules/video_coding/test/rtp_player.h similarity index 97% rename from webrtc/modules/video_coding/main/test/rtp_player.h rename to webrtc/modules/video_coding/test/rtp_player.h index a2ecadd615..c227f1c589 100644 --- a/webrtc/modules/video_coding/main/test/rtp_player.h +++ b/webrtc/modules/video_coding/test/rtp_player.h @@ -15,7 +15,7 @@ #include #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" namespace webrtc { class Clock; diff --git a/webrtc/modules/video_coding/main/source/test/stream_generator.cc b/webrtc/modules/video_coding/test/stream_generator.cc similarity index 95% rename from webrtc/modules/video_coding/main/source/test/stream_generator.cc rename to webrtc/modules/video_coding/test/stream_generator.cc index b365d96dc0..304fe2e013 100644 --- a/webrtc/modules/video_coding/main/source/test/stream_generator.cc +++ b/webrtc/modules/video_coding/test/stream_generator.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/test/stream_generator.h" +#include "webrtc/modules/video_coding/test/stream_generator.h" #include #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/test/stream_generator.h b/webrtc/modules/video_coding/test/stream_generator.h similarity index 85% rename from webrtc/modules/video_coding/main/source/test/stream_generator.h rename to webrtc/modules/video_coding/test/stream_generator.h index 7902d16706..36b26db92e 100644 --- a/webrtc/modules/video_coding/main/source/test/stream_generator.h +++ b/webrtc/modules/video_coding/test/stream_generator.h @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TEST_STREAM_GENERATOR_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TEST_STREAM_GENERATOR_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ +#define WEBRTC_MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ #include -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -69,4 +69,4 @@ class StreamGenerator { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TEST_STREAM_GENERATOR_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_ diff --git a/webrtc/modules/video_coding/main/test/subfigure.m b/webrtc/modules/video_coding/test/subfigure.m similarity index 100% rename from webrtc/modules/video_coding/main/test/subfigure.m rename to webrtc/modules/video_coding/test/subfigure.m diff --git a/webrtc/modules/video_coding/main/test/test_util.cc b/webrtc/modules/video_coding/test/test_util.cc similarity index 96% rename from webrtc/modules/video_coding/main/test/test_util.cc rename to webrtc/modules/video_coding/test/test_util.cc index cd858da288..fc670ada93 100644 --- a/webrtc/modules/video_coding/main/test/test_util.cc +++ b/webrtc/modules/video_coding/test/test_util.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include #include @@ -17,7 +17,7 @@ #include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" +#include "webrtc/modules/video_coding/internal_defines.h" #include "webrtc/test/testsupport/fileutils.h" CmdArgs::CmdArgs() diff --git a/webrtc/modules/video_coding/main/test/test_util.h b/webrtc/modules/video_coding/test/test_util.h similarity index 94% rename from webrtc/modules/video_coding/main/test/test_util.h rename to webrtc/modules/video_coding/test/test_util.h index 68b2c23b77..30f337d2bb 100644 --- a/webrtc/modules/video_coding/main/test/test_util.h +++ b/webrtc/modules/video_coding/test/test_util.h @@ -19,7 +19,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/system_wrappers/include/event_wrapper.h" enum { kMaxNackListSize = 250 }; @@ -83,4 +83,4 @@ class CmdArgs { std::string outputFile; }; -#endif +#endif // WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ diff --git a/webrtc/modules/video_coding/main/test/tester_main.cc b/webrtc/modules/video_coding/test/tester_main.cc similarity index 94% rename from webrtc/modules/video_coding/main/test/tester_main.cc rename to webrtc/modules/video_coding/test/tester_main.cc index 2885f00bd5..0184ff18cc 100644 --- a/webrtc/modules/video_coding/main/test/tester_main.cc +++ b/webrtc/modules/video_coding/test/tester_main.cc @@ -13,8 +13,8 @@ #include #include "gflags/gflags.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/test/receiver_tests.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/test/receiver_tests.h" #include "webrtc/test/testsupport/fileutils.h" DEFINE_string(codec, "VP8", "Codec to use (VP8 or I420)."); diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc similarity index 97% rename from webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc rename to webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc index d930805bb4..26a0d019bf 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc +++ b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h" +#include "webrtc/modules/video_coding/test/vcm_payload_sink_factory.h" #include #include #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.h similarity index 84% rename from webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h rename to webrtc/modules/video_coding/test/vcm_payload_sink_factory.h index ec94bdc382..1de1cd6975 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h +++ b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.h @@ -8,13 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ +#ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_ +#define WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_ + #include #include #include "webrtc/base/constructormagic.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/modules/video_coding/main/test/rtp_player.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/video_coding/test/rtp_player.h" class NullEventFactory; @@ -61,3 +64,5 @@ class VcmPayloadSinkFactory : public PayloadSinkFactoryInterface { }; } // namespace rtpplayer } // namespace webrtc + +#endif // WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_ diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play.cc b/webrtc/modules/video_coding/test/video_rtp_play.cc similarity index 95% rename from webrtc/modules/video_coding/main/test/video_rtp_play.cc rename to webrtc/modules/video_coding/test/video_rtp_play.cc index 8460601bf5..0a6b7d13e8 100644 --- a/webrtc/modules/video_coding/main/test/video_rtp_play.cc +++ b/webrtc/modules/video_coding/test/video_rtp_play.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/test/receiver_tests.h" -#include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h" +#include "webrtc/modules/video_coding/test/receiver_tests.h" +#include "webrtc/modules/video_coding/test/vcm_payload_sink_factory.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/main/test/video_source.h b/webrtc/modules/video_coding/test/video_source.h similarity index 98% rename from webrtc/modules/video_coding/main/test/video_source.h rename to webrtc/modules/video_coding/test/video_source.h index 05deb4a39b..6b878e55d2 100644 --- a/webrtc/modules/video_coding/main/test/video_source.h +++ b/webrtc/modules/video_coding/test/video_source.h @@ -34,7 +34,7 @@ enum VideoSize kW432p, // 768*432 = 331 776 k4SIF, // 704*480 = 337 920 kW448p, // 768*448 = 344 064 - kNTSC, // 720*480 = 345 600 + kNTSC, // 720*480 = 345 600 kFW448p, // 800*448 = 358 400 kWVGA, // 800*480 = 384 000 k4CIF, // 704*576 = 405 504 diff --git a/webrtc/modules/video_coding/main/source/timestamp_map.cc b/webrtc/modules/video_coding/timestamp_map.cc similarity index 96% rename from webrtc/modules/video_coding/main/source/timestamp_map.cc rename to webrtc/modules/video_coding/timestamp_map.cc index d11f9491ea..14b16cd60c 100644 --- a/webrtc/modules/video_coding/main/source/timestamp_map.cc +++ b/webrtc/modules/video_coding/timestamp_map.cc @@ -12,7 +12,7 @@ #include #include "webrtc/modules/include/module_common_types.h" -#include "webrtc/modules/video_coding/main/source/timestamp_map.h" +#include "webrtc/modules/video_coding/timestamp_map.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timestamp_map.h b/webrtc/modules/video_coding/timestamp_map.h similarity index 100% rename from webrtc/modules/video_coding/main/source/timestamp_map.h rename to webrtc/modules/video_coding/timestamp_map.h diff --git a/webrtc/modules/video_coding/main/source/timing.cc b/webrtc/modules/video_coding/timing.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/timing.cc rename to webrtc/modules/video_coding/timing.cc index d8ab96d844..f1a127a85d 100644 --- a/webrtc/modules/video_coding/main/source/timing.cc +++ b/webrtc/modules/video_coding/timing.cc @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_coding/main/source/timing.h" +#include "webrtc/modules/video_coding/timing.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/jitter_buffer_common.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/timestamp_extrapolator.h" diff --git a/webrtc/modules/video_coding/main/source/timing.h b/webrtc/modules/video_coding/timing.h similarity index 95% rename from webrtc/modules/video_coding/main/source/timing.h rename to webrtc/modules/video_coding/timing.h index 41dec8ce7f..46681a3a07 100644 --- a/webrtc/modules/video_coding/main/source/timing.h +++ b/webrtc/modules/video_coding/timing.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ -#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ +#ifndef WEBRTC_MODULES_VIDEO_CODING_TIMING_H_ +#define WEBRTC_MODULES_VIDEO_CODING_TIMING_H_ #include "webrtc/base/thread_annotations.h" -#include "webrtc/modules/video_coding/main/source/codec_timer.h" +#include "webrtc/modules/video_coding/codec_timer.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" @@ -124,4 +124,4 @@ class VCMTiming { }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ +#endif // WEBRTC_MODULES_VIDEO_CODING_TIMING_H_ diff --git a/webrtc/modules/video_coding/main/source/timing_unittest.cc b/webrtc/modules/video_coding/timing_unittest.cc similarity index 95% rename from webrtc/modules/video_coding/main/source/timing_unittest.cc rename to webrtc/modules/video_coding/timing_unittest.cc index 8ab2aed92e..02bd88ddb2 100644 --- a/webrtc/modules/video_coding/main/source/timing_unittest.cc +++ b/webrtc/modules/video_coding/timing_unittest.cc @@ -14,10 +14,10 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/modules/video_coding/main/source/timing.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/timing.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/video_coding/utility/include/qp_parser.h b/webrtc/modules/video_coding/utility/include/qp_parser.h index 805b37b45c..0b644ef61c 100644 --- a/webrtc/modules/video_coding/utility/include/qp_parser.h +++ b/webrtc/modules/video_coding/utility/include/qp_parser.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_QP_PARSER_H_ #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QP_PARSER_H_ -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/encoded_frame.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_coding.gypi b/webrtc/modules/video_coding/video_coding.gypi index b292e0ae31..438d8f1c1f 100644 --- a/webrtc/modules/video_coding/video_coding.gypi +++ b/webrtc/modules/video_coding/video_coding.gypi @@ -22,61 +22,61 @@ ], 'sources': [ # interfaces - 'main/interface/video_coding.h', - 'main/interface/video_coding_defines.h', + 'include/video_coding.h', + 'include/video_coding_defines.h', # headers - 'main/source/codec_database.h', - 'main/source/codec_timer.h', - 'main/source/content_metrics_processing.h', - 'main/source/decoding_state.h', - 'main/source/encoded_frame.h', - 'main/source/fec_tables_xor.h', - 'main/source/frame_buffer.h', - 'main/source/generic_decoder.h', - 'main/source/generic_encoder.h', - 'main/source/inter_frame_delay.h', - 'main/source/internal_defines.h', - 'main/source/jitter_buffer.h', - 'main/source/jitter_buffer_common.h', - 'main/source/jitter_estimator.h', - 'main/source/media_opt_util.h', - 'main/source/media_optimization.h', - 'main/source/nack_fec_tables.h', - 'main/source/packet.h', - 'main/source/qm_select_data.h', - 'main/source/qm_select.h', - 'main/source/receiver.h', - 'main/source/rtt_filter.h', - 'main/source/session_info.h', - 'main/source/timestamp_map.h', - 'main/source/timing.h', - 'main/source/video_coding_impl.h', + 'codec_database.h', + 'codec_timer.h', + 'content_metrics_processing.h', + 'decoding_state.h', + 'encoded_frame.h', + 'fec_tables_xor.h', + 'frame_buffer.h', + 'generic_decoder.h', + 'generic_encoder.h', + 'inter_frame_delay.h', + 'internal_defines.h', + 'jitter_buffer.h', + 'jitter_buffer_common.h', + 'jitter_estimator.h', + 'media_opt_util.h', + 'media_optimization.h', + 'nack_fec_tables.h', + 'packet.h', + 'qm_select_data.h', + 'qm_select.h', + 'receiver.h', + 'rtt_filter.h', + 'session_info.h', + 'timestamp_map.h', + 'timing.h', + 'video_coding_impl.h', # sources - 'main/source/codec_database.cc', - 'main/source/codec_timer.cc', - 'main/source/content_metrics_processing.cc', - 'main/source/decoding_state.cc', - 'main/source/encoded_frame.cc', - 'main/source/frame_buffer.cc', - 'main/source/generic_decoder.cc', - 'main/source/generic_encoder.cc', - 'main/source/inter_frame_delay.cc', - 'main/source/jitter_buffer.cc', - 'main/source/jitter_estimator.cc', - 'main/source/media_opt_util.cc', - 'main/source/media_optimization.cc', - 'main/source/packet.cc', - 'main/source/qm_select.cc', - 'main/source/receiver.cc', - 'main/source/rtt_filter.cc', - 'main/source/session_info.cc', - 'main/source/timestamp_map.cc', - 'main/source/timing.cc', - 'main/source/video_coding_impl.cc', - 'main/source/video_sender.cc', - 'main/source/video_receiver.cc', + 'codec_database.cc', + 'codec_timer.cc', + 'content_metrics_processing.cc', + 'decoding_state.cc', + 'encoded_frame.cc', + 'frame_buffer.cc', + 'generic_decoder.cc', + 'generic_encoder.cc', + 'inter_frame_delay.cc', + 'jitter_buffer.cc', + 'jitter_estimator.cc', + 'media_opt_util.cc', + 'media_optimization.cc', + 'packet.cc', + 'qm_select.cc', + 'receiver.cc', + 'rtt_filter.cc', + 'session_info.cc', + 'timestamp_map.cc', + 'timing.cc', + 'video_coding_impl.cc', + 'video_sender.cc', + 'video_receiver.cc', ], # source # TODO(jschuh): Bug 1348: fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/video_coding_impl.cc rename to webrtc/modules/video_coding/video_coding_impl.cc index a0fc5f3fe2..6d1151afca 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.cc +++ b/webrtc/modules/video_coding/video_coding_impl.cc @@ -10,11 +10,11 @@ #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/source/video_coding_impl.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/jitter_buffer.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/video_coding_impl.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h similarity index 93% rename from webrtc/modules/video_coding/main/source/video_coding_impl.h rename to webrtc/modules/video_coding/video_coding_impl.h index 57f38dad13..cbe7ac6066 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.h +++ b/webrtc/modules/video_coding/video_coding_impl.h @@ -11,20 +11,20 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ #define WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include #include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_checker.h" -#include "webrtc/modules/video_coding/main/source/codec_database.h" -#include "webrtc/modules/video_coding/main/source/frame_buffer.h" -#include "webrtc/modules/video_coding/main/source/generic_decoder.h" -#include "webrtc/modules/video_coding/main/source/generic_encoder.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" -#include "webrtc/modules/video_coding/main/source/media_optimization.h" -#include "webrtc/modules/video_coding/main/source/receiver.h" -#include "webrtc/modules/video_coding/main/source/timing.h" +#include "webrtc/modules/video_coding/codec_database.h" +#include "webrtc/modules/video_coding/frame_buffer.h" +#include "webrtc/modules/video_coding/generic_decoder.h" +#include "webrtc/modules/video_coding/generic_encoder.h" +#include "webrtc/modules/video_coding/jitter_buffer.h" +#include "webrtc/modules/video_coding/media_optimization.h" +#include "webrtc/modules/video_coding/receiver.h" +#include "webrtc/modules/video_coding/timing.h" #include "webrtc/modules/video_coding/utility/include/qp_parser.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc similarity index 96% rename from webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc rename to webrtc/modules/video_coding/video_coding_robustness_unittest.cc index ac6e16bd80..9c4976c30d 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc +++ b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc @@ -10,10 +10,10 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/video_coding_test.gypi b/webrtc/modules/video_coding/video_coding_test.gypi index 5d720ebb63..fc2fec6c98 100644 --- a/webrtc/modules/video_coding/video_coding_test.gypi +++ b/webrtc/modules/video_coding/video_coding_test.gypi @@ -19,16 +19,16 @@ ], 'sources': [ # headers - 'main/test/receiver_tests.h', - 'main/test/rtp_player.h', - 'main/test/vcm_payload_sink_factory.h', + 'test/receiver_tests.h', + 'test/rtp_player.h', + 'test/vcm_payload_sink_factory.h', # sources - 'main/test/rtp_player.cc', - 'main/test/test_util.cc', - 'main/test/tester_main.cc', - 'main/test/vcm_payload_sink_factory.cc', - 'main/test/video_rtp_play.cc', + 'test/rtp_player.cc', + 'test/test_util.cc', + 'test/tester_main.cc', + 'test/vcm_payload_sink_factory.cc', + 'test/video_rtp_play.cc', ], # sources }, ], diff --git a/webrtc/modules/video_coding/main/source/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/video_receiver.cc rename to webrtc/modules/video_coding/video_receiver.cc index 1fb1b04905..00496aa541 100644 --- a/webrtc/modules/video_coding/main/source/video_receiver.cc +++ b/webrtc/modules/video_coding/video_receiver.cc @@ -13,11 +13,11 @@ #include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/jitter_buffer.h" -#include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/modules/video_coding/main/source/video_coding_impl.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/jitter_buffer.h" +#include "webrtc/modules/video_coding/packet.h" +#include "webrtc/modules/video_coding/video_coding_impl.h" #include "webrtc/system_wrappers/include/clock.h" // #define DEBUG_DECODER_BIT_STREAM diff --git a/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc b/webrtc/modules/video_coding/video_receiver_unittest.cc similarity index 95% rename from webrtc/modules/video_coding/main/source/video_receiver_unittest.cc rename to webrtc/modules/video_coding/video_receiver_unittest.cc index 75ea29a1ec..4859c4164f 100644 --- a/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc +++ b/webrtc/modules/video_coding/video_receiver_unittest.cc @@ -12,11 +12,11 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/video_coding_impl.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" using ::testing::_; diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/video_sender.cc similarity index 98% rename from webrtc/modules/video_coding/main/source/video_sender.cc rename to webrtc/modules/video_coding/video_sender.cc index e04a6d0d75..6aedf4e1d2 100644 --- a/webrtc/modules/video_coding/main/source/video_sender.cc +++ b/webrtc/modules/video_coding/video_sender.cc @@ -15,9 +15,9 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/modules/video_coding/main/source/video_coding_impl.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/encoded_frame.h" +#include "webrtc/modules/video_coding/video_coding_impl.h" #include "webrtc/modules/video_coding/utility/include/quality_scaler.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc b/webrtc/modules/video_coding/video_sender_unittest.cc similarity index 97% rename from webrtc/modules/video_coding/main/source/video_sender_unittest.cc rename to webrtc/modules/video_coding/video_sender_unittest.cc index e9c8bd79b6..5dea408586 100644 --- a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc +++ b/webrtc/modules/video_coding/video_sender_unittest.cc @@ -13,14 +13,14 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/common.h" -#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/source/video_coding_impl.h" -#include "webrtc/modules/video_coding/main/test/test_util.h" +#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/video_coding_impl.h" +#include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/frame_generator.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/webrtc/test/configurable_frame_size_encoder.cc index 671a2acb20..831e481bd8 100644 --- a/webrtc/test/configurable_frame_size_encoder.cc +++ b/webrtc/test/configurable_frame_size_encoder.cc @@ -15,7 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_video/include/video_image.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fake_decoder.h b/webrtc/test/fake_decoder.h index 593af512f8..d6f4f46e22 100644 --- a/webrtc/test/fake_decoder.h +++ b/webrtc/test/fake_decoder.h @@ -13,7 +13,7 @@ #include -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc index a3ade6e97a..44fb1c5882 100644 --- a/webrtc/test/fake_encoder.cc +++ b/webrtc/test/fake_encoder.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/system_wrappers/include/sleep.h" namespace webrtc { diff --git a/webrtc/video/encoded_frame_callback_adapter.cc b/webrtc/video/encoded_frame_callback_adapter.cc index 407801fd0c..4c6823fa47 100644 --- a/webrtc/video/encoded_frame_callback_adapter.cc +++ b/webrtc/video/encoded_frame_callback_adapter.cc @@ -11,7 +11,7 @@ #include "webrtc/video/encoded_frame_callback_adapter.h" #include "webrtc/base/checks.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/encoded_frame.h" namespace webrtc { namespace internal { diff --git a/webrtc/video/encoded_frame_callback_adapter.h b/webrtc/video/encoded_frame_callback_adapter.h index b39a8e2167..b10c4f1645 100644 --- a/webrtc/video/encoded_frame_callback_adapter.h +++ b/webrtc/video/encoded_frame_callback_adapter.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VIDEO_ENCODED_FRAME_CALLBACK_ADAPTER_H_ #define WEBRTC_VIDEO_ENCODED_FRAME_CALLBACK_ADAPTER_H_ -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/frame_callback.h" namespace webrtc { diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index b3174aaa68..e2450d9c7d 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc index 879a33ded2..329905d0f8 100644 --- a/webrtc/video/receive_statistics_proxy.cc +++ b/webrtc/video/receive_statistics_proxy.cc @@ -13,7 +13,7 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h index b6741f9cde..613dca9cdc 100644 --- a/webrtc/video/receive_statistics_proxy.h +++ b/webrtc/video/receive_statistics_proxy.h @@ -19,7 +19,7 @@ #include "webrtc/common_types.h" #include "webrtc/frame_callback.h" #include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/video_engine/report_block_stats.h" #include "webrtc/video_engine/vie_channel.h" #include "webrtc/video_receive_stream.h" diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h index 2939a671d1..7209094fe6 100644 --- a/webrtc/video/send_statistics_proxy.h +++ b/webrtc/video/send_statistics_proxy.h @@ -18,8 +18,8 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video_engine/overuse_frame_detector.h" #include "webrtc/video_engine/vie_encoder.h" diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h index b93d803702..9261461f35 100644 --- a/webrtc/video/video_capture_input.h +++ b/webrtc/video/video_capture_input.h @@ -19,8 +19,8 @@ #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/video_capture/video_capture.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/thread_wrapper.h" diff --git a/webrtc/video/video_decoder_unittest.cc b/webrtc/video/video_decoder_unittest.cc index fd1605df5c..422aca0a2c 100644 --- a/webrtc/video/video_decoder_unittest.cc +++ b/webrtc/video/video_decoder_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/checks.h" -#include "webrtc/modules/video_coding/codecs/interface/video_error_codes.h" +#include "webrtc/modules/video_coding/include/video_error_codes.h" namespace webrtc { diff --git a/webrtc/video/video_encoder_unittest.cc b/webrtc/video/video_encoder_unittest.cc index 3382be83be..b800a74065 100644 --- a/webrtc/video/video_encoder_unittest.cc +++ b/webrtc/video/video_encoder_unittest.cc @@ -11,7 +11,7 @@ #include "webrtc/video_encoder.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_error_codes.h" +#include "webrtc/modules/video_coding/include/video_error_codes.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index b495192d3f..3517a9a943 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h index 2f4ba8d345..472dbc8123 100644 --- a/webrtc/video_engine/vie_channel.h +++ b/webrtc/video_engine/vie_channel.h @@ -18,7 +18,7 @@ #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 206ec02460..94f5fdae66 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -24,10 +24,10 @@ #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/modules/video_coding/main/source/encoded_frame.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" +#include "webrtc/modules/video_coding/encoded_frame.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h index 7d9558cd1c..44859b1cd3 100644 --- a/webrtc/video_engine/vie_encoder.h +++ b/webrtc/video_engine/vie_encoder.h @@ -17,10 +17,11 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/thread_annotations.h" +#include "webrtc/call/bitrate_allocator.h" #include "webrtc/common_types.h" #include "webrtc/frame_callback.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" +#include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/typedefs.h" #include "webrtc/video/video_capture_input.h" diff --git a/webrtc/video_engine/vie_receiver.cc b/webrtc/video_engine/vie_receiver.cc index c99fa76e7b..56dfb28f15 100644 --- a/webrtc/video_engine/vie_receiver.cc +++ b/webrtc/video_engine/vie_receiver.cc @@ -22,7 +22,7 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/tick_util.h" diff --git a/webrtc/video_engine/vie_sync_module.cc b/webrtc/video_engine/vie_sync_module.cc index b2e2713d92..6fe32a7bcb 100644 --- a/webrtc/video_engine/vie_sync_module.cc +++ b/webrtc/video_engine/vie_sync_module.cc @@ -14,7 +14,7 @@ #include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/video_engine/stream_synchronization.h" #include "webrtc/voice_engine/include/voe_video_sync.h"