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

Unified Diff: media/cast/sender/video_encoder.cc

Issue 974133002: [cast] Stub out call to VideoEncoderImpl::IsSupported on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/video_encoder.cc
diff --git a/media/cast/sender/video_encoder.cc b/media/cast/sender/video_encoder.cc
index d65bf3c8dc845dcf4ad0a8e808e474f7655060eb..d23496b8fef92ecf85d6cb02dfe7fa93f2c145a0 100644
--- a/media/cast/sender/video_encoder.cc
+++ b/media/cast/sender/video_encoder.cc
@@ -34,8 +34,8 @@ scoped_ptr<VideoEncoder> VideoEncoder::Create(
}
#endif // defined(OS_MACOSX)
- // If the system provides a hardware-accelerated encoder, use it.
#if !defined(OS_IOS)
+ // If the system provides a hardware-accelerated encoder, use it.
if (ExternalVideoEncoder::IsSupported(video_config)) {
return scoped_ptr<VideoEncoder>(new SizeAdaptableExternalVideoEncoder(
cast_environment,
@@ -44,7 +44,6 @@ scoped_ptr<VideoEncoder> VideoEncoder::Create(
create_vea_cb,
create_video_encode_memory_cb));
}
-#endif // !defined(OS_IOS)
// Attempt to use the software encoder implementation.
if (VideoEncoderImpl::IsSupported(video_config)) {
@@ -53,6 +52,7 @@ scoped_ptr<VideoEncoder> VideoEncoder::Create(
video_config,
status_change_cb));
}
+#endif // !defined(OS_IOS)
// No encoder implementation will suffice.
return nullptr;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698