Refactor WebM extractor.

library/src/main/java/com/google/android/exoplayer/dash/DashWebmChunkSource.java

@@ -29,6 +29,7 @@ import com.google.android.exoplayer.chunk.MediaChunk;
 import com.google.android.exoplayer.chunk.WebmMediaChunk;
 import com.google.android.exoplayer.chunk.WebmMediaChunk;
 import com.google.android.exoplayer.dash.mpd.Representation;
 import com.google.android.exoplayer.dash.mpd.Representation;
 import com.google.android.exoplayer.parser.SegmentIndex;
 import com.google.android.exoplayer.parser.SegmentIndex;
+import com.google.android.exoplayer.parser.webm.DefaultWebmExtractor;
 import com.google.android.exoplayer.parser.webm.WebmExtractor;
 import com.google.android.exoplayer.parser.webm.WebmExtractor;
 import com.google.android.exoplayer.upstream.DataSource;
 import com.google.android.exoplayer.upstream.DataSource;
 import com.google.android.exoplayer.upstream.DataSpec;
 import com.google.android.exoplayer.upstream.DataSpec;
@@ -85,7 +86,7 @@ public class DashWebmChunkSource implements ChunkSource {
       formats[i] = representations[i].format;
       formats[i] = representations[i].format;
       maxWidth = Math.max(formats[i].width, maxWidth);
       maxWidth = Math.max(formats[i].width, maxWidth);
       maxHeight = Math.max(formats[i].height, maxHeight);
       maxHeight = Math.max(formats[i].height, maxHeight);
-      extractors.put(formats[i].id, new WebmExtractor());
+      extractors.put(formats[i].id, new DefaultWebmExtractor());
       this.representations.put(formats[i].id, representations[i]);
       this.representations.put(formats[i].id, representations[i]);
     }
     }
     this.maxWidth = maxWidth;
     this.maxWidth = maxWidth;

library/src/main/java/com/google/android/exoplayer/parser/webm/EbmlEventHandler.java

+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer.parser.webm;
+
+import com.google.android.exoplayer.upstream.NonBlockingInputStream;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Defines EBML element IDs/types and reacts to events.
+ */
+/* package */ interface EbmlEventHandler {
+
+  /**
+   * Retrieves the type of an element ID.
+   *
+   * <p>If {@link EbmlReader#TYPE_UNKNOWN} is returned then the element is skipped.
+   * Note that all children of a skipped master element are also skipped.
+   *
+   * @param id The integer ID of this element
+   * @return One of the {@code TYPE_} constants defined in this class
+   */
+  public int getElementType(int id);
+
+  /**
+   * Called when a master element is encountered in the {@link NonBlockingInputStream}.
+   *
+   * <p>Following events should be considered as taking place "within" this element until a
+   * matching call to {@link #onMasterElementEnd(int)} is made. Note that it is possible for
+   * another master element of the same ID to be nested within itself.
+   *
+   * @param id The integer ID of this element
+   * @param elementOffsetBytes The byte offset where this element starts
+   * @param headerSizeBytes The byte length of this element's ID and size header
+   * @param contentsSizeBytes The byte length of this element's children
+   * @return {@code false} if parsing should stop right away
+   */
+  public boolean onMasterElementStart(
+      int id, long elementOffsetBytes, int headerSizeBytes, long contentsSizeBytes);
+
+  /**
+   * Called when a master element has finished reading in all of its children from the
+   * {@link NonBlockingInputStream}.
+   *
+   * @param id The integer ID of this element
+   * @return {@code false} if parsing should stop right away
+   */
+  public boolean onMasterElementEnd(int id);
+
+  /**
+   * Called when an integer element is encountered in the {@link NonBlockingInputStream}.
+   *
+   * @param id The integer ID of this element
+   * @param value The integer value this element contains
+   * @return {@code false} if parsing should stop right away
+   */
+  public boolean onIntegerElement(int id, long value);
+
+  /**
+   * Called when a float element is encountered in the {@link NonBlockingInputStream}.
+   *
+   * @param id The integer ID of this element
+   * @param value The float value this element contains
+   * @return {@code false} if parsing should stop right away
+   */
+  public boolean onFloatElement(int id, double value);
+
+  /**
+   * Called when a string element is encountered in the {@link NonBlockingInputStream}.
+   *
+   * @param id The integer ID of this element
+   * @param value The string value this element contains
+   * @return {@code false} if parsing should stop right away
+   */
+  public boolean onStringElement(int id, String value);
+
+  /**
+   * Called when a binary element is encountered in the {@link NonBlockingInputStream}.
+   *
+   * <p>The element header (containing element ID and content size) will already have been read.
+   * Subclasses must exactly read the entire contents of the element, which is
+   * {@code contentsSizeBytes} in length. It's guaranteed that the full element contents will be
+   * immediately available from {@code inputStream}.
+   *
+   * <p>Several methods in {@link EbmlReader} are available for reading the contents of a
+   * binary element:
+   * <ul>
+   * <li>{@link EbmlReader#readVarint(NonBlockingInputStream)}.
+   * <li>{@link EbmlReader#readBytes(NonBlockingInputStream, byte[], int)}.
+   * <li>{@link EbmlReader#readBytes(NonBlockingInputStream, ByteBuffer, int)}.
+   * <li>{@link EbmlReader#skipBytes(NonBlockingInputStream, int)}.
+   * <li>{@link EbmlReader#getBytesRead()}.
+   *
+   * @param id The integer ID of this element
+   * @param elementOffsetBytes The byte offset where this element starts
+   * @param headerSizeBytes The byte length of this element's ID and size header
+   * @param contentsSizeBytes The byte length of this element's contents
+   * @param inputStream The {@link NonBlockingInputStream} from which this
+   *        element's contents should be read
+   * @return {@code false} if parsing should stop right away
+   */
+  public boolean onBinaryElement(
+      int id, long elementOffsetBytes, int headerSizeBytes, int contentsSizeBytes,
+      NonBlockingInputStream inputStream);
+
+}