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

Side by Side Diff: media/formats/mp4/mp4_stream_parser_unittest.cc

Issue 236023003: Add WebMediaPlayer::timelineOffset() support to WebMediaPlayerImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments Created 6 years, 8 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
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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 static_cast<size_t>(end - start)); 53 static_cast<size_t>(end - start));
54 if (!AppendData(start, append_size)) 54 if (!AppendData(start, append_size))
55 return false; 55 return false;
56 start += append_size; 56 start += append_size;
57 } 57 }
58 return true; 58 return true;
59 } 59 }
60 60
61 void InitF(bool init_ok, 61 void InitF(bool init_ok,
62 base::TimeDelta duration, 62 base::TimeDelta duration,
63 base::Time wallclock_timeline_offset,
63 bool auto_update_timestamp_offset) { 64 bool auto_update_timestamp_offset) {
64 DVLOG(1) << "InitF: ok=" << init_ok << ", dur=" << duration.InMilliseconds() 65 DVLOG(1) << "InitF: ok=" << init_ok << ", dur=" << duration.InMilliseconds()
65 << ", autoTimestampOffset=" << auto_update_timestamp_offset; 66 << ", autoTimestampOffset=" << auto_update_timestamp_offset;
66 } 67 }
67 68
68 bool NewConfigF(const AudioDecoderConfig& ac, 69 bool NewConfigF(const AudioDecoderConfig& ac,
69 const VideoDecoderConfig& vc, 70 const VideoDecoderConfig& vc,
70 const StreamParser::TextTrackConfigMap& tc) { 71 const StreamParser::TextTrackConfigMap& tc) {
71 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() 72 DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig()
72 << ", video=" << vc.IsValidConfig(); 73 << ", video=" << vc.IsValidConfig();
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // The parser should fail instead of crash. See http://crbug.com/361347 212 // The parser should fail instead of crash. See http://crbug.com/361347
212 TEST_F(MP4StreamParserTest, MissingSampleAuxInfo) { 213 TEST_F(MP4StreamParserTest, MissingSampleAuxInfo) {
213 ParseMP4File("bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4", 512); 214 ParseMP4File("bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4", 512);
214 } 215 }
215 216
216 // TODO(strobe): Create and test media which uses CENC auxiliary info stored 217 // TODO(strobe): Create and test media which uses CENC auxiliary info stored
217 // inside a private box 218 // inside a private box
218 219
219 } // namespace mp4 220 } // namespace mp4
220 } // namespace media 221 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/mpeg/mpeg_audio_stream_parser_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698