| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "content/renderer/media/capture_video_decoder.h" | 8 #include "content/renderer/media/capture_video_decoder.h" |
| 9 #include "content/renderer/media/video_capture_impl_manager.h" | 9 #include "content/renderer/media/video_capture_impl_manager.h" |
| 10 #include "googleurl/src/gurl.h" | 10 #include "googleurl/src/gurl.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 bool raw_media = (url.spec().find(kRawMediaScheme) == 0); | 35 bool raw_media = (url.spec().find(kRawMediaScheme) == 0); |
| 36 media::VideoDecoder* decoder = NULL; | 36 media::VideoDecoder* decoder = NULL; |
| 37 if (raw_media) { | 37 if (raw_media) { |
| 38 media::VideoCapture::VideoCaptureCapability capability; | 38 media::VideoCapture::VideoCaptureCapability capability; |
| 39 capability.width = kVideoCaptureWidth; | 39 capability.width = kVideoCaptureWidth; |
| 40 capability.height = kVideoCaptureHeight; | 40 capability.height = kVideoCaptureHeight; |
| 41 capability.max_fps = kVideoCaptureFramePerSecond; | 41 capability.max_fps = kVideoCaptureFramePerSecond; |
| 42 capability.expected_capture_delay = 0; | 42 capability.expected_capture_delay = 0; |
| 43 capability.raw_type = media::VideoFrame::I420; | 43 capability.raw_type = media::VideoFrame::I420; |
| 44 capability.interlaced = false; | 44 capability.interlaced = false; |
| 45 capability.resolution_fixed = false; | |
| 46 | 45 |
| 47 decoder = new CaptureVideoDecoder( | 46 decoder = new CaptureVideoDecoder( |
| 48 message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoder").get(), | 47 message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoder").get(), |
| 49 kStartOpenSessionId, vc_manager_.get(), capability); | 48 kStartOpenSessionId, vc_manager_.get(), capability); |
| 50 } | 49 } |
| 51 return decoder; | 50 return decoder; |
| 52 } | 51 } |
| OLD | NEW |