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

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: all good 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
« no previous file with comments | « media/media.gyp ('k') | no next file » | 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 #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"
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 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 } 829 }
829 } 830 }
830 831
831 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 832 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
832 DCHECK(MessageLoop::current() == main_loop_); 833 DCHECK(MessageLoop::current() == main_loop_);
833 DCHECK(client_); 834 DCHECK(client_);
834 return client_; 835 return client_;
835 } 836 }
836 837
837 } // namespace webkit_glue 838 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698