OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/pepper/pepper_media_stream_video_track_host.h" | 5 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
426 media::VideoCaptureFormats formats; | 426 media::VideoCaptureFormats formats; |
427 formats.push_back( | 427 formats.push_back( |
428 media::VideoCaptureFormat(plugin_frame_size_, | 428 media::VideoCaptureFormat(plugin_frame_size_, |
429 kDefaultOutputFrameRate, | 429 kDefaultOutputFrameRate, |
430 ToPixelFormat(plugin_frame_format_))); | 430 ToPixelFormat(plugin_frame_format_))); |
431 callback.Run(formats); | 431 callback.Run(formats); |
432 } | 432 } |
433 | 433 |
434 void PepperMediaStreamVideoTrackHost::StartSourceImpl( | 434 void PepperMediaStreamVideoTrackHost::StartSourceImpl( |
435 const media::VideoCaptureFormat& format, | 435 const media::VideoCaptureFormat& format, |
436 const blink::WebMediaConstraints& constraints, | |
bbudge
2015/05/08 17:12:48
Should we be doing something with this new paramet
miu
2015/05/08 18:07:18
Nope. It's just extra context used by other impls
| |
436 const VideoCaptureDeliverFrameCB& frame_callback) { | 437 const VideoCaptureDeliverFrameCB& frame_callback) { |
437 output_started_ = true; | 438 output_started_ = true; |
438 frame_deliverer_ = new FrameDeliverer(io_message_loop(), frame_callback); | 439 frame_deliverer_ = new FrameDeliverer(io_message_loop(), frame_callback); |
439 } | 440 } |
440 | 441 |
441 void PepperMediaStreamVideoTrackHost::StopSourceImpl() { | 442 void PepperMediaStreamVideoTrackHost::StopSourceImpl() { |
442 output_started_ = false; | 443 output_started_ = false; |
443 frame_deliverer_ = NULL; | 444 frame_deliverer_ = NULL; |
444 } | 445 } |
445 | 446 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
529 } | 530 } |
530 | 531 |
531 void PepperMediaStreamVideoTrackHost::OnTrackStarted( | 532 void PepperMediaStreamVideoTrackHost::OnTrackStarted( |
532 MediaStreamSource* source, | 533 MediaStreamSource* source, |
533 MediaStreamRequestResult result, | 534 MediaStreamRequestResult result, |
534 const blink::WebString& result_name) { | 535 const blink::WebString& result_name) { |
535 DVLOG(3) << "OnTrackStarted result: " << result; | 536 DVLOG(3) << "OnTrackStarted result: " << result; |
536 } | 537 } |
537 | 538 |
538 } // namespace content | 539 } // namespace content |
OLD | NEW |