zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use function_video_(en|de)coder_factory from api

Browse Source 
Remove them from test.
It is completion of the move started with
https://webrtc-review.googlesource.com/c/src/+/107705

Bug: None
Change-Id: Ib0b26db04a1ee814322851280ba1e59b4b3f7ce6
Reviewed-on: https://webrtc-review.googlesource.com/c/107891
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25392}
This commit is contained in:
Danil Chapovalov
2018-10-26 15:57:48 +02:00
committed by Commit Bot
parent 88c2c50dbd
commit 99b71dfd4a
24 changed files with 30 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/BUILD.gn
View File

@ -537,6 +537,7 @@ if (rtc_include_tests) {
":rtc_audio_video", ":rtc_audio_video",
":rtc_constants", ":rtc_constants",
":rtc_data", ":rtc_data",
"../api/test/video:function_video_factory",
"../api/units:time_delta", "../api/units:time_delta",
"../api/video:video_frame_i420", "../api/video:video_frame_i420",
"../modules/audio_processing:mocks", "../modules/audio_processing:mocks",
@ -549,7 +550,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_task_queue", "../rtc_base:rtc_task_queue",
"../rtc_base:stringutils", "../rtc_base:stringutils",
"../test:field_trial", "../test:field_trial",
"../test:test_common",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
] ]
sources = [ sources = [

4
media/engine/simulcast_encoder_adapter_unittest.cc
View File

@ -15,6 +15,8 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h" #include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h" #include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_factory.h"
#include "common_video/include/video_frame_buffer.h" #include "common_video/include/video_frame_buffer.h"
@ -24,8 +26,6 @@
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/utility/simulcast_test_fixture_impl.h" #include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
#include "test/gmock.h" #include "test/gmock.h"
#include "test/gtest.h" #include "test/gtest.h"

4
modules/video_coding/BUILD.gn
View File

@ -710,6 +710,7 @@ if (rtc_include_tests) {
":webrtc_vp9_helpers", ":webrtc_vp9_helpers",
"../..:webrtc_common", "../..:webrtc_common",
"../../api:videocodec_test_fixture_api", "../../api:videocodec_test_fixture_api",
"../../api/test/video:function_video_factory",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../call:video_stream_api", "../../call:video_stream_api",
"../../common_video", "../../common_video",
@ -770,6 +771,7 @@ if (rtc_include_tests) {
"../../api:mock_video_decoder", "../../api:mock_video_decoder",
"../../api:mock_video_encoder", "../../api:mock_video_encoder",
"../../api:videocodec_test_fixture_api", "../../api:videocodec_test_fixture_api",
"../../api/test/video:function_video_factory",
"../../api/video:video_frame", "../../api/video:video_frame",
"../../api/video:video_frame_i420", "../../api/video:video_frame_i420",
"../../api/video_codecs:rtc_software_fallback_wrappers", "../../api/video_codecs:rtc_software_fallback_wrappers",
@ -783,7 +785,6 @@ if (rtc_include_tests) {
"../../rtc_base:rtc_base", "../../rtc_base:rtc_base",
"../../test:field_trial", "../../test:field_trial",
"../../test:fileutils", "../../test:fileutils",
"../../test:test_common",
"../../test:test_support", "../../test:test_support",
"../../test:video_test_common", "../../test:video_test_common",
"../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_rtcp_format",
@ -893,6 +894,7 @@ if (rtc_include_tests) {
"../../api:mock_video_encoder", "../../api:mock_video_encoder",
"../../api:simulcast_test_fixture_api", "../../api:simulcast_test_fixture_api",
"../../api:videocodec_test_fixture_api", "../../api:videocodec_test_fixture_api",
"../../api/test/video:function_video_factory",
"../../api/video:video_bitrate_allocator", "../../api/video:video_bitrate_allocator",
"../../api/video:video_frame", "../../api/video:video_frame",
"../../api/video:video_frame_i420", "../../api/video:video_frame_i420",

4
modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
View File

@ -13,9 +13,9 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h" #include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h" #include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/h264/include/h264.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {

2
modules/video_coding/codecs/test/videocodec_test_libvpx.cc
View File

@ -12,6 +12,7 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h" #include "api/test/create_videocodec_test_fixture.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/sdp_video_format.h"
#include "media/base/mediaconstants.h" #include "media/base/mediaconstants.h"
#include "media/engine/internaldecoderfactory.h" #include "media/engine/internaldecoderfactory.h"
@ -19,7 +20,6 @@
#include "media/engine/simulcast_encoder_adapter.h" #include "media/engine/simulcast_encoder_adapter.h"
#include "modules/video_coding/utility/vp8_header_parser.h" #include "modules/video_coding/utility/vp8_header_parser.h"
#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/testsupport/fileutils.h" #include "test/testsupport/fileutils.h"

4
modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
View File

@ -13,9 +13,9 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h" #include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h" #include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {

3
test/BUILD.gn
View File

@ -326,6 +326,7 @@ if (rtc_include_tests) {
":video_test_support", ":video_test_support",
"../api:create_simulcast_test_fixture_api", "../api:create_simulcast_test_fixture_api",
"../api:simulcast_test_fixture_api", "../api:simulcast_test_fixture_api",
"../api/test/video:function_video_factory",
"../api/video:video_frame_i420", "../api/video:video_frame_i420",
"../modules/rtp_rtcp:rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp",
"../modules/video_capture", "../modules/video_capture",
@ -623,8 +624,6 @@ rtc_source_set("test_common") {
"encoder_settings.cc", "encoder_settings.cc",
"encoder_settings.h", "encoder_settings.h",
"fake_videorenderer.h", "fake_videorenderer.h",
"function_video_decoder_factory.h",
"function_video_encoder_factory.h",
"layer_filtering_transport.cc", "layer_filtering_transport.cc",
"layer_filtering_transport.h", "layer_filtering_transport.h",
"mock_transport.cc", "mock_transport.cc",

4
test/call_test.h
View File

@ -13,6 +13,8 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/call.h" #include "call/call.h"
#include "call/rtp_transport_controller_send.h" #include "call/rtp_transport_controller_send.h"
#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log.h"
@ -22,8 +24,6 @@
#include "test/fake_videorenderer.h" #include "test/fake_videorenderer.h"
#include "test/fake_vp8_encoder.h" #include "test/fake_vp8_encoder.h"
#include "test/frame_generator_capturer.h" #include "test/frame_generator_capturer.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
#include "test/rtp_rtcp_observer.h" #include "test/rtp_rtcp_observer.h"
#include "test/single_threaded_task_queue.h" #include "test/single_threaded_task_queue.h"

4
test/fake_vp8_encoder_unittest.cc
View File

@ -14,11 +14,11 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h" #include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h" #include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "modules/video_coding/utility/simulcast_test_fixture_impl.h" #include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
#include "test/fake_vp8_decoder.h" #include "test/fake_vp8_decoder.h"
#include "test/fake_vp8_encoder.h" #include "test/fake_vp8_encoder.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
namespace webrtc { namespace webrtc {
namespace test { namespace test {

17
test/function_video_decoder_factory.h
View File

@ -1,17 +0,0 @@
/*
* Copyright (c) 2018 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 TEST_FUNCTION_VIDEO_DECODER_FACTORY_H_
#define TEST_FUNCTION_VIDEO_DECODER_FACTORY_H_
// TODO(danilchap): Remove this file when all users include api header directly.
#include "api/test/video/function_video_decoder_factory.h"
#endif // TEST_FUNCTION_VIDEO_DECODER_FACTORY_H_

17
test/function_video_encoder_factory.h
View File

@ -1,17 +0,0 @@
/*
* Copyright (c) 2018 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 TEST_FUNCTION_VIDEO_ENCODER_FACTORY_H_
#define TEST_FUNCTION_VIDEO_ENCODER_FACTORY_H_
// TODO(danilchap): Remove this file when all users include api header directly.
#include "api/test/video/function_video_encoder_factory.h"
#endif // TEST_FUNCTION_VIDEO_ENCODER_FACTORY_H_

1
test/scenario/BUILD.gn
View File

@ -42,6 +42,7 @@ if (rtc_include_tests) {
"../../api:transport_api", "../../api:transport_api",
"../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/audio_codecs:builtin_audio_encoder_factory", "../../api/audio_codecs:builtin_audio_encoder_factory",
"../../api/test/video:function_video_factory",
"../../api/units:data_rate", "../../api/units:data_rate",
"../../api/units:time_delta", "../../api/units:time_delta",
"../../api/units:timestamp", "../../api/units:timestamp",

2
test/scenario/video_stream.cc
View File

@ -12,13 +12,13 @@
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
#include "api/test/video/function_video_encoder_factory.h"
#include "media/base/mediaconstants.h" #include "media/base/mediaconstants.h"
#include "media/engine/internaldecoderfactory.h" #include "media/engine/internaldecoderfactory.h"
#include "media/engine/internalencoderfactory.h" #include "media/engine/internalencoderfactory.h"
#include "media/engine/webrtcvideoengine.h" #include "media/engine/webrtcvideoengine.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/fake_encoder.h" #include "test/fake_encoder.h"
#include "test/function_video_encoder_factory.h"
#include "test/scenario/hardware_codecs.h" #include "test/scenario/hardware_codecs.h"
#include "test/testsupport/fileutils.h" #include "test/testsupport/fileutils.h"

2
video/BUILD.gn
View File

@ -353,6 +353,7 @@ if (rtc_include_tests) {
] ]
deps = [ deps = [
"..:webrtc_common", "..:webrtc_common",
"../api/test/video:function_video_factory",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:call_interfaces", "../call:call_interfaces",
"../common_video", "../common_video",
@ -426,6 +427,7 @@ if (rtc_include_tests) {
":video_mocks", ":video_mocks",
":video_stream_encoder_impl", ":video_stream_encoder_impl",
"../api:simulated_network_api", "../api:simulated_network_api",
"../api/test/video:function_video_factory",
"../api/video:encoded_image", "../api/video:encoded_image",
"../api/video:video_frame", "../api/video:video_frame",
"../api/video:video_frame_i420", "../api/video:video_frame_i420",

2
video/end_to_end_tests/codec_tests.cc
View File

@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "api/test/video/function_video_encoder_factory.h"
#include "media/engine/internaldecoderfactory.h" #include "media/engine/internaldecoderfactory.h"
#include "media/engine/internalencoderfactory.h" #include "media/engine/internalencoderfactory.h"
#include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/h264/include/h264.h"
@ -18,7 +19,6 @@
#include "test/call_test.h" #include "test/call_test.h"
#include "test/encoder_settings.h" #include "test/encoder_settings.h"
#include "test/field_trial.h" #include "test/field_trial.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {

2
video/end_to_end_tests/fec_tests.cc
View File

@ -9,6 +9,7 @@
*/ */
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
#include "call/simulated_network.h" #include "call/simulated_network.h"
#include "media/engine/internaldecoderfactory.h" #include "media/engine/internaldecoderfactory.h"
@ -16,7 +17,6 @@
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/field_trial.h" #include "test/field_trial.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/rtcp_packet_parser.h" #include "test/rtcp_packet_parser.h"

2
video/end_to_end_tests/histogram_tests.cc
View File

@ -9,10 +9,10 @@
*/ */
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "system_wrappers/include/metrics.h" #include "system_wrappers/include/metrics.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {

2
video/end_to_end_tests/multi_codec_receive_tests.cc
View File

@ -9,13 +9,13 @@
*/ */
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
#include "call/simulated_network.h" #include "call/simulated_network.h"
#include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h" #include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {

2
video/end_to_end_tests/multi_stream_tester.cc
View File

@ -15,6 +15,7 @@
#include <vector> #include <vector>
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
#include "call/simulated_network.h" #include "call/simulated_network.h"
#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log.h"
@ -22,7 +23,6 @@
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/encoder_settings.h" #include "test/encoder_settings.h"
#include "test/function_video_encoder_factory.h"
namespace webrtc { namespace webrtc {

2
video/end_to_end_tests/retransmission_tests.cc
View File

@ -9,13 +9,13 @@
*/ */
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
#include "call/simulated_network.h" #include "call/simulated_network.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "system_wrappers/include/sleep.h" #include "system_wrappers/include/sleep.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/field_trial.h" #include "test/field_trial.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/rtcp_packet_parser.h" #include "test/rtcp_packet_parser.h"

2
video/end_to_end_tests/stats_tests.cc
View File

@ -9,6 +9,7 @@
*/ */
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
#include "call/simulated_network.h" #include "call/simulated_network.h"
#include "modules/rtp_rtcp/source/rtp_utility.h" #include "modules/rtp_rtcp/source/rtp_utility.h"
@ -18,7 +19,6 @@
#include "system_wrappers/include/sleep.h" #include "system_wrappers/include/sleep.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/fake_encoder.h" #include "test/fake_encoder.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/rtcp_packet_parser.h" #include "test/rtcp_packet_parser.h"

2
video/picture_id_tests.cc
View File

@ -9,6 +9,7 @@
*/ */
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
#include "call/simulated_network.h" #include "call/simulated_network.h"
#include "media/engine/internalencoderfactory.h" #include "media/engine/internalencoderfactory.h"
@ -19,7 +20,6 @@
#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/sequence_number_util.h" #include "rtc_base/numerics/sequence_number_util.h"
#include "test/call_test.h" #include "test/call_test.h"
#include "test/function_video_encoder_factory.h"
namespace webrtc { namespace webrtc {
namespace { namespace {

2
video/quality_scaling_tests.cc
View File

@ -10,6 +10,7 @@
#include <string> #include <string>
#include "api/test/video/function_video_encoder_factory.h"
#include "media/engine/internalencoderfactory.h" #include "media/engine/internalencoderfactory.h"
#include "modules/video_coding/codecs/h264/include/h264.h" #include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h" #include "modules/video_coding/codecs/vp8/include/vp8.h"
@ -17,7 +18,6 @@
#include "test/call_test.h" #include "test/call_test.h"
#include "test/field_trial.h" #include "test/field_trial.h"
#include "test/frame_generator_capturer.h" #include "test/frame_generator_capturer.h"
#include "test/function_video_encoder_factory.h"
namespace webrtc { namespace webrtc {
namespace { namespace {

2
video/replay.cc
View File

@ -15,6 +15,7 @@
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include "api/test/video/function_video_decoder_factory.h"
#include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_decoder.h"
#include "call/call.h" #include "call/call.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "common_video/libyuv/include/webrtc_libyuv.h"
@ -32,7 +33,6 @@
#include "test/call_test.h" #include "test/call_test.h"
#include "test/encoder_settings.h" #include "test/encoder_settings.h"
#include "test/fake_decoder.h" #include "test/fake_decoder.h"
#include "test/function_video_decoder_factory.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/null_transport.h" #include "test/null_transport.h"
#include "test/rtp_file_reader.h" #include "test/rtp_file_reader.h"