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

Unified Diff: content/renderer/media/video_capture_impl.cc

Issue 16320005: Define EncodedVideoSource and RtcCapturedEncodingVideoCapturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 6 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_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 1382c8fe169b188b707d156009172e05981e0a29..395bf4651595ea238fda22a27deaacf79ceb7efe 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -58,6 +58,7 @@ VideoCaptureImpl::VideoCaptureImpl(
video_type_(media::VideoCaptureCapability::kI420),
device_info_available_(false),
suspended_(false),
+ encoding_supported_(false),
state_(VIDEO_CAPTURE_STATE_STOPPED) {
DCHECK(filter);
memset(&current_params_, 0, sizeof(current_params_));
@@ -101,6 +102,54 @@ void VideoCaptureImpl::StopCapture(media::VideoCapture::EventHandler* handler) {
base::Unretained(this), handler));
}
+media::EncodedVideoSource* VideoCaptureImpl::GetEncodedVideoSource() {
+ return this;
Ami GONE FROM CHROMIUM 2013/06/08 00:18:01 shouldn't this be conditionalized on encoding_supp
hshi1 2013/06/11 19:51:22 Got rid of this.
+}
+
+void VideoCaptureImpl::OnCapabilityAvailable(
+ const media::VideoEncodingCapability& capability) {
+ CapturedEncodedVideoSourceImpl::OnCapabilityAvailable(capability);
Ami GONE FROM CHROMIUM 2013/06/08 00:18:01 having to write l.109-139 is usually a code smell
hshi1 2013/06/11 19:51:22 I've flattened the VCImpl - CapturedEncodedVideoCa
+}
+
+void VideoCaptureImpl::OnBitstreamCreated(
+ int stream_id,
+ const media::VideoEncodingParameters& params,
+ const std::map<int, base::SharedMemoryHandle>& buffers) {
+ CapturedEncodedVideoSourceImpl::OnBitstreamCreated(
+ stream_id, params, buffers);
+}
+
+void VideoCaptureImpl::OnBitstreamDestroyed(int stream_id) {
+ CapturedEncodedVideoSourceImpl::OnBitstreamDestroyed(stream_id);
+}
+
+void VideoCaptureImpl::OnBitstreamConfigChanged(
+ int stream_id,
+ const media::RuntimeVideoEncodingParameters& params) {
+ CapturedEncodedVideoSourceImpl::OnBitstreamConfigChanged(stream_id, params);
+}
+
+void VideoCaptureImpl::OnBitstreamReady(
+ int stream_id,
+ int buffer_id,
+ size_t size,
+ const media::BufferEncodingMetadata& metadata) {
+ CapturedEncodedVideoSourceImpl::OnBitstreamReady(
+ stream_id, buffer_id, size, metadata);
+}
+
+int VideoCaptureImpl::device_id() {
+ return device_id_;
+}
+
+scoped_refptr<base::MessageLoopProxy> VideoCaptureImpl::app_loop_proxy() {
+ return capture_message_loop_proxy_;
+}
+
+scoped_refptr<base::MessageLoopProxy> VideoCaptureImpl::io_loop_proxy() {
+ return io_message_loop_proxy_;
+}
+
void VideoCaptureImpl::FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) {
capture_message_loop_proxy_->PostTask(FROM_HERE,
base::Bind(&VideoCaptureImpl::DoFeedBufferOnCaptureThread,
@@ -306,6 +355,7 @@ void VideoCaptureImpl::DoStateChangedOnCaptureThread(VideoCaptureState state) {
switch (state) {
case VIDEO_CAPTURE_STATE_STARTED:
+ CapturedEncodedVideoSourceImpl::StartFetchCapabilities();
Ami GONE FROM CHROMIUM 2013/06/08 00:18:01 why "CapturedEncodedVideoSourceImpl::"?
hshi1 2013/06/11 19:51:22 No longer needed.
break;
case VIDEO_CAPTURE_STATE_STOPPED:
state_ = VIDEO_CAPTURE_STATE_STOPPED;

Powered by Google App Engine
This is Rietveld 408576698