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

Unified Diff: remoting/client/software_video_renderer.cc

Issue 501153003: Don't use libvpx if it is disabled in GN build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 6 years, 4 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/video_encoder_impl.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/software_video_renderer.cc
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc
index 4d95e13f0b791df42cf201fc4ded498c1d6c50de..a7236c8fd0ef76ffc77645fde9ec3e379bed8a9b 100644
--- a/remoting/client/software_video_renderer.cc
+++ b/remoting/client/software_video_renderer.cc
@@ -16,7 +16,9 @@
#include "remoting/client/frame_consumer.h"
#include "remoting/codec/video_decoder.h"
#include "remoting/codec/video_decoder_verbatim.h"
+#if !defined(MEDIA_DISABLE_LIBVPX)
#include "remoting/codec/video_decoder_vpx.h"
+#endif // !defined(MEDIA_DISABLE_LIBVPX)
#include "remoting/protocol/session_config.h"
#include "third_party/libyuv/include/libyuv/convert_argb.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
@@ -147,11 +149,13 @@ void SoftwareVideoRenderer::Core::Initialize(const SessionConfig& config) {
ChannelConfig::Codec codec = config.video_config().codec;
if (codec == ChannelConfig::CODEC_VERBATIM) {
decoder_.reset(new VideoDecoderVerbatim());
+#if !defined(MEDIA_DISABLE_LIBVPX)
} else if (codec == ChannelConfig::CODEC_VP8) {
decoder_ = VideoDecoderVpx::CreateForVP8();
} else if (codec == ChannelConfig::CODEC_VP9) {
decoder_ = VideoDecoderVpx::CreateForVP9();
} else {
+#endif // !defined(MEDIA_DISABLE_LIBVPX)
NOTREACHED() << "Invalid Encoding found: " << codec;
}
« no previous file with comments | « media/cast/sender/video_encoder_impl.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698