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

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

Issue 132163006: Rename media/base/bind_to_loop.h to media/base/bind_to_current_loop.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/filters/video_frame_stream.h" 5 #include "media/filters/video_frame_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "media/base/bind_to_loop.h" 13 #include "media/base/bind_to_current_loop.h"
14 #include "media/base/decoder_buffer.h" 14 #include "media/base/decoder_buffer.h"
15 #include "media/base/demuxer_stream.h" 15 #include "media/base/demuxer_stream.h"
16 #include "media/base/video_decoder_config.h" 16 #include "media/base/video_decoder_config.h"
17 #include "media/filters/decrypting_demuxer_stream.h" 17 #include "media/filters/decrypting_demuxer_stream.h"
18 #include "media/filters/video_decoder_selector.h" 18 #include "media/filters/video_decoder_selector.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 VideoFrameStream::VideoFrameStream( 22 VideoFrameStream::VideoFrameStream(
23 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 23 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 DCHECK(!stop_cb_.is_null()); 445 DCHECK(!stop_cb_.is_null());
446 446
447 state_ = STATE_STOPPED; 447 state_ = STATE_STOPPED;
448 stream_ = NULL; 448 stream_ = NULL;
449 decoder_.reset(); 449 decoder_.reset();
450 decrypting_demuxer_stream_.reset(); 450 decrypting_demuxer_stream_.reset();
451 base::ResetAndReturn(&stop_cb_).Run(); 451 base::ResetAndReturn(&stop_cb_).Run();
452 } 452 }
453 453
454 } // namespace media 454 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698