diff --git a/rtc_tools/data_channel_benchmark/BUILD.gn b/rtc_tools/data_channel_benchmark/BUILD.gn
index 040061b3e8..abe1b4a0e3 100644
--- a/rtc_tools/data_channel_benchmark/BUILD.gn
+++ b/rtc_tools/data_channel_benchmark/BUILD.gn
@@ -48,8 +48,16 @@ rtc_executable("data_channel_benchmark") {
     "../../api:scoped_refptr",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
     "../../api/audio_codecs:builtin_audio_encoder_factory",
-    "../../api/video_codecs:builtin_video_decoder_factory",
-    "../../api/video_codecs:builtin_video_encoder_factory",
+    "../../api/video_codecs:video_decoder_factory_template",
+    "../../api/video_codecs:video_decoder_factory_template_dav1d_adapter",
+    "../../api/video_codecs:video_decoder_factory_template_libvpx_vp8_adapter",
+    "../../api/video_codecs:video_decoder_factory_template_libvpx_vp9_adapter",
+    "../../api/video_codecs:video_decoder_factory_template_open_h264_adapter",
+    "../../api/video_codecs:video_encoder_factory_template",
+    "../../api/video_codecs:video_encoder_factory_template_libaom_av1_adapter",
+    "../../api/video_codecs:video_encoder_factory_template_libvpx_vp8_adapter",
+    "../../api/video_codecs:video_encoder_factory_template_libvpx_vp9_adapter",
+    "../../api/video_codecs:video_encoder_factory_template_open_h264_adapter",
     "../../rtc_base:logging",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_event",
diff --git a/rtc_tools/data_channel_benchmark/peer_connection_client.cc b/rtc_tools/data_channel_benchmark/peer_connection_client.cc
index cd02e7118a..a6f8bf558c 100644
--- a/rtc_tools/data_channel_benchmark/peer_connection_client.cc
+++ b/rtc_tools/data_channel_benchmark/peer_connection_client.cc
@@ -21,8 +21,16 @@
 #include "api/rtc_error.h"
 #include "api/scoped_refptr.h"
 #include "api/set_remote_description_observer_interface.h"
-#include "api/video_codecs/builtin_video_decoder_factory.h"
-#include "api/video_codecs/builtin_video_encoder_factory.h"
+#include "api/video_codecs/video_decoder_factory_template.h"
+#include "api/video_codecs/video_decoder_factory_template_dav1d_adapter.h"
+#include "api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h"
+#include "api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h"
+#include "api/video_codecs/video_decoder_factory_template_open_h264_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template.h"
+#include "api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h"
+#include "api/video_codecs/video_encoder_factory_template_open_h264_adapter.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
 
@@ -137,8 +145,12 @@ PeerConnectionClient::CreateDefaultFactory(rtc::Thread* signaling_thread) {
       /*signaling_thread*/ signaling_thread,
       /*default_adm=*/nullptr, webrtc::CreateBuiltinAudioEncoderFactory(),
       webrtc::CreateBuiltinAudioDecoderFactory(),
-      webrtc::CreateBuiltinVideoEncoderFactory(),
-      webrtc::CreateBuiltinVideoDecoderFactory(),
+      std::make_unique<VideoEncoderFactoryTemplate<
+          LibvpxVp8EncoderTemplateAdapter, LibvpxVp9EncoderTemplateAdapter,
+          OpenH264EncoderTemplateAdapter, LibaomAv1EncoderTemplateAdapter>>(),
+      std::make_unique<VideoDecoderFactoryTemplate<
+          LibvpxVp8DecoderTemplateAdapter, LibvpxVp9DecoderTemplateAdapter,
+          OpenH264DecoderTemplateAdapter, Dav1dDecoderTemplateAdapter>>(),
       /*audio_mixer=*/nullptr, /*audio_processing=*/nullptr);
 
   if (!factory) {