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

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

Issue 8418017: Miscellaneous header file cleanup for src/media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add at_exit Created 9 years, 1 month 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/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('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 // Implements a Demuxer that can switch among different data sources mid-stream. 5 // Implements a Demuxer that can switch among different data sources mid-stream.
6 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of 6 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of
7 // ffmpeg_demuxer.h. 7 // ffmpeg_demuxer.h.
8 8
9 #include "media/filters/chunk_demuxer.h" 9 #include "media/filters/chunk_demuxer.h"
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "media/base/audio_decoder_config.h"
14 #include "media/base/filter_host.h" 15 #include "media/base/filter_host.h"
15 #include "media/base/data_buffer.h" 16 #include "media/base/data_buffer.h"
17 #include "media/base/video_decoder_config.h"
16 #include "media/ffmpeg/ffmpeg_common.h" 18 #include "media/ffmpeg/ffmpeg_common.h"
17 #include "media/filters/chunk_demuxer_client.h" 19 #include "media/filters/chunk_demuxer_client.h"
18 #include "media/filters/ffmpeg_glue.h" 20 #include "media/filters/ffmpeg_glue.h"
19 #include "media/filters/in_memory_url_protocol.h" 21 #include "media/filters/in_memory_url_protocol.h"
20 #include "media/webm/webm_cluster_parser.h" 22 #include "media/webm/webm_cluster_parser.h"
21 #include "media/webm/webm_constants.h" 23 #include "media/webm/webm_constants.h"
22 #include "media/webm/webm_info_parser.h" 24 #include "media/webm/webm_info_parser.h"
23 #include "media/webm/webm_tracks_parser.h" 25 #include "media/webm/webm_tracks_parser.h"
24 26
25 namespace media { 27 namespace media {
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 base::AutoUnlock auto_unlock(lock_); 739 base::AutoUnlock auto_unlock(lock_);
738 if (cb.is_null()) { 740 if (cb.is_null()) {
739 host()->SetError(error); 741 host()->SetError(error);
740 return; 742 return;
741 } 743 }
742 cb.Run(error); 744 cb.Run(error);
743 } 745 }
744 } 746 }
745 747
746 } // namespace media 748 } // namespace media
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698