| Index: talk/media/webrtc/nullwebrtcvideoengine.h
|
| diff --git a/talk/media/webrtc/webrtcmediaengine.h b/talk/media/webrtc/nullwebrtcvideoengine.h
|
| similarity index 59%
|
| copy from talk/media/webrtc/webrtcmediaengine.h
|
| copy to talk/media/webrtc/nullwebrtcvideoengine.h
|
| index 831d0725e89c2cf566b88cfb8667a15623c538bd..8af83a8ab1310163f37d93e673d1fa7204d25c5c 100644
|
| --- a/talk/media/webrtc/webrtcmediaengine.h
|
| +++ b/talk/media/webrtc/nullwebrtcvideoengine.h
|
| @@ -1,6 +1,6 @@
|
| /*
|
| * libjingle
|
| - * Copyright 2011 Google Inc.
|
| + * Copyright 2016 Google Inc.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are met:
|
| @@ -25,46 +25,57 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_WEBRTCMEDIAENGINE_H_
|
| -#define TALK_MEDIA_WEBRTCMEDIAENGINE_H_
|
| +#ifndef TALK_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_
|
| +#define TALK_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_
|
|
|
| -#include <string>
|
| #include <vector>
|
|
|
| +#include "talk/media/base/mediachannel.h"
|
| #include "talk/media/base/mediaengine.h"
|
| -#include "webrtc/config.h"
|
|
|
| namespace webrtc {
|
| -class AudioDeviceModule;
|
| -}
|
| +
|
| +class Call;
|
| +
|
| +} // namespace webrtc
|
| +
|
| +
|
| namespace cricket {
|
| +
|
| +class VideoMediaChannel;
|
| class WebRtcVideoDecoderFactory;
|
| class WebRtcVideoEncoderFactory;
|
| -}
|
| -
|
| -namespace cricket {
|
|
|
| -class WebRtcMediaEngineFactory {
|
| +// Video engine implementation that does nothing and can be used in
|
| +// CompositeMediaEngine.
|
| +class NullWebRtcVideoEngine {
|
| public:
|
| - static MediaEngineInterface* Create(
|
| - webrtc::AudioDeviceModule* adm,
|
| - WebRtcVideoEncoderFactory* encoder_factory,
|
| - WebRtcVideoDecoderFactory* decoder_factory);
|
| -};
|
| + NullWebRtcVideoEngine() {}
|
| + ~NullWebRtcVideoEngine() {}
|
| +
|
| + void SetExternalDecoderFactory(WebRtcVideoDecoderFactory* decoder_factory) {}
|
| + void SetExternalEncoderFactory(WebRtcVideoEncoderFactory* encoder_factory) {}
|
| +
|
| + void Init() {}
|
|
|
| -// Verify that extension IDs are within 1-byte extension range and are not
|
| -// overlapping.
|
| -bool ValidateRtpExtensions(const std::vector<RtpHeaderExtension>& extensions);
|
| + const std::vector<VideoCodec>& codecs() {
|
| + return codecs_;
|
| + }
|
|
|
| -// Convert cricket::RtpHeaderExtension:s to webrtc::RtpExtension:s, discarding
|
| -// any extensions not validated by the 'supported' predicate. Duplicate
|
| -// extensions are removed if 'filter_redundant_extensions' is set, and also any
|
| -// mutually exclusive extensions (see implementation for details).
|
| -std::vector<webrtc::RtpExtension> FilterRtpExtensions(
|
| - const std::vector<RtpHeaderExtension>& extensions,
|
| - bool (*supported)(const std::string&),
|
| - bool filter_redundant_extensions);
|
| + RtpCapabilities GetCapabilities() {
|
| + RtpCapabilities capabilities;
|
| + return capabilities;
|
| + }
|
| +
|
| + VideoMediaChannel* CreateChannel(webrtc::Call* call,
|
| + const VideoOptions& options) {
|
| + return nullptr;
|
| + }
|
| +
|
| + private:
|
| + std::vector<VideoCodec> codecs_;
|
| +};
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_WEBRTCMEDIAENGINE_H_
|
| +#endif // TALK_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_
|
|
|