diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-17 09:02:25 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-17 09:02:25 +0000 |
| commit | 6a97b89328066fe976b587e16034c6d49d98e7fd (patch) | |
| tree | 8647532d1f5b1a89ae594bea92018cd33f49ec62 | |
| parent | 030de9507c92937a3022ec39cbed86fd4c6a6d82 (diff) | |
| download | talk-6a97b89328066fe976b587e16034c6d49d98e7fd.tar.gz | |
Revert 7151 "Revert 7114 "Expose VideoEncoders with webrtc/video_encoder.h.""
Re-lands r7114 after landing r7204 to adress the compile error causing
the rollback in r7151.
BUG=3070
TBR=henrikg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/28489004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7207 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | media/webrtc/webrtcvideoengine2.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/webrtc/webrtcvideoengine2.cc b/media/webrtc/webrtcvideoengine2.cc index b7b4722..54e0ce6 100644 --- a/media/webrtc/webrtcvideoengine2.cc +++ b/media/webrtc/webrtcvideoengine2.cc @@ -42,8 +42,7 @@ #include "webrtc/base/logging.h" #include "webrtc/base/stringutils.h" #include "webrtc/call.h" -// TODO(pbos): Move codecs out of modules (webrtc:3070). -#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" +#include "webrtc/video_encoder.h" #define UNIMPLEMENTED \ LOG(LS_ERROR) << "Call to unimplemented function " << __FUNCTION__; \ @@ -200,7 +199,7 @@ webrtc::VideoEncoder* WebRtcVideoEncoderFactory2::CreateVideoEncoder( const VideoOptions& options) { assert(SupportsCodec(codec)); if (_stricmp(codec.name.c_str(), kVp8CodecName) == 0) { - return webrtc::VP8Encoder::Create(); + return webrtc::VideoEncoder::Create(webrtc::VideoEncoder::kVp8); } // This shouldn't happen, we should be able to create encoders for all codecs // we support. |