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

Side by Side Diff: media/filters/chunk_demuxer_unittest.cc

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 years, 5 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
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_audio_decoder.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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 base::Bind(&ChunkDemuxerTest::InitSegmentReceived, 169 base::Bind(&ChunkDemuxerTest::InitSegmentReceived,
170 base::Unretained(this)); 170 base::Unretained(this));
171 CreateNewDemuxer(); 171 CreateNewDemuxer();
172 } 172 }
173 173
174 void CreateNewDemuxer() { 174 void CreateNewDemuxer() {
175 base::Closure open_cb = 175 base::Closure open_cb =
176 base::Bind(&ChunkDemuxerTest::DemuxerOpened, base::Unretained(this)); 176 base::Bind(&ChunkDemuxerTest::DemuxerOpened, base::Unretained(this));
177 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind( 177 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind(
178 &ChunkDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this)); 178 &ChunkDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this));
179 demuxer_.reset(new ChunkDemuxer( 179 demuxer_.reset(new ChunkDemuxer(open_cb, encrypted_media_init_data_cb,
180 open_cb, encrypted_media_init_data_cb, base::Bind(&AddLogEntryForTest), 180 scoped_refptr<MediaLog>(new MediaLog()),
181 scoped_refptr<MediaLog>(new MediaLog()), true)); 181 true));
182 } 182 }
183 183
184 virtual ~ChunkDemuxerTest() { 184 virtual ~ChunkDemuxerTest() {
185 ShutdownDemuxer(); 185 ShutdownDemuxer();
186 } 186 }
187 187
188 void CreateInitSegment(int stream_flags, 188 void CreateInitSegment(int stream_flags,
189 bool is_audio_encrypted, 189 bool is_audio_encrypted,
190 bool is_video_encrypted, 190 bool is_video_encrypted,
191 scoped_ptr<uint8[]>* buffer, 191 scoped_ptr<uint8[]>* buffer,
(...skipping 3556 matching lines...) Expand 10 before | Expand all | Expand 10 after
3748 TEST_F(ChunkDemuxerTest, CuesBetweenClusters) { 3748 TEST_F(ChunkDemuxerTest, CuesBetweenClusters) {
3749 ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO)); 3749 ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO));
3750 3750
3751 AppendCluster(GenerateCluster(0, 0, 4)); 3751 AppendCluster(GenerateCluster(0, 0, 4));
3752 AppendData(kCuesHeader, sizeof(kCuesHeader)); 3752 AppendData(kCuesHeader, sizeof(kCuesHeader));
3753 AppendCluster(GenerateCluster(46, 66, 5)); 3753 AppendCluster(GenerateCluster(46, 66, 5));
3754 CheckExpectedRanges(kSourceId, "{ [0,115) }"); 3754 CheckExpectedRanges(kSourceId, "{ [0,115) }");
3755 } 3755 }
3756 3756
3757 } // namespace media 3757 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698