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

Side by Side Diff: content/renderer/pepper/pepper_media_stream_video_track_host.cc

Issue 2970823003: Rename MediaStreamVideoSource:GetCurrentFormatImpl() to GetCurrentFormat() (Closed)
Patch Set: add DCHECK Created 3 years, 5 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
« no previous file with comments | « content/renderer/media/mock_media_stream_video_source.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 {
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
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
OLDNEW
« no previous file with comments | « content/renderer/media/mock_media_stream_video_source.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698