Chromium Code Reviews| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 421 new FrameDeliverer(io_task_runner(), frame_callback); | 421 new FrameDeliverer(io_task_runner(), frame_callback); |
| 422 } | 422 } |
| 423 } | 423 } |
| 424 | 424 |
| 425 void StopSourceImpl() final { | 425 void StopSourceImpl() final { |
| 426 if (host_) | 426 if (host_) |
| 427 host_->frame_deliverer_ = nullptr; | 427 host_->frame_deliverer_ = nullptr; |
| 428 } | 428 } |
| 429 | 429 |
| 430 private: | 430 private: |
| 431 base::Optional<media::VideoCaptureFormat> GetCurrentFormatImpl() | 431 base::Optional<media::VideoCaptureFormat> GetCurrentFormat() const override { |
|
hbos_chromium
2017/07/04 14:34:30
public?
Guido Urdaneta
2017/07/05 15:28:25
no need.
| |
| 432 const override { | |
| 433 if (host_) { | 432 if (host_) { |
| 434 return base::Optional<media::VideoCaptureFormat>( | 433 return base::Optional<media::VideoCaptureFormat>( |
| 435 media::VideoCaptureFormat( | 434 media::VideoCaptureFormat( |
| 436 host_->plugin_frame_size_, kDefaultOutputFrameRate, | 435 host_->plugin_frame_size_, kDefaultOutputFrameRate, |
| 437 ToPixelFormat(host_->plugin_frame_format_))); | 436 ToPixelFormat(host_->plugin_frame_format_))); |
| 438 } | 437 } |
| 439 return base::Optional<media::VideoCaptureFormat>(); | 438 return base::Optional<media::VideoCaptureFormat>(); |
| 440 } | 439 } |
| 441 | 440 |
| 442 const base::WeakPtr<PepperMediaStreamVideoTrackHost> host_; | 441 const base::WeakPtr<PepperMediaStreamVideoTrackHost> host_; |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 528 } | 527 } |
| 529 | 528 |
| 530 void PepperMediaStreamVideoTrackHost::OnTrackStarted( | 529 void PepperMediaStreamVideoTrackHost::OnTrackStarted( |
| 531 MediaStreamSource* source, | 530 MediaStreamSource* source, |
| 532 MediaStreamRequestResult result, | 531 MediaStreamRequestResult result, |
| 533 const blink::WebString& result_name) { | 532 const blink::WebString& result_name) { |
| 534 DVLOG(3) << "OnTrackStarted result: " << result; | 533 DVLOG(3) << "OnTrackStarted result: " << result; |
| 535 } | 534 } |
| 536 | 535 |
| 537 } // namespace content | 536 } // namespace content |
| OLD | NEW |