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

Unified Diff: media/webm/webm_tracks_parser.cc

Issue 10382200: Update WebMClusterParser to compute durations for all StreamParserBuffers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/webm/webm_cluster_parser_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/webm/webm_tracks_parser.cc
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index 7aa85d5b7d1fb9b58035bd15751d417d52914a51..d7ab5af4edb83c667454cffd52e667077a9098f4 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/string_util.h"
+#include "media/base/buffers.h"
#include "media/webm/webm_constants.h"
#include "media/webm/webm_content_encodings.h"
@@ -21,7 +22,9 @@ WebMTracksParser::WebMTracksParser(int64 timecode_scale)
track_num_(-1),
track_default_duration_(-1),
audio_track_num_(-1),
- video_track_num_(-1) {
+ audio_default_duration_(kNoTimestamp()),
+ video_track_num_(-1),
+ video_default_duration_(kNoTimestamp()) {
}
WebMTracksParser::~WebMTracksParser() {}
@@ -49,9 +52,9 @@ int WebMTracksParser::Parse(const uint8* buf, int size) {
track_num_ = -1;
track_default_duration_ = -1;
audio_track_num_ = -1;
- audio_default_duration_ = base::TimeDelta();
+ audio_default_duration_ = kNoTimestamp();
video_track_num_ = -1;
- video_default_duration_ = base::TimeDelta();
+ video_default_duration_ = kNoTimestamp();
WebMListParser parser(kWebMIdTracks, this);
int result = parser.Parse(buf, size);
@@ -95,7 +98,7 @@ bool WebMTracksParser::OnListEnd(int id) {
return false;
}
- base::TimeDelta default_duration;
+ base::TimeDelta default_duration = kNoTimestamp();
if (track_default_duration_ > 0) {
// Convert nanoseconds to base::TimeDelta.
« no previous file with comments | « media/webm/webm_cluster_parser_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698