Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Issue 1673183002: Enable H.264 video WebRTC behind run-time flag and add WebRtcBrowserTest for H.264 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed gyp/gn deps Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index 966a295fdf8fdd3fa61f66ff58cc7a996eb21dc2..207e5cd908733d3ecbe206e4f2d355a113f09d42 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -24,6 +24,8 @@
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/webrtc_ip_handling_policy.h"
#include "content/public/renderer/content_renderer_client.h"
+#include "content/public/renderer/media/webrtc/finch_h264_with_openh264_ffmpeg.h"
+#include "content/public/renderer/renderer_features.h"
#include "content/renderer/media/media_stream.h"
#include "content/renderer/media/media_stream_audio_processor.h"
#include "content/renderer/media/media_stream_audio_processor_options.h"
@@ -52,7 +54,6 @@
#include "content/renderer/render_frame_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/render_view_impl.h"
-#include "content/renderer/renderer_features.h"
#include "crypto/openssl_util.h"
#include "jingle/glue/thread_wrapper.h"
#include "media/base/media_permission.h"
@@ -263,19 +264,17 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() {
DVLOG(1) << "PeerConnectionDependencyFactory::CreatePeerConnectionFactory()";
#if BUILDFLAG(RTC_USE_H264)
- // TODO(hbos): This is temporary. Disable the runtime effects of building with
- // |rtc_use_h264|. We are planning to default the |rtc_use_h264| flag to
- // |proprietary_codecs| so that it will be used by Chromium trybots. This
- // would also make it used by Chrome, but this feature is not ready to be
- // launched yet. An upcoming CL will add browser tests for H264. That CL will
- // remove this line. It should remain disabled until tested.
- webrtc::DisableRtcUseH264();
- // When building with |rtc_use_h264|, |H264DecoderImpl| may be used which
- // depends on FFmpeg, therefore we need to initialize FFmpeg before going
- // further.
- // TODO(hbos): Temporarily commented out due to webrtc::DisableRtcUseH264(),
- // no need to initialize FFmpeg when |H264DecoderImpl| is disabled.
- // media::FFmpegGlue::InitializeFFmpeg();
+ // Building with |rtc_use_h264| - is the corresponding Finch feature enabled?
+ if (base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg)) {
+ LOG(WARNING) << "WebRTC H.264 with OpenH264/FFmpeg ENABLED.";
jochen (gone - plz use gerrit) 2016/02/17 10:55:41 please use DVLOG()
+ // |H264DecoderImpl| may be used which depends on FFmpeg, therefore we need
+ // to initialize FFmpeg before going further.
+ media::FFmpegGlue::InitializeFFmpeg();
+ } else {
+ LOG(WARNING) << "WebRTC H.264 with OpenH264/FFmpeg DISABLED.";
+ // Feature is to be disabled, no need to make sure FFmpeg is initialized.
+ webrtc::DisableRtcUseH264();
+ }
#endif
base::MessageLoop::current()->AddDestructionObserver(this);

Powered by Google App Engine
This is Rietveld 408576698