webrtc_m130/media/engine/null_webrtc_video_engine_unittest.cc

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

46 lines
1.7 KiB
C++
Raw Normal View History

/*
* Copyright (c) 2016 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.
*/
#include "media/engine/null_webrtc_video_engine.h"
Reland "in WebrtcVoiceEngine allow to set TaskQueueFactory" in production code keep using GlobalTaskQueueFactory() in tests switch to use DefaultTaskQueueFactory directly. This reverts commit e27ccf9a1681e0e4ff9281f9a18fea357d2bc890. Reason for revert: addressed the failure with patchset#2 Original change's description: > Revert "in WebrtcVoiceEngine allow to set TaskQueueFactory" > > This reverts commit a39254da593bbdb0b1e072a44827229680afe3ee. > > Reason for revert: Tests are failing due to ThreadChecker's called on valid thread. > > Original change's description: > > in WebrtcVoiceEngine allow to set TaskQueueFactory > > > > in production code keep using GlobalTaskQueueFactory() > > in tests switch to use DefaultTaskQueueFactory directly. > > > > Bug: webrtc:10284 > > Change-Id: I170274a98324796623089a965a39f0cbb7e281d9 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128878 > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#27296} > > TBR=danilchap@webrtc.org,steveanton@webrtc.org > > Change-Id: I9742e5d0171a94f3840e197c40fdb44523e4963b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10284 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129780 > Reviewed-by: Amit Hilbuch <amithi@webrtc.org> > Commit-Queue: Amit Hilbuch <amithi@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27297} # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10284 Change-Id: I55fd5811c68d04c3e8cf537974496460b38c1d4f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129933 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27348}
2019-03-27 18:51:45 +01:00
#include <memory>
#include <utility>
#include "api/task_queue/default_task_queue_factory.h"
#include "api/task_queue/task_queue_factory.h"
#include "media/engine/webrtc_voice_engine.h"
#include "modules/audio_device/include/mock_audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "test/gtest.h"
#include "test/mock_audio_decoder_factory.h"
#include "test/mock_audio_encoder_factory.h"
namespace cricket {
// Simple test to check if NullWebRtcVideoEngine implements the methods
// required by CompositeMediaEngine.
TEST(NullWebRtcVideoEngineTest, CheckInterface) {
Reland "in WebrtcVoiceEngine allow to set TaskQueueFactory" in production code keep using GlobalTaskQueueFactory() in tests switch to use DefaultTaskQueueFactory directly. This reverts commit e27ccf9a1681e0e4ff9281f9a18fea357d2bc890. Reason for revert: addressed the failure with patchset#2 Original change's description: > Revert "in WebrtcVoiceEngine allow to set TaskQueueFactory" > > This reverts commit a39254da593bbdb0b1e072a44827229680afe3ee. > > Reason for revert: Tests are failing due to ThreadChecker's called on valid thread. > > Original change's description: > > in WebrtcVoiceEngine allow to set TaskQueueFactory > > > > in production code keep using GlobalTaskQueueFactory() > > in tests switch to use DefaultTaskQueueFactory directly. > > > > Bug: webrtc:10284 > > Change-Id: I170274a98324796623089a965a39f0cbb7e281d9 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128878 > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#27296} > > TBR=danilchap@webrtc.org,steveanton@webrtc.org > > Change-Id: I9742e5d0171a94f3840e197c40fdb44523e4963b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10284 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129780 > Reviewed-by: Amit Hilbuch <amithi@webrtc.org> > Commit-Queue: Amit Hilbuch <amithi@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27297} # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10284 Change-Id: I55fd5811c68d04c3e8cf537974496460b38c1d4f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129933 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27348}
2019-03-27 18:51:45 +01:00
std::unique_ptr<webrtc::TaskQueueFactory> task_queue_factory =
webrtc::CreateDefaultTaskQueueFactory();
::testing::NiceMock<webrtc::test::MockAudioDeviceModule> adm;
Use std::make_unique instead of absl::make_unique. WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
2019-09-17 17:06:18 +02:00
auto audio_engine = std::make_unique<WebRtcVoiceEngine>(
Reland "in WebrtcVoiceEngine allow to set TaskQueueFactory" in production code keep using GlobalTaskQueueFactory() in tests switch to use DefaultTaskQueueFactory directly. This reverts commit e27ccf9a1681e0e4ff9281f9a18fea357d2bc890. Reason for revert: addressed the failure with patchset#2 Original change's description: > Revert "in WebrtcVoiceEngine allow to set TaskQueueFactory" > > This reverts commit a39254da593bbdb0b1e072a44827229680afe3ee. > > Reason for revert: Tests are failing due to ThreadChecker's called on valid thread. > > Original change's description: > > in WebrtcVoiceEngine allow to set TaskQueueFactory > > > > in production code keep using GlobalTaskQueueFactory() > > in tests switch to use DefaultTaskQueueFactory directly. > > > > Bug: webrtc:10284 > > Change-Id: I170274a98324796623089a965a39f0cbb7e281d9 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128878 > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#27296} > > TBR=danilchap@webrtc.org,steveanton@webrtc.org > > Change-Id: I9742e5d0171a94f3840e197c40fdb44523e4963b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10284 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129780 > Reviewed-by: Amit Hilbuch <amithi@webrtc.org> > Commit-Queue: Amit Hilbuch <amithi@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27297} # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10284 Change-Id: I55fd5811c68d04c3e8cf537974496460b38c1d4f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129933 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27348}
2019-03-27 18:51:45 +01:00
task_queue_factory.get(), &adm,
webrtc::MockAudioEncoderFactory::CreateUnusedFactory(),
webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr,
webrtc::AudioProcessingBuilder().Create());
CompositeMediaEngine engine(std::move(audio_engine),
Use std::make_unique instead of absl::make_unique. WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
2019-09-17 17:06:18 +02:00
std::make_unique<NullWebRtcVideoEngine>());
Reland "in WebrtcVoiceEngine allow to set TaskQueueFactory" in production code keep using GlobalTaskQueueFactory() in tests switch to use DefaultTaskQueueFactory directly. This reverts commit e27ccf9a1681e0e4ff9281f9a18fea357d2bc890. Reason for revert: addressed the failure with patchset#2 Original change's description: > Revert "in WebrtcVoiceEngine allow to set TaskQueueFactory" > > This reverts commit a39254da593bbdb0b1e072a44827229680afe3ee. > > Reason for revert: Tests are failing due to ThreadChecker's called on valid thread. > > Original change's description: > > in WebrtcVoiceEngine allow to set TaskQueueFactory > > > > in production code keep using GlobalTaskQueueFactory() > > in tests switch to use DefaultTaskQueueFactory directly. > > > > Bug: webrtc:10284 > > Change-Id: I170274a98324796623089a965a39f0cbb7e281d9 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128878 > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#27296} > > TBR=danilchap@webrtc.org,steveanton@webrtc.org > > Change-Id: I9742e5d0171a94f3840e197c40fdb44523e4963b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10284 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129780 > Reviewed-by: Amit Hilbuch <amithi@webrtc.org> > Commit-Queue: Amit Hilbuch <amithi@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27297} # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10284 Change-Id: I55fd5811c68d04c3e8cf537974496460b38c1d4f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129933 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27348}
2019-03-27 18:51:45 +01:00
EXPECT_TRUE(engine.Init());
}
} // namespace cricket