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

Unified Diff: media/formats/webm/webm_stream_parser.cc

Issue 231283005: Add live mode detection in WebM MediaSource parser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: media/formats/webm/webm_stream_parser.cc
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index 4a724090dd91de3aa3ca7a78ab53c55213a18249..d69dd62f008b8a97754f0ebfbf5f4f5688e7af58 100644
--- a/media/formats/webm/webm_stream_parser.cc
+++ b/media/formats/webm/webm_stream_parser.cc
@@ -18,8 +18,11 @@
namespace media {
+static const int64 kUnknownElementSize = 0xffffffffffffff;
+
WebMStreamParser::WebMStreamParser()
: state_(kWaitingForInit),
+ unknown_segment_size_(false),
parsing_cluster_(false) {
}
@@ -150,6 +153,9 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
return result + element_size;
break;
case kWebMIdSegment:
+ // Segment of unknown size indicates live stream.
+ if (element_size == kUnknownElementSize)
+ unknown_segment_size_ = true;
// Just consume the segment header.
return result;
break;
@@ -172,7 +178,9 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
cur_size -= result;
bytes_parsed += result;
- WebMTracksParser tracks_parser(log_cb_, ignore_text_tracks_);
+ bool live_mode = unknown_segment_size_ && (info_parser.duration() <= 0) &&
+ !info_parser.date_utc().is_null();
+ WebMTracksParser tracks_parser(log_cb_, ignore_text_tracks_, live_mode);
result = tracks_parser.Parse(cur, cur_size);
if (result <= 0)
@@ -203,7 +211,6 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
return -1;
}
-
cluster_parser_.reset(new WebMClusterParser(
info_parser.timecode_scale(),
tracks_parser.audio_track_num(),
@@ -218,9 +225,10 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
ChangeState(kParsingClusters);
- if (!init_cb_.is_null())
+ if (!init_cb_.is_null()) {
base::ResetAndReturn(&init_cb_).Run(
- true, duration, info_parser.date_utc(), false);
+ true, duration, info_parser.date_utc(), false, live_mode);
+ }
return bytes_parsed;
}

Powered by Google App Engine
This is Rietveld 408576698