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

Side by Side Diff: media/filters/omx_video_decoder.cc

Issue 6969026: Convert Filter::Seek() to use new callback system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More CR fixes Created 9 years, 7 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
« no previous file with comments | « media/filters/omx_video_decoder.h ('k') | media/filters/rtc_video_decoder.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/filters/omx_video_decoder.h" 5 #include "media/filters/omx_video_decoder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "media/base/callback.h" 10 #include "media/base/callback.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 150
151 void OmxVideoDecoder::OnFlushComplete() { 151 void OmxVideoDecoder::OnFlushComplete() {
152 DCHECK(flush_callback_.get()); 152 DCHECK(flush_callback_.get());
153 153
154 AutoCallbackRunner done_runner(flush_callback_.release()); 154 AutoCallbackRunner done_runner(flush_callback_.release());
155 155
156 pts_stream_.Flush(); 156 pts_stream_.Flush();
157 } 157 }
158 158
159 void OmxVideoDecoder::Seek(base::TimeDelta time, 159 void OmxVideoDecoder::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
160 FilterCallback* callback) {
161 if (MessageLoop::current() != message_loop_) { 160 if (MessageLoop::current() != message_loop_) {
162 message_loop_->PostTask(FROM_HERE, 161 message_loop_->PostTask(FROM_HERE,
163 NewRunnableMethod(this, 162 NewRunnableMethod(this,
164 &OmxVideoDecoder::Seek, 163 &OmxVideoDecoder::Seek,
165 time, 164 time,
166 callback)); 165 cb));
167 return; 166 return;
168 } 167 }
169 168
170 DCHECK_EQ(MessageLoop::current(), message_loop_); 169 DCHECK_EQ(MessageLoop::current(), message_loop_);
171 DCHECK(!seek_callback_.get()); 170 DCHECK(seek_cb_.is_null());
172 171
173 pts_stream_.Seek(time); 172 pts_stream_.Seek(time);
174 seek_callback_.reset(callback); 173 seek_cb_ = cb;
175 decode_engine_->Seek(); 174 decode_engine_->Seek();
176 } 175 }
177 176
178 void OmxVideoDecoder::OnSeekComplete() { 177 void OmxVideoDecoder::OnSeekComplete() {
179 DCHECK_EQ(MessageLoop::current(), message_loop_); 178 DCHECK_EQ(MessageLoop::current(), message_loop_);
180 DCHECK(seek_callback_.get()); 179 DCHECK(!seek_cb_.is_null());
181 180
182 AutoCallbackRunner done_runner(seek_callback_.release()); 181 ResetAndRunCB(&seek_cb_, PIPELINE_OK);
183 } 182 }
184 183
185 void OmxVideoDecoder::OnError() { 184 void OmxVideoDecoder::OnError() {
186 NOTIMPLEMENTED(); 185 NOTIMPLEMENTED();
187 } 186 }
188 void OmxVideoDecoder::OnFormatChange(VideoStreamInfo stream_info) { 187 void OmxVideoDecoder::OnFormatChange(VideoStreamInfo stream_info) {
189 NOTIMPLEMENTED(); 188 NOTIMPLEMENTED();
190 } 189 }
191 190
192 void OmxVideoDecoder::ProduceVideoSample(scoped_refptr<Buffer> buffer) { 191 void OmxVideoDecoder::ProduceVideoSample(scoped_refptr<Buffer> buffer) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 if (buffer.get()) 241 if (buffer.get())
243 pts_stream_.EnqueuePts(buffer.get()); 242 pts_stream_.EnqueuePts(buffer.get());
244 decode_engine_->ConsumeVideoSample(buffer); 243 decode_engine_->ConsumeVideoSample(buffer);
245 } 244 }
246 245
247 } // namespace media 246 } // namespace media
248 247
249 // Disable refcounting for the decode engine because it only lives on the 248 // Disable refcounting for the decode engine because it only lives on the
250 // video decoder thread. 249 // video decoder thread.
251 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::VideoDecodeEngine); 250 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::VideoDecodeEngine);
OLDNEW
« no previous file with comments | « media/filters/omx_video_decoder.h ('k') | media/filters/rtc_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698