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

Side by Side Diff: media/mp4/track_run_iterator_unittest.cc

Issue 10825005: Fix UninitCondition in TrackRunIterator tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | no next file » | 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "media/mp4/box_definitions.h" 8 #include "media/mp4/box_definitions.h"
9 #include "media/mp4/rcheck.h" 9 #include "media/mp4/rcheck.h"
10 #include "media/mp4/track_run_iterator.h" 10 #include "media/mp4/track_run_iterator.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } 59 }
60 60
61 MovieFragment CreateFragment() { 61 MovieFragment CreateFragment() {
62 MovieFragment moof; 62 MovieFragment moof;
63 moof.tracks.resize(2); 63 moof.tracks.resize(2);
64 moof.tracks[0].decode_time.decode_time = 0; 64 moof.tracks[0].decode_time.decode_time = 0;
65 moof.tracks[0].header.track_id = 1; 65 moof.tracks[0].header.track_id = 1;
66 moof.tracks[0].header.has_default_sample_flags = true; 66 moof.tracks[0].header.has_default_sample_flags = true;
67 moof.tracks[0].header.default_sample_duration = 1024; 67 moof.tracks[0].header.default_sample_duration = 1024;
68 moof.tracks[0].header.default_sample_size = 4; 68 moof.tracks[0].header.default_sample_size = 4;
69 moof.tracks[0].header.sample_description_index = 0;
69 moof.tracks[0].runs.resize(2); 70 moof.tracks[0].runs.resize(2);
70 moof.tracks[0].runs[0].sample_count = 10; 71 moof.tracks[0].runs[0].sample_count = 10;
71 moof.tracks[0].runs[0].data_offset = 100; 72 moof.tracks[0].runs[0].data_offset = 100;
72 SetAscending(&moof.tracks[0].runs[0].sample_sizes); 73 SetAscending(&moof.tracks[0].runs[0].sample_sizes);
73 74
74 moof.tracks[0].runs[1].sample_count = 10; 75 moof.tracks[0].runs[1].sample_count = 10;
75 moof.tracks[0].runs[1].data_offset = 10000; 76 moof.tracks[0].runs[1].data_offset = 10000;
76 77
77 moof.tracks[1].header.track_id = 2; 78 moof.tracks[1].header.track_id = 2;
78 moof.tracks[1].header.has_default_sample_flags = false; 79 moof.tracks[1].header.has_default_sample_flags = false;
80 moof.tracks[1].header.sample_description_index = 0;
79 moof.tracks[1].decode_time.decode_time = 10; 81 moof.tracks[1].decode_time.decode_time = 10;
80 moof.tracks[1].runs.resize(1); 82 moof.tracks[1].runs.resize(1);
81 moof.tracks[1].runs[0].sample_count = 10; 83 moof.tracks[1].runs[0].sample_count = 10;
82 moof.tracks[1].runs[0].data_offset = 200; 84 moof.tracks[1].runs[0].data_offset = 200;
83 SetAscending(&moof.tracks[1].runs[0].sample_sizes); 85 SetAscending(&moof.tracks[1].runs[0].sample_sizes);
84 SetAscending(&moof.tracks[1].runs[0].sample_durations); 86 SetAscending(&moof.tracks[1].runs[0].sample_durations);
85 moof.tracks[1].runs[0].sample_flags.resize(10); 87 moof.tracks[1].runs[0].sample_flags.resize(10);
86 for (size_t i = 1; i < moof.tracks[1].runs[0].sample_flags.size(); i++) { 88 for (size_t i = 1; i < moof.tracks[1].runs[0].sample_flags.size(); i++) {
87 moof.tracks[1].runs[0].sample_flags[i] = 89 moof.tracks[1].runs[0].sample_flags[i] =
88 kSampleIsDifferenceSampleFlagMask; 90 kSampleIsDifferenceSampleFlagMask;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 EXPECT_EQ(iter_->cts(), TimeDeltaFromFrac(2, kVideoScale)); 223 EXPECT_EQ(iter_->cts(), TimeDeltaFromFrac(2, kVideoScale));
222 EXPECT_EQ(iter_->duration(), TimeDeltaFromFrac(1, kVideoScale)); 224 EXPECT_EQ(iter_->duration(), TimeDeltaFromFrac(1, kVideoScale));
223 iter_->AdvanceSample(); 225 iter_->AdvanceSample();
224 EXPECT_EQ(iter_->dts(), TimeDeltaFromFrac(1, kVideoScale)); 226 EXPECT_EQ(iter_->dts(), TimeDeltaFromFrac(1, kVideoScale));
225 EXPECT_EQ(iter_->cts(), TimeDeltaFromFrac(0, kVideoScale)); 227 EXPECT_EQ(iter_->cts(), TimeDeltaFromFrac(0, kVideoScale));
226 EXPECT_EQ(iter_->duration(), TimeDeltaFromFrac(2, kVideoScale)); 228 EXPECT_EQ(iter_->duration(), TimeDeltaFromFrac(2, kVideoScale));
227 } 229 }
228 230
229 } // namespace mp4 231 } // namespace mp4
230 } // namespace media 232 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698