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

Side by Side Diff: webkit/glue/webmediaplayer_impl.cc

Issue 6901135: Rewriting FFmpegAudioDecoder and eliminating DecoderBase. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fix run_all_unittests Created 9 years, 3 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) 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 "webkit/glue/webmediaplayer_impl.h" 5 #include "webkit/glue/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h"
acolwell GONE FROM CHROMIUM 2011/09/13 22:09:28 accidentally included?
scherkus (not reviewing) 2011/09/16 18:10:13 nope -- decoder_base.h used to include it but now
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/command_line.h" 12 #include "base/command_line.h"
12 #include "media/base/composite_data_source_factory.h" 13 #include "media/base/composite_data_source_factory.h"
13 #include "media/base/filter_collection.h" 14 #include "media/base/filter_collection.h"
14 #include "media/base/limits.h" 15 #include "media/base/limits.h"
15 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
16 #include "media/base/media_switches.h" 17 #include "media/base/media_switches.h"
17 #include "media/base/pipeline_impl.h" 18 #include "media/base/pipeline_impl.h"
18 #include "media/base/video_frame.h" 19 #include "media/base/video_frame.h"
19 #include "media/filters/adaptive_demuxer.h" 20 #include "media/filters/adaptive_demuxer.h"
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 } 816 }
816 } 817 }
817 818
818 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 819 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
819 DCHECK(MessageLoop::current() == main_loop_); 820 DCHECK(MessageLoop::current() == main_loop_);
820 DCHECK(client_); 821 DCHECK(client_);
821 return client_; 822 return client_;
822 } 823 }
823 824
824 } // namespace webkit_glue 825 } // namespace webkit_glue
OLDNEW
« media/filters/ffmpeg_audio_decoder_unittest.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698