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

Side by Side Diff: media/filters/ffmpeg_demuxer.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) 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/filters/ffmpeg_demuxer.h" 5 #include "media/filters/ffmpeg_demuxer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/callback_helpers.h" 13 #include "base/callback_helpers.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop/message_loop_proxy.h" 15 #include "base/message_loop/message_loop_proxy.h"
16 #include "base/metrics/sparse_histogram.h" 16 #include "base/metrics/sparse_histogram.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
19 #include "base/sys_byteorder.h" 19 #include "base/sys_byteorder.h"
20 #include "base/task_runner_util.h" 20 #include "base/task_runner_util.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "media/base/audio_decoder_config.h" 22 #include "media/base/audio_decoder_config.h"
23 #include "media/base/bind_to_loop.h" 23 #include "media/base/bind_to_current_loop.h"
24 #include "media/base/decoder_buffer.h" 24 #include "media/base/decoder_buffer.h"
25 #include "media/base/decrypt_config.h" 25 #include "media/base/decrypt_config.h"
26 #include "media/base/limits.h" 26 #include "media/base/limits.h"
27 #include "media/base/media_log.h" 27 #include "media/base/media_log.h"
28 #include "media/base/video_decoder_config.h" 28 #include "media/base/video_decoder_config.h"
29 #include "media/ffmpeg/ffmpeg_common.h" 29 #include "media/ffmpeg/ffmpeg_common.h"
30 #include "media/filters/ffmpeg_glue.h" 30 #include "media/filters/ffmpeg_glue.h"
31 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h" 31 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h"
32 #include "media/filters/webvtt_util.h" 32 #include "media/filters/webvtt_util.h"
33 #include "media/webm/webm_crypto_helpers.h" 33 #include "media/webm/webm_crypto_helpers.h"
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 } 944 }
945 for (size_t i = 0; i < buffered.size(); ++i) 945 for (size_t i = 0; i < buffered.size(); ++i)
946 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); 946 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
947 } 947 }
948 948
949 void FFmpegDemuxer::OnDataSourceError() { 949 void FFmpegDemuxer::OnDataSourceError() {
950 host_->OnDemuxerError(PIPELINE_ERROR_READ); 950 host_->OnDemuxerError(PIPELINE_ERROR_READ);
951 } 951 }
952 952
953 } // namespace media 953 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698