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

Unified Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 74563002: AndroidVideoEncodeAccelerator is born! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years 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
« no previous file with comments | « content/content_common.gypi ('k') | gpu/config/gpu_blacklist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_dependency_factory.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 4c2f046dfc64994e0b207df63c6dcbed8411b2af..c4eee8ec3ac3216420bca57a40c1b465940b2bec 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -48,6 +48,10 @@
#include "content/renderer/media/rtc_video_decoder_factory_tv.h"
#endif
+#if defined(OS_ANDROID)
+#include "media/base/android/media_codec_bridge.h"
+#endif
+
namespace content {
// Constant constraint keys which enables default audio constraints on
@@ -594,6 +598,13 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
}
+#if defined(OS_ANDROID)
+ if (!media::MediaCodecBridge::IsAvailable() ||
+ !media::MediaCodecBridge::SupportsSetParameters()) {
+ encoder_factory.reset();
+ }
+#endif
+
scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
new WebRtcAudioDeviceImpl());
« no previous file with comments | « content/content_common.gypi ('k') | gpu/config/gpu_blacklist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698