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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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
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/capture/video/win/video_capture_device_win.h" 5 #include "media/capture/video/win/video_capture_device_win.h"
6 6
7 #include <ks.h> 7 #include <ks.h>
8 #include <ksmedia.h> 8 #include <ksmedia.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 } 440 }
441 441
442 graph_builder_->Disconnect(output_capture_pin_.get()); 442 graph_builder_->Disconnect(output_capture_pin_.get());
443 graph_builder_->Disconnect(input_sink_pin_.get()); 443 graph_builder_->Disconnect(input_sink_pin_.get());
444 444
445 client_.reset(); 445 client_.reset();
446 state_ = kIdle; 446 state_ = kIdle;
447 } 447 }
448 448
449 // Implements SinkFilterObserver::SinkFilterObserver. 449 // Implements SinkFilterObserver::SinkFilterObserver.
450 void VideoCaptureDeviceWin::FrameReceived( 450 void VideoCaptureDeviceWin::FrameReceived(const uint8_t* buffer,
451 const uint8* buffer, 451 int length,
452 int length, 452 base::TimeTicks timestamp) {
453 base::TimeTicks timestamp) {
454 client_->OnIncomingCapturedData(buffer, length, capture_format_, 0, 453 client_->OnIncomingCapturedData(buffer, length, capture_format_, 0,
455 timestamp); 454 timestamp);
456 } 455 }
457 456
458 bool VideoCaptureDeviceWin::CreateCapabilityMap() { 457 bool VideoCaptureDeviceWin::CreateCapabilityMap() {
459 DCHECK(thread_checker_.CalledOnValidThread()); 458 DCHECK(thread_checker_.CalledOnValidThread());
460 ScopedComPtr<IAMStreamConfig> stream_config; 459 ScopedComPtr<IAMStreamConfig> stream_config;
461 HRESULT hr = output_capture_pin_.QueryInterface(stream_config.Receive()); 460 HRESULT hr = output_capture_pin_.QueryInterface(stream_config.Receive());
462 if (FAILED(hr)) { 461 if (FAILED(hr)) {
463 DPLOG(ERROR) << "Failed to get IAMStreamConfig interface from " 462 DPLOG(ERROR) << "Failed to get IAMStreamConfig interface from "
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 } 573 }
575 574
576 void VideoCaptureDeviceWin::SetErrorState( 575 void VideoCaptureDeviceWin::SetErrorState(
577 const tracked_objects::Location& from_here, 576 const tracked_objects::Location& from_here,
578 const std::string& reason) { 577 const std::string& reason) {
579 DCHECK(thread_checker_.CalledOnValidThread()); 578 DCHECK(thread_checker_.CalledOnValidThread());
580 state_ = kError; 579 state_ = kError;
581 client_->OnError(from_here, reason); 580 client_->OnError(from_here, reason);
582 } 581 }
583 } // namespace media 582 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698