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

Side by Side Diff: media/mojo/services/renderer_unittest.cc

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 public media::DemuxerStream { 49 public media::DemuxerStream {
50 public: 50 public:
51 FakeDemuxerStream() {} 51 FakeDemuxerStream() {}
52 ~FakeDemuxerStream() override {} 52 ~FakeDemuxerStream() override {}
53 53
54 // media::Demuxer implementation. 54 // media::Demuxer implementation.
55 media::DemuxerStream* GetStream(media::DemuxerStream::Type type) override { 55 media::DemuxerStream* GetStream(media::DemuxerStream::Type type) override {
56 DCHECK_EQ(media::DemuxerStream::AUDIO, type); 56 DCHECK_EQ(media::DemuxerStream::AUDIO, type);
57 return this; 57 return this;
58 } 58 }
59 media::DemuxerStreamProvider::Liveness GetLiveness() const override {
60 return media::DemuxerStreamProvider::LIVENESS_UNKNOWN;
61 }
62 59
63 // media::DemuxerStream implementation. 60 // media::DemuxerStream implementation.
64 void Read(const ReadCB& read_cb) override {} 61 void Read(const ReadCB& read_cb) override {}
65 62
66 media::AudioDecoderConfig audio_decoder_config() override { 63 media::AudioDecoderConfig audio_decoder_config() override {
67 media::AudioDecoderConfig config; 64 media::AudioDecoderConfig config;
68 config.Initialize(media::kCodecAAC, 65 config.Initialize(media::kCodecAAC,
69 media::kSampleFormatU8, 66 media::kSampleFormatU8,
70 media::CHANNEL_LAYOUT_SURROUND, 67 media::CHANNEL_LAYOUT_SURROUND,
71 48000, 68 48000,
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 int argc = 0; 172 int argc = 0;
176 char** argv = NULL; 173 char** argv = NULL;
177 testing::InitGoogleTest(&argc, argv); 174 testing::InitGoogleTest(&argc, argv);
178 mojo_ignore_result(RUN_ALL_TESTS()); 175 mojo_ignore_result(RUN_ALL_TESTS());
179 } 176 }
180 177
181 g_test_delegate = NULL; 178 g_test_delegate = NULL;
182 delegate.reset(); 179 delegate.reset();
183 return MOJO_RESULT_OK; 180 return MOJO_RESULT_OK;
184 } 181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698