Remove "legacy" experimental stream support

third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "modules/mediasource/SourceBuffer.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "core/events/GenericEventQueue.h"
-#include "core/fileapi/FileReaderLoader.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/MediaError.h"
 #include "core/html/TimeRanges.h"
 #include "core/html/track/AudioTrack.h"
 #include "core/html/track/AudioTrackList.h"
 #include "core/html/track/VideoTrack.h"
 #include "core/html/track/VideoTrackList.h"
-#include "core/streams/Stream.h"
 #include "modules/mediasource/MediaSource.h"
 #include "modules/mediasource/SourceBufferTrackBaseSupplement.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/tracing/TraceEvent.h"
 #include "public/platform/WebSourceBuffer.h"
 #include "wtf/MathExtras.h"
 #include <limits>
 #include <memory>
 #include <sstream>
 
@@ skipping 12 matching lines @@
                                               ExceptionState& exceptionState) {
   if (isRemoved) {
     MediaSource::logAndThrowDOMException(
         exceptionState, InvalidStateError,
         "This SourceBuffer has been removed from the parent media source.");
     return true;
   }
   if (isUpdating) {
     MediaSource::logAndThrowDOMException(
         exceptionState, InvalidStateError,
-        "This SourceBuffer is still processing an 'appendBuffer', "
-        "'appendStream', or 'remove' operation.");
+        "This SourceBuffer is still processing an 'appendBuffer' or "
+        "'remove' operation.");
     return true;
   }
 
   return false;
 }
 
 WTF::String webTimeRangesToString(const WebTimeRanges& ranges) {
   StringBuilder stringBuilder;
   stringBuilder.append('{');
   for (auto& r : ranges) {
@@ skipping 35 matching lines @@
       m_appendWindowEnd(std::numeric_limits<double>::infinity()),
       m_firstInitializationSegmentReceived(false),
       m_pendingAppendDataOffset(0),
       m_appendBufferAsyncPartRunner(AsyncMethodRunner<SourceBuffer>::create(
           this,
           &SourceBuffer::appendBufferAsyncPart)),
       m_pendingRemoveStart(-1),
       m_pendingRemoveEnd(-1),
       m_removeAsyncPartRunner(AsyncMethodRunner<SourceBuffer>::create(
           this,
-          &SourceBuffer::removeAsyncPart)),
-      m_streamMaxSizeValid(false),
-      m_streamMaxSize(0),
-      m_appendStreamAsyncPartRunner(AsyncMethodRunner<SourceBuffer>::create(
-          this,
-          &SourceBuffer::appendStreamAsyncPart)) {
+          &SourceBuffer::removeAsyncPart)) {
   BLINK_SBLOG << __func__ << " this=" << this;
 
   DCHECK(m_webSourceBuffer);
   DCHECK(m_source);
   DCHECK(m_source->mediaElement());
   ThreadState::current()->registerPreFinalizer(this);
   m_audioTracks = AudioTrackList::create(*m_source->mediaElement());
   m_videoTracks = VideoTrackList::create(*m_source->mediaElement());
   m_webSourceBuffer->setClient(this);
 }
@@ skipping 214 matching lines @@
 
 void SourceBuffer::appendBuffer(DOMArrayBufferView* data,
                                 ExceptionState& exceptionState) {
   BLINK_SBLOG << __func__ << " this=" << this << " size=" << data->byteLength();
   // Section 3.2 appendBuffer()
   // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-SourceBuffer-appendBuffer-void-ArrayBufferView-data
   appendBufferInternal(static_cast<const unsigned char*>(data->baseAddress()),
                        data->byteLength(), exceptionState);
 }
 
-void SourceBuffer::appendStream(Stream* stream,
-                                ExceptionState& exceptionState) {
-  m_streamMaxSizeValid = false;
-  appendStreamInternal(stream, exceptionState);
-}
-
-void SourceBuffer::appendStream(Stream* stream,
-                                unsigned long long maxSize,
-                                ExceptionState& exceptionState) {
-  BLINK_SBLOG << __func__ << " this=" << this << " maxSize=" << maxSize;
-  m_streamMaxSizeValid = maxSize > 0;
-  if (m_streamMaxSizeValid)
-    m_streamMaxSize = maxSize;
-  appendStreamInternal(stream, exceptionState);
-}
-
 void SourceBuffer::abort(ExceptionState& exceptionState) {
   BLINK_SBLOG << __func__ << " this=" << this;
   // http://w3c.github.io/media-source/#widl-SourceBuffer-abort-void
   // 1. If this object has been removed from the sourceBuffers attribute of the
   //    parent media source then throw an InvalidStateError exception and abort
   //    these steps.
   // 2. If the readyState attribute of the parent media source is not in the
   //    "open" state then throw an InvalidStateError exception and abort these
   //    steps.
   if (isRemoved()) {
@@ skipping 145 matching lines @@
 
 void SourceBuffer::abortIfUpdating() {
   // Section 3.2 abort() method step 4 substeps.
   // http://w3c.github.io/media-source/#widl-SourceBuffer-abort-void
 
   if (!m_updating)
     return;
 
   DCHECK_EQ(m_pendingRemoveStart, -1);
 
-  const char* traceEventName = 0;
-  if (m_stream) {
-    traceEventName = "SourceBuffer::appendStream";
-  } else {
-    traceEventName = "SourceBuffer::appendBuffer";
-  }
+  const char* traceEventName = "SourceBuffer::appendBuffer";
 
   // 4.1. Abort the buffer append and stream append loop algorithms if they are
   //      running.
   m_appendBufferAsyncPartRunner->stop();
   m_pendingAppendData.clear();
   m_pendingAppendDataOffset = 0;
 
-  m_appendStreamAsyncPartRunner->stop();
-  clearAppendStreamState();
-
   // 4.2. Set the updating attribute to false.
   m_updating = false;
 
   // 4.3. Queue a task to fire a simple event named abort at this SourceBuffer
   //      object.
   scheduleEvent(EventTypeNames::abort);
 
   // 4.4. Queue a task to fire a simple event named updateend at this
   //      SourceBuffer object.
   scheduleEvent(EventTypeNames::updateend);
@@ skipping 470 matching lines @@
   return true;
 }
 
 bool SourceBuffer::hasPendingActivity() const {
   return m_source;
 }
 
 void SourceBuffer::suspend() {
   m_appendBufferAsyncPartRunner->suspend();
   m_removeAsyncPartRunner->suspend();
-  m_appendStreamAsyncPartRunner->suspend();
 }
 
 void SourceBuffer::resume() {
   m_appendBufferAsyncPartRunner->resume();
   m_removeAsyncPartRunner->resume();
-  m_appendStreamAsyncPartRunner->resume();
 }
 
 void SourceBuffer::contextDestroyed() {
   m_appendBufferAsyncPartRunner->stop();
   m_removeAsyncPartRunner->stop();
-  m_appendStreamAsyncPartRunner->stop();
 }
 
 ExecutionContext* SourceBuffer::getExecutionContext() const {
   return ActiveDOMObject::getExecutionContext();
 }
 
 const AtomicString& SourceBuffer::interfaceName() const {
   return EventTargetNames::SourceBuffer;
 }
 
@@ skipping 207 matching lines @@
 
   // 11. Queue a task to fire a simple event named update at this SourceBuffer
   //     object.
   scheduleEvent(EventTypeNames::update);
 
   // 12. Queue a task to fire a simple event named updateend at this
   //     SourceBuffer object.
   scheduleEvent(EventTypeNames::updateend);
 }
 
-void SourceBuffer::appendStreamInternal(Stream* stream,
-                                        ExceptionState& exceptionState) {
-  TRACE_EVENT_ASYNC_BEGIN0("media", "SourceBuffer::appendStream", this);
-
-  // Section 3.2 appendStream()
-  // http://w3c.github.io/media-source/#widl-SourceBuffer-appendStream-void-ReadableStream-stream-unsigned-long-long-maxSize
-  // (0. If the stream has been neutered, then throw an InvalidAccessError
-  //     exception and abort these steps.)
-  if (stream->isNeutered()) {
-    MediaSource::logAndThrowDOMException(
-        exceptionState, InvalidAccessError,
-        "The stream provided has been neutered.");
-    TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendStream", this);
-    return;
-  }
-
-  // 1. Run the prepare append algorithm.
-  size_t newDataSize = m_streamMaxSizeValid ? m_streamMaxSize : 0;
-  if (!prepareAppend(newDataSize, exceptionState)) {
-    TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendStream", this);
-    return;
-  }
-
-  // 2. Set the updating attribute to true.
-  m_updating = true;
-
-  // 3. Queue a task to fire a simple event named updatestart at this
-  //    SourceBuffer object.
-  scheduleEvent(EventTypeNames::updatestart);
-
-  // 4. Asynchronously run the stream append loop algorithm with stream and
-  //    maxSize.
-  stream->neuter();
-  m_loader = FileReaderLoader::create(FileReaderLoader::ReadByClient, this);
-  m_stream = stream;
-  m_appendStreamAsyncPartRunner->runAsync();
-}
-
-void SourceBuffer::appendStreamAsyncPart() {
-  DCHECK(m_updating);
-  DCHECK(m_loader);
-  DCHECK(m_stream);
-  TRACE_EVENT_ASYNC_STEP_INTO0("media", "SourceBuffer::appendStream", this,
-                               "appendStreamAsyncPart");
-
-  // Section 3.5.6 Stream Append Loop
-  // http://w3c.github.io/media-source/#sourcebuffer-stream-append-loop
-
-  // 1. If maxSize is set, then let bytesLeft equal maxSize.
-  // 2. Loop Top: If maxSize is set and bytesLeft equals 0, then jump to the
-  //    loop done step below.
-  if (m_streamMaxSizeValid && !m_streamMaxSize) {
-    appendStreamDone(NoError);
-    return;
-  }
-
-  // Steps 3-11 are handled by m_loader.
-  // Note: Passing 0 here signals that maxSize was not set. (i.e. Read all the
-  // data in the stream).
-  m_loader->start(getExecutionContext(), *m_stream,
-                  m_streamMaxSizeValid ? m_streamMaxSize : 0);
-}
-
-void SourceBuffer::appendStreamDone(AppendStreamDoneAction action) {
-  DCHECK(m_updating);
-  DCHECK(m_loader);
-  DCHECK(m_stream);
-
-  clearAppendStreamState();
-
-  if (action != NoError) {
-    if (action == RunAppendErrorWithNoDecodeError) {
-      appendError(NoDecodeError);
-    } else {
-      DCHECK_EQ(action, RunAppendErrorWithDecodeError);
-      appendError(DecodeError);
-    }
-
-    TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendStream", this);
-    return;
-  }
-
-  // Section 3.5.6 Stream Append Loop
-  // Steps 1-11 are handled by appendStreamAsyncPart(), |m_loader|, and
-  // |m_webSourceBuffer|.
-
-  // 12. Loop Done: Set the updating attribute to false.
-  m_updating = false;
-
-  // 13. Queue a task to fire a simple event named update at this SourceBuffer
-  //     object.
-  scheduleEvent(EventTypeNames::update);
-
-  // 14. Queue a task to fire a simple event named updateend at this
-  //     SourceBuffer object.
-  scheduleEvent(EventTypeNames::updateend);
-  TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendStream", this);
-  BLINK_SBLOG << __func__ << " ended. this=" << this << " buffered="
-              << webTimeRangesToString(m_webSourceBuffer->buffered());
-}
-
-void SourceBuffer::clearAppendStreamState() {
-  m_streamMaxSizeValid = false;
-  m_streamMaxSize = 0;
-  m_loader.reset();
-  m_stream = nullptr;
-}
-
 void SourceBuffer::appendError(AppendError err) {
   BLINK_SBLOG << __func__ << " this=" << this << " AppendError=" << err;
   // Section 3.5.3 Append Error Algorithm
   // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-append-error
 
   // 1. Run the reset parser state algorithm.
   m_webSourceBuffer->resetParserState();
 
   // 2. Set the updating attribute to false.
   m_updating = false;
 
   // 3. Queue a task to fire a simple event named error at this SourceBuffer
   //    object.
   scheduleEvent(EventTypeNames::error);
 
   // 4. Queue a task to fire a simple event named updateend at this SourceBuffer
   //    object.
   scheduleEvent(EventTypeNames::updateend);
 
   // 5. If decode error is true, then run the end of stream algorithm with the
   // error parameter set to "decode".
   if (err == DecodeError) {
     m_source->endOfStream("decode", ASSERT_NO_EXCEPTION);
   } else {
     DCHECK_EQ(err, NoDecodeError);
     // Nothing else to do in this case.
   }
 }
 
-void SourceBuffer::didStartLoading() {
-  BLINK_SBLOG << __func__ << " this=" << this;
-}
-
-void SourceBuffer::didReceiveDataForClient(const char* data,
-                                           unsigned dataLength) {
-  BLINK_SBLOG << __func__ << " this=" << this << " dataLength=" << dataLength;
-  DCHECK(m_updating);
-  DCHECK(m_loader);
-
-  // Section 3.5.6 Stream Append Loop
-  // http://w3c.github.io/media-source/#sourcebuffer-stream-append-loop
-
-  // 10. Run the coded frame eviction algorithm.
-  if (!evictCodedFrames(dataLength)) {
-    // 11. (in appendStreamDone) If the buffer full flag equals true, then run
-    //     the append error algorithm with the decode error parameter set to
-    //     false and abort this algorithm.
-    appendStreamDone(RunAppendErrorWithNoDecodeError);
-    return;
-  }
-
-  if (!m_webSourceBuffer->append(reinterpret_cast<const unsigned char*>(data),
-                                 dataLength, &m_timestampOffset))
-    appendStreamDone(RunAppendErrorWithDecodeError);
-}
-
-void SourceBuffer::didFinishLoading() {
-  BLINK_SBLOG << __func__ << " this=" << this;
-  DCHECK(m_loader);
-  appendStreamDone(NoError);
-}
-
-void SourceBuffer::didFail(FileError::ErrorCode errorCode) {
-  BLINK_SBLOG << __func__ << " this=" << this << " errorCode=" << errorCode;
-  // m_loader might be already released, in case appendStream has failed due
-  // to evictCodedFrames or WebSourceBuffer append failing in
-  // didReceiveDataForClient. In that case appendStreamDone will be invoked
-  // from there, no need to repeat it here.
-  if (m_loader)
-    appendStreamDone(RunAppendErrorWithNoDecodeError);
-}
-
 DEFINE_TRACE(SourceBuffer) {
   visitor->trace(m_source);
   visitor->trace(m_trackDefaults);
   visitor->trace(m_asyncEventQueue);
   visitor->trace(m_appendBufferAsyncPartRunner);
   visitor->trace(m_removeAsyncPartRunner);
-  visitor->trace(m_appendStreamAsyncPartRunner);
-  visitor->trace(m_stream);
   visitor->trace(m_audioTracks);
   visitor->trace(m_videoTracks);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink