diff options
| author | brettw <brettw@chromium.org> | 2014-09-26 17:32:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-27 00:33:06 +0000 |
| commit | bbe9ed1510413458943b3b39e1e9dad3965e5d32 (patch) | |
| tree | d813eb3e389289d6f164c2ec29f9bccbbc9fa5b3 /remoting/client/software_video_renderer.cc | |
| parent | 06aebb2f4b89f7bb0a511fa12881e919a860287a (diff) | |
| download | chromium_src-bbe9ed1510413458943b3b39e1e9dad3965e5d32.zip chromium_src-bbe9ed1510413458943b3b39e1e9dad3965e5d32.tar.gz chromium_src-bbe9ed1510413458943b3b39e1e9dad3965e5d32.tar.bz2 | |
Remove VPX conditionals from media and remoting.
We added some #ifdefs in https://codereview.chromium.org/501153003 to support compiling these components with no libvpx to get the GN build linking.
Now that chrome links in GN with libvpx, we can remove these since this isn't a configuration we want to support.
Review URL: https://codereview.chromium.org/608013004
Cr-Commit-Position: refs/heads/master@{#297083}
Diffstat (limited to 'remoting/client/software_video_renderer.cc')
| -rw-r--r-- | remoting/client/software_video_renderer.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc index a7236c8..4d95e13 100644 --- a/remoting/client/software_video_renderer.cc +++ b/remoting/client/software_video_renderer.cc @@ -16,9 +16,7 @@ #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" @@ -149,13 +147,11 @@ 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; } |