Enable round-tripping and updating of WebSourceBufferImpl timestamp offset

content/renderer/media/websourcebuffer_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/websourcebuffer_impl.h"
 
 #include "base/float_util.h"
+#include "media/base/buffers.h"
 #include "media/filters/chunk_demuxer.h"
 
 namespace content {
 
 static base::TimeDelta DoubleToTimeDelta(double time) {
   DCHECK(!base::IsNaN(time));
   DCHECK_GE(time, 0);
   if (time == std::numeric_limits<double>::infinity())
     return media::kInfiniteDuration();
 
@@ skipping 35 matching lines @@
   media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_);
   blink::WebTimeRanges result(ranges.size());
   for (size_t i = 0; i < ranges.size(); i++) {
     result[i].start = ranges.start(i).InSecondsF();
     result[i].end = ranges.end(i).InSecondsF();
   }
   return result;
 }
 
 void WebSourceBufferImpl::append(const unsigned char* data, unsigned length) {
-  demuxer_->AppendData(id_, data, length);
+  bool offset_updated = append(data, length, NULL);
+  DCHECK(!offset_updated);
+}
+
+bool WebSourceBufferImpl::append(
+    const unsigned char* data,
+    unsigned length,
+    double* new_timestamp_offset) {
+  base::TimeDelta new_offset_if_updated;
+  demuxer_->AppendData(id_, data, length, &new_offset_if_updated);

[acolwell GONE FROM CHROMIUM, 2014/02/27 18:27:21]

Sorry to keep causing thrashing on this. Based on my comments on the Blink-side
changes, I think it makes sense to just pass the timestamp_offset into this
call. Since we wouldn't need to return a bool is should be pretty simple to just
have the real append code update the *timestamp_offset.

[wolenetz, 2014/02/27 21:48:49]

Done.

+  if (new_timestamp_offset && new_offset_if_updated != media::kNoTimestamp()) {
+    *new_timestamp_offset = new_offset_if_updated.InSecondsF();
+    return true;
+  }
+
+  return false;
 }
 
 void WebSourceBufferImpl::abort() {
   demuxer_->Abort(id_);
 }
 
 void WebSourceBufferImpl::remove(double start, double end) {
   demuxer_->Remove(id_, DoubleToTimeDelta(start), DoubleToTimeDelta(end));
 }
 
@@ skipping 10 matching lines @@
 void WebSourceBufferImpl::setAppendWindowEnd(double end) {
   demuxer_->SetAppendWindowEnd(id_, DoubleToTimeDelta(end));
 }
 
 void WebSourceBufferImpl::removedFromMediaSource() {
   demuxer_->RemoveId(id_);
   demuxer_ = NULL;
 }
 
 }  // namespace content