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

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

Issue 10823156: Fix live bug & renable ChunkDemuxerTest.TestWebMFile_LiveAudioAndVideo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comment Created 8 years, 4 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 | « no previous file | media/webm/webm_cluster_parser.cc » ('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 "base/bind.h" 5 #include "base/bind.h"
6 #include "media/base/audio_decoder_config.h" 6 #include "media/base/audio_decoder_config.h"
7 #include "media/base/decoder_buffer.h" 7 #include "media/base/decoder_buffer.h"
8 #include "media/base/mock_callback.h" 8 #include "media/base/mock_callback.h"
9 #include "media/base/mock_demuxer_host.h" 9 #include "media/base/mock_demuxer_host.h"
10 #include "media/base/test_data_util.h" 10 #include "media/base/test_data_util.h"
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 {67, 6}, 1206 {67, 6},
1207 {100, 9}, 1207 {100, 9},
1208 {133, 12}, 1208 {133, 12},
1209 {kSkip, kSkip}, 1209 {kSkip, kSkip},
1210 }; 1210 };
1211 1211
1212 ASSERT_TRUE(ParseWebMFile("bear-320x240.webm", buffer_timestamps, 1212 ASSERT_TRUE(ParseWebMFile("bear-320x240.webm", buffer_timestamps,
1213 base::TimeDelta::FromMilliseconds(2744))); 1213 base::TimeDelta::FromMilliseconds(2744)));
1214 } 1214 }
1215 1215
1216 // TODO(acolwell): Fix bear-320x240-live.webm so that all clusters begin with 1216 TEST_F(ChunkDemuxerTest, TestWebMFile_LiveAudioAndVideo) {
1217 // keyframes and reenable test. (crbug.com/136438)
1218 TEST_F(ChunkDemuxerTest, DISABLED_TestWebMFile_LiveAudioAndVideo) {
1219 struct BufferTimestamps buffer_timestamps[] = { 1217 struct BufferTimestamps buffer_timestamps[] = {
1220 {0, 0}, 1218 {0, 0},
1221 {33, 3}, 1219 {33, 3},
1222 {67, 6}, 1220 {67, 6},
1223 {100, 9}, 1221 {100, 9},
1224 {133, 12}, 1222 {133, 12},
1225 {kSkip, kSkip}, 1223 {kSkip, kSkip},
1226 }; 1224 };
1227 1225
1228 ASSERT_TRUE(ParseWebMFile("bear-320x240-live.webm", buffer_timestamps, 1226 ASSERT_TRUE(ParseWebMFile("bear-320x240-live.webm", buffer_timestamps,
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
2193 2191
2194 scoped_ptr<Cluster> cluster_a(kDefaultFirstCluster()); 2192 scoped_ptr<Cluster> cluster_a(kDefaultFirstCluster());
2195 ASSERT_TRUE(AppendData(cluster_a->data(), cluster_a->size())); 2193 ASSERT_TRUE(AppendData(cluster_a->data(), cluster_a->size()));
2196 2194
2197 EXPECT_CALL(host_, SetDuration( 2195 EXPECT_CALL(host_, SetDuration(
2198 base::TimeDelta::FromMilliseconds(kDefaultFirstClusterEndTimestamp))); 2196 base::TimeDelta::FromMilliseconds(kDefaultFirstClusterEndTimestamp)));
2199 demuxer_->EndOfStream(PIPELINE_OK); 2197 demuxer_->EndOfStream(PIPELINE_OK);
2200 } 2198 }
2201 2199
2202 } // namespace media 2200 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/webm/webm_cluster_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698