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

Unified Diff: content/renderer/media/video_capture_message_filter.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/video_capture_message_filter.h
diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h
index ede6ab61c3b82084b5a7993e9ffaed2b991fe01a..013e2d086a67b35e8f8ed020c8f34048738b66a8 100644
--- a/content/renderer/media/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -18,7 +18,6 @@
#include "content/common/media/video_capture.h"
#include "ipc/ipc_channel_proxy.h"
#include "media/video/capture/video_capture.h"
-#include "media/video/encoded_video_source.h"
namespace content {
@@ -52,31 +51,6 @@ class CONTENT_EXPORT VideoCaptureMessageFilter
// |device_id| is the device id for the delegate.
virtual void OnDelegateAdded(int32 device_id) = 0;
- // Called when the encoding capabilities is received from video capture
- // device in the browser process.
- virtual void OnEncodingCapabilitiesAvailable(
- const media::VideoEncodingCapabilities& capabilities) = 0;
-
- // Called when a bitstream is opened on a video capture device.
- virtual void OnEncodedBitstreamOpened(
- const media::VideoEncodingParameters& params,
- const std::vector<base::SharedMemoryHandle>& buffers,
- uint32 buffer_size) = 0;
-
- // Called when a bitstream is closed on a video capture device.
- virtual void OnEncodedBitstreamClosed() = 0;
-
- // Called when encoding parameters has changed.
- virtual void OnEncodingConfigChanged(
- const media::RuntimeVideoEncodingParameters& params) = 0;
-
- // Called when an encoded bitstream buffer is received from video capture
- // device in the browser process.
- virtual void OnEncodedBufferReady(
- int buffer_id,
- uint32 size,
- const media::BufferEncodingMetadata& metadata) = 0;
-
protected:
virtual ~Delegate() {}
};
@@ -123,31 +97,6 @@ class CONTENT_EXPORT VideoCaptureMessageFilter
void OnDeviceInfoReceived(int device_id,
const media::VideoCaptureParams& params);
- // Receive newly changed device info from browser process.
- void OnDeviceInfoChanged(int device_id,
- const media::VideoCaptureParams& params);
-
- // Receive encoding capabilities from browser process.
- void OnCapabilitiesAvailable(int device_id,
- media::VideoEncodingCapabilities capabilities);
-
- // Bitstream is opened on video capture device.
- void OnBitstreamOpened(int device_id,
- media::VideoEncodingParameters params,
- std::vector<base::SharedMemoryHandle> buffers,
- uint32 buffer_size);
-
- // Bitstream is closed on video capture device.
- void OnBitstreamClosed(int device_id);
-
- // Receive current encoding parameters from browser process.
- void OnBitstreamConfigChanged(int device_id,
- media::RuntimeVideoEncodingParameters params);
-
- // Receive an encoded bitstream buffer from browser process.
- void OnBitstreamReady(int device_id, int buffer_id, uint32 size,
- media::BufferEncodingMetadata metadata);
-
// Finds the delegate associated with |device_id|, NULL if not found.
Delegate* find_delegate(int device_id) const;
« no previous file with comments | « content/renderer/media/video_capture_impl_unittest.cc ('k') | content/renderer/media/video_capture_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698