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

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

Issue 1801343002: Revert of H264 HW encode using VideoToolbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « media/cast/sender/h264_vt_encoder.cc ('k') | media/media.gyp » ('j') | 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 ab1d56f2072ab207ed5a671ed7c2d19c21447552..964a6c5867516f1c9c5640ef562cf26d281fcd23 100644
--- a/media/cast/sender/video_encoder.cc
+++ b/media/cast/sender/video_encoder.cc
@@ -25,7 +25,8 @@
// On MacOS or IOS, attempt to use the system VideoToolbox library to
// perform optimized H.264 encoding.
#if defined(OS_MACOSX) || defined(OS_IOS)
- if (H264VideoToolboxEncoder::IsSupported(video_config)) {
+ if (!video_config.use_external_encoder &&
+ H264VideoToolboxEncoder::IsSupported(video_config)) {
return scoped_ptr<VideoEncoder>(new H264VideoToolboxEncoder(
cast_environment, video_config, status_change_cb));
}
« no previous file with comments | « media/cast/sender/h264_vt_encoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698