aboutsummaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorErik Språng <sprang@webrtc.org>2022-08-18 13:18:27 +0200
committerWebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-08-18 13:14:26 +0000
commit7aaeb5a270ba23f5844f7301a50aaff9b6ca6126 (patch)
tree50c35a07f2f20efd84bb708ab8011809f2058a99 /media
parente7280c314d603c8d695007d9aab62d8c4910a187 (diff)
downloadwebrtc-7aaeb5a270ba23f5844f7301a50aaff9b6ca6126.tar.gz
Create pre-allocated decoders on the decoder thread.
This way we're sure instantiation, configuration and decode calls all happen on the decoder queue - making thread checking easier in the actual decoder classes. Bug: None Change-Id: Ia98f47009f26b34eb8dad2ee0b4ddcde082d1994 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272022 Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Auto-Submit: Erik Språng <sprang@webrtc.org> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37825}
Diffstat (limited to 'media')
-rw-r--r--media/engine/webrtc_video_engine_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index 646a5d9d2d..d3c4211ee7 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -1076,6 +1076,8 @@ TEST_F(WebRtcVideoEngineTest, RegisterDecodersIfSupported) {
EXPECT_TRUE(
channel->AddRecvStream(cricket::StreamParams::CreateLegacy(kSsrc)));
+ // Decoder creation happens on the decoder thread, make sure it runs.
+ time_controller_.AdvanceTime(webrtc::TimeDelta::Zero());
ASSERT_EQ(1u, decoder_factory_->decoders().size());
// Setting codecs of the same type should not reallocate the decoder.
@@ -1102,6 +1104,8 @@ TEST_F(WebRtcVideoEngineTest, RegisterH264DecoderIfSupported) {
EXPECT_TRUE(
channel->AddRecvStream(cricket::StreamParams::CreateLegacy(kSsrc)));
+ // Decoder creation happens on the decoder thread, make sure it runs.
+ time_controller_.AdvanceTime(webrtc::TimeDelta::Zero());
ASSERT_EQ(1u, decoder_factory_->decoders().size());
}