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

Unified Diff: content/renderer/media/rtc_encoding_video_capturer_factory.h

Issue 21421002: Revert EVS revisions 209760, 298753, 213143. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased at 216225, prepare to land Created 7 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
Index: content/renderer/media/rtc_encoding_video_capturer_factory.h
diff --git a/content/renderer/media/rtc_encoding_video_capturer_factory.h b/content/renderer/media/rtc_encoding_video_capturer_factory.h
deleted file mode 100644
index 1fdf4f5e26c16baf5c3691e0ba7b1e1c11432e63..0000000000000000000000000000000000000000
--- a/content/renderer/media/rtc_encoding_video_capturer_factory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_RENDERER_MEDIA_RTC_ENCODING_VIDEO_CAPTURER_FACTORY_H_
-#define CONTENT_RENDERER_MEDIA_RTC_ENCODING_VIDEO_CAPTURER_FACTORY_H_
-
-#include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
-#include "media/video/encoded_video_source.h"
-#include "media/video/video_encode_types.h"
-#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoencoderfactory.h"
-
-namespace content {
-
-class RtcEncodingVideoCapturer;
-
-class RtcEncodingVideoCapturerFactory :
- public cricket::WebRtcVideoEncoderFactory,
- public base::SupportsWeakPtr<RtcEncodingVideoCapturerFactory> {
- public:
- RtcEncodingVideoCapturerFactory();
-
- // WebRtcVideoEncoderFactory interface.
- virtual webrtc::VideoEncoder* CreateVideoEncoder(
- webrtc::VideoCodecType type) OVERRIDE;
- virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) OVERRIDE;
-
- virtual const std::vector<VideoCodec>& codecs() const OVERRIDE;
-
- virtual void AddObserver(
- WebRtcVideoEncoderFactory::Observer* observer) OVERRIDE;
- virtual void RemoveObserver(
- WebRtcVideoEncoderFactory::Observer* observer) OVERRIDE;
-
- // Callback for RequestCapabilities().
- void OnCapabilitiesAvailable(const media::VideoEncodingCapabilities& caps);
-
- // Invoked when an EncodedVideoSource is added/removed.
- void OnEncodedVideoSourceAdded(media::EncodedVideoSource* source);
- void OnEncodedVideoSourceRemoved(media::EncodedVideoSource* source);
-
-private:
- virtual ~RtcEncodingVideoCapturerFactory();
-
- // Set of registered encoding capable video capturers.
- typedef std::set<webrtc::VideoEncoder*> EncoderSet;
-
- media::EncodedVideoSource* encoded_video_source_;
- std::vector<VideoCodec> codecs_;
-
- EncoderSet encoder_set_;
-
- ObserverList<WebRtcVideoEncoderFactory::Observer, true> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(RtcEncodingVideoCapturerFactory);
-};
-
-} // namespace content
-
-#endif // CONTENT_RENDERER_MEDIA_RTC_ENCODING_VIDEO_CAPTURER_FACTORY_H_
« no previous file with comments | « content/renderer/media/rtc_encoding_video_capturer.cc ('k') | content/renderer/media/rtc_encoding_video_capturer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698