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

Side by Side Diff: content/renderer/media/media_stream_impl.cc

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix content_unittests build failure Created 8 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_impl.h" 5 #include "content/renderer/media/media_stream_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 } 231 }
232 if (msm_label.empty()) 232 if (msm_label.empty())
233 return NULL; 233 return NULL;
234 234
235 scoped_refptr<media::VideoDecoder> decoder; 235 scoped_refptr<media::VideoDecoder> decoder;
236 if (media_stream_dispatcher_->IsStream(msm_label)) { 236 if (media_stream_dispatcher_->IsStream(msm_label)) {
237 // It's a local stream. 237 // It's a local stream.
238 int video_session_id = 238 int video_session_id =
239 media_stream_dispatcher_->video_session_id(msm_label, 0); 239 media_stream_dispatcher_->video_session_id(msm_label, 0);
240 media::VideoCapture::VideoCaptureCapability capability; 240 media::VideoCaptureCapability capability;
241 capability.width = kVideoCaptureWidth; 241 capability.width = kVideoCaptureWidth;
242 capability.height = kVideoCaptureHeight; 242 capability.height = kVideoCaptureHeight;
243 capability.max_fps = kVideoCaptureFramePerSecond; 243 capability.frame_rate = kVideoCaptureFramePerSecond;
244 capability.expected_capture_delay = 0; 244 capability.expected_capture_delay = 0;
245 capability.raw_type = media::VideoFrame::I420; 245 capability.color = media::VideoFrame::I420;
246 capability.interlaced = false; 246 capability.interlaced = false;
247 decoder = new CaptureVideoDecoder( 247 decoder = new CaptureVideoDecoder(
248 message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoderThread"), 248 message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoderThread"),
249 video_session_id, 249 video_session_id,
250 vc_manager_.get(), 250 vc_manager_.get(),
251 capability); 251 capability);
252 } else { 252 } else {
253 // It's a remote stream. 253 // It's a remote stream.
254 std::string desc_label = UTF16ToUTF8(descriptor.label()); 254 std::string desc_label = UTF16ToUTF8(descriptor.label());
255 PeerConnectionHandlerBase* pc_handler = NULL; 255 PeerConnectionHandlerBase* pc_handler = NULL;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 } 497 }
498 498
499 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper() {} 499 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper() {}
500 500
501 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {} 501 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {}
502 502
503 void MediaStreamImpl::VideoRendererWrapper::SetVideoDecoder( 503 void MediaStreamImpl::VideoRendererWrapper::SetVideoDecoder(
504 RTCVideoDecoder* decoder) { 504 RTCVideoDecoder* decoder) {
505 rtc_video_decoder_ = decoder; 505 rtc_video_decoder_ = decoder;
506 } 506 }
OLDNEW
« no previous file with comments | « content/renderer/media/capture_video_decoder_unittest.cc ('k') | content/renderer/media/video_capture_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698