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

Side by Side Diff: media/base/filter_collection.cc

Issue 10969028: Add video decoding methods in Decryptor and add DecryptingVideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder methods in the unittest Created 8 years, 2 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/base/decryptor.cc ('k') | media/base/mock_filters.h » ('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) 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/base/filter_collection.h" 5 #include "media/base/filter_collection.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/audio_decoder.h" 8 #include "media/base/audio_decoder.h"
9 #include "media/base/audio_renderer.h" 9 #include "media/base/audio_renderer.h"
10 #include "media/base/demuxer.h" 10 #include "media/base/demuxer.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 void FilterCollection::SelectVideoRenderer(scoped_refptr<VideoRenderer>* out) { 65 void FilterCollection::SelectVideoRenderer(scoped_refptr<VideoRenderer>* out) {
66 if (video_renderers_.empty()) { 66 if (video_renderers_.empty()) {
67 *out = NULL; 67 *out = NULL;
68 return; 68 return;
69 } 69 }
70 *out = video_renderers_.front(); 70 *out = video_renderers_.front();
71 video_renderers_.pop_front(); 71 video_renderers_.pop_front();
72 } 72 }
73 73
74 FilterCollection::VideoDecoderList* 74 FilterCollection::VideoDecoderList* FilterCollection::GetVideoDecoders() {
75 FilterCollection::GetVideoDecoders() {
76 return &video_decoders_; 75 return &video_decoders_;
77 } 76 }
78 77
79 } // namespace media 78 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decryptor.cc ('k') | media/base/mock_filters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698