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

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

Issue 11144036: Update Decryptor interface to support audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove leftover unretained 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/mock_filters.h ('k') | media/crypto/aes_decryptor.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/mock_filters.h" 5 #include "media/base/mock_filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 9
10 using ::testing::_; 10 using ::testing::_;
(...skipping 26 matching lines...) Expand all
37 MockVideoRenderer::~MockVideoRenderer() {} 37 MockVideoRenderer::~MockVideoRenderer() {}
38 38
39 MockAudioRenderer::MockAudioRenderer() {} 39 MockAudioRenderer::MockAudioRenderer() {}
40 40
41 MockAudioRenderer::~MockAudioRenderer() {} 41 MockAudioRenderer::~MockAudioRenderer() {}
42 42
43 MockDecryptor::MockDecryptor() {} 43 MockDecryptor::MockDecryptor() {}
44 44
45 MockDecryptor::~MockDecryptor() {} 45 MockDecryptor::~MockDecryptor() {}
46 46
47 void MockDecryptor::InitializeAudioDecoder(
48 scoped_ptr<AudioDecoderConfig> config,
49 const DecoderInitCB& init_cb,
50 const KeyAddedCB& key_added_cb) {
51 InitializeAudioDecoderMock(*config, init_cb, key_added_cb);
52 }
53
47 void MockDecryptor::InitializeVideoDecoder( 54 void MockDecryptor::InitializeVideoDecoder(
48 scoped_ptr<VideoDecoderConfig> config, 55 scoped_ptr<VideoDecoderConfig> config,
49 const DecoderInitCB& init_cb, 56 const DecoderInitCB& init_cb,
50 const KeyAddedCB& key_added_cb) { 57 const KeyAddedCB& key_added_cb) {
51 InitializeVideoDecoderMock(*config, init_cb, key_added_cb); 58 InitializeVideoDecoderMock(*config, init_cb, key_added_cb);
52 } 59 }
53 60
54 MockDecryptorClient::MockDecryptorClient() {} 61 MockDecryptorClient::MockDecryptorClient() {}
55 62
56 MockDecryptorClient::~MockDecryptorClient() {} 63 MockDecryptorClient::~MockDecryptorClient() {}
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 collection->AddVideoRenderer(video_renderer_); 96 collection->AddVideoRenderer(video_renderer_);
90 collection->AddAudioRenderer(audio_renderer_); 97 collection->AddAudioRenderer(audio_renderer_);
91 return collection.Pass(); 98 return collection.Pass();
92 } 99 }
93 100
94 MockStatisticsCB::MockStatisticsCB() {} 101 MockStatisticsCB::MockStatisticsCB() {}
95 102
96 MockStatisticsCB::~MockStatisticsCB() {} 103 MockStatisticsCB::~MockStatisticsCB() {}
97 104
98 } // namespace media 105 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/crypto/aes_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698