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

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

Issue 19622002: Use a direct include of the message_loop header in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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/command_line.h" 14 #include "base/command_line.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/metrics/sparse_histogram.h" 17 #include "base/metrics/sparse_histogram.h"
18 #include "base/stl_util.h" 18 #include "base/stl_util.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.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_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"
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 } 774 }
775 for (size_t i = 0; i < buffered.size(); ++i) 775 for (size_t i = 0; i < buffered.size(); ++i)
776 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i)); 776 host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
777 } 777 }
778 778
779 void FFmpegDemuxer::OnDataSourceError() { 779 void FFmpegDemuxer::OnDataSourceError() {
780 host_->OnDemuxerError(PIPELINE_ERROR_READ); 780 host_->OnDemuxerError(PIPELINE_ERROR_READ);
781 } 781 }
782 782
783 } // namespace media 783 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_audio_decoder_unittest.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698