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

Side by Side Diff: media/base/video_frame_pool.cc

Issue 183113004: Make sure MediaStreamVideoSource support cropping. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Crop with origin 0,0 and temporary disable failing test. Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/base/video_frame_pool.h" 5 #include "media/base/video_frame_pool.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 break; 79 break;
80 } 80 }
81 } 81 }
82 82
83 if (!frame) { 83 if (!frame) {
84 frame = VideoFrame::CreateFrame( 84 frame = VideoFrame::CreateFrame(
85 format, coded_size, visible_rect, natural_size, timestamp); 85 format, coded_size, visible_rect, natural_size, timestamp);
86 } 86 }
87 87
88 return VideoFrame::WrapVideoFrame( 88 return VideoFrame::WrapVideoFrame(
89 frame, base::Bind(&VideoFramePool::PoolImpl::FrameReleased, this, frame)); 89 frame, visible_rect,
90 base::Bind(&VideoFramePool::PoolImpl::FrameReleased, this, frame));
90 } 91 }
91 92
92 void VideoFramePool::PoolImpl::Shutdown() { 93 void VideoFramePool::PoolImpl::Shutdown() {
93 base::AutoLock auto_lock(lock_); 94 base::AutoLock auto_lock(lock_);
94 is_shutdown_ = true; 95 is_shutdown_ = true;
95 frames_.clear(); 96 frames_.clear();
96 } 97 }
97 98
98 void VideoFramePool::PoolImpl::FrameReleased( 99 void VideoFramePool::PoolImpl::FrameReleased(
99 const scoped_refptr<VideoFrame>& frame) { 100 const scoped_refptr<VideoFrame>& frame) {
(...skipping 19 matching lines...) Expand all
119 base::TimeDelta timestamp) { 120 base::TimeDelta timestamp) {
120 return pool_->CreateFrame(format, coded_size, visible_rect, natural_size, 121 return pool_->CreateFrame(format, coded_size, visible_rect, natural_size,
121 timestamp); 122 timestamp);
122 } 123 }
123 124
124 size_t VideoFramePool::GetPoolSizeForTesting() const { 125 size_t VideoFramePool::GetPoolSizeForTesting() const {
125 return pool_->GetPoolSizeForTesting(); 126 return pool_->GetPoolSizeForTesting();
126 } 127 }
127 128
128 } // namespace media 129 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698