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

Side by Side Diff: media/video/capture/win/video_capture_device_win.cc

Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: ffdbaeb83 Trybot failures. Created 7 years, 1 month 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 | « media/video/capture/win/video_capture_device_mf_win.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 (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 "media/video/capture/win/video_capture_device_win.h" 5 #include "media/video/capture/win/video_capture_device_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 SetErrorState("Failed to Stop the Capture device"); 471 SetErrorState("Failed to Stop the Capture device");
472 return; 472 return;
473 } 473 }
474 client_.reset(); 474 client_.reset();
475 state_ = kIdle; 475 state_ = kIdle;
476 } 476 }
477 477
478 // Implements SinkFilterObserver::SinkFilterObserver. 478 // Implements SinkFilterObserver::SinkFilterObserver.
479 void VideoCaptureDeviceWin::FrameReceived(const uint8* buffer, 479 void VideoCaptureDeviceWin::FrameReceived(const uint8* buffer,
480 int length) { 480 int length) {
481 client_->OnIncomingCapturedFrame(buffer, length, base::Time::Now(), 481 client_->OnIncomingCapturedFrame(
482 0, false, false, current_setting_); 482 buffer, length, base::Time::Now(), 0, false, false, current_setting_);
483 } 483 }
484 484
485 bool VideoCaptureDeviceWin::CreateCapabilityMap() { 485 bool VideoCaptureDeviceWin::CreateCapabilityMap() {
486 DCHECK(CalledOnValidThread()); 486 DCHECK(CalledOnValidThread());
487 ScopedComPtr<IAMStreamConfig> stream_config; 487 ScopedComPtr<IAMStreamConfig> stream_config;
488 HRESULT hr = output_capture_pin_.QueryInterface(stream_config.Receive()); 488 HRESULT hr = output_capture_pin_.QueryInterface(stream_config.Receive());
489 if (FAILED(hr)) { 489 if (FAILED(hr)) {
490 DVLOG(2) << "Failed to get IAMStreamConfig interface from " 490 DVLOG(2) << "Failed to get IAMStreamConfig interface from "
491 "capture device"; 491 "capture device";
492 return false; 492 return false;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 return !capabilities_.empty(); 588 return !capabilities_.empty();
589 } 589 }
590 590
591 void VideoCaptureDeviceWin::SetErrorState(const char* reason) { 591 void VideoCaptureDeviceWin::SetErrorState(const char* reason) {
592 DCHECK(CalledOnValidThread()); 592 DCHECK(CalledOnValidThread());
593 DVLOG(1) << reason; 593 DVLOG(1) << reason;
594 state_ = kError; 594 state_ = kError;
595 client_->OnError(); 595 client_->OnError();
596 } 596 }
597 } // namespace media 597 } // namespace media
OLDNEW
« no previous file with comments | « media/video/capture/win/video_capture_device_mf_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698