Throw ParserException from parsers when a parse exception occurs.

library/src/main/java/com/google/android/exoplayer/ParserException.java

@@ -22,6 +22,10 @@ import java.io.IOException;
  */
 public class ParserException extends IOException {
 
+  public ParserException() {
+    super();
+  }
+
   public ParserException(String message) {
     super(message);
   }

library/src/main/java/com/google/android/exoplayer/extractor/webm/DefaultEbmlReader.java

@@ -16,6 +16,7 @@
 package com.google.android.exoplayer.extractor.webm;
 
 import com.google.android.exoplayer.C;
+import com.google.android.exoplayer.ParserException;
 import com.google.android.exoplayer.extractor.ExtractorInput;
 import com.google.android.exoplayer.util.Assertions;
 
@@ -100,7 +101,7 @@ import java.util.Stack;
           return true;
         case TYPE_UNSIGNED_INT:
           if (elementContentSize > MAX_INTEGER_ELEMENT_SIZE_BYTES) {
-            throw new IllegalStateException("Invalid integer size: " + elementContentSize);
+            throw new ParserException("Invalid integer size: " + elementContentSize);
           }
           output.integerElement(elementId, readInteger(input, (int) elementContentSize));
           elementState = ELEMENT_STATE_READ_ID;
@@ -108,14 +109,14 @@ import java.util.Stack;
         case TYPE_FLOAT:
           if (elementContentSize != VALID_FLOAT32_ELEMENT_SIZE_BYTES
               && elementContentSize != VALID_FLOAT64_ELEMENT_SIZE_BYTES) {
-            throw new IllegalStateException("Invalid float size: " + elementContentSize);
+            throw new ParserException("Invalid float size: " + elementContentSize);
           }
           output.floatElement(elementId, readFloat(input, (int) elementContentSize));
           elementState = ELEMENT_STATE_READ_ID;
           return true;
         case TYPE_STRING:
           if (elementContentSize > Integer.MAX_VALUE) {
-            throw new IllegalStateException("String element size: " + elementContentSize);
+            throw new ParserException("String element size: " + elementContentSize);
           }
           output.stringElement(elementId, readString(input, (int) elementContentSize));
           elementState = ELEMENT_STATE_READ_ID;
@@ -129,7 +130,7 @@ import java.util.Stack;
           elementState = ELEMENT_STATE_READ_ID;
           break;
         default:
-          throw new IllegalStateException("Invalid element type " + type);
+          throw new ParserException("Invalid element type " + type);
       }
     }
   }

library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java

@@ -26,7 +26,6 @@ import com.google.android.exoplayer.extractor.ExtractorOutput;
 import com.google.android.exoplayer.extractor.PositionHolder;
 import com.google.android.exoplayer.extractor.SeekMap;
 import com.google.android.exoplayer.extractor.TrackOutput;
-import com.google.android.exoplayer.util.Assertions;
 import com.google.android.exoplayer.util.LongArray;
 import com.google.android.exoplayer.util.MimeTypes;
 import com.google.android.exoplayer.util.NalUnitUtil;
@@ -738,7 +737,7 @@ public final class WebmExtractor implements Extractor {
                   contentSize - blockTrackNumberLength - headerSize - totalSamplesSize;
             } else {
               // Lacing is always in the range 0--3.
-              throw new IllegalStateException("Unexpected lacing value: " + lacing);
+              throw new ParserException("Unexpected lacing value: " + lacing);
             }
           }
 
@@ -1257,7 +1256,9 @@ public final class WebmExtractor implements Extractor {
         // TODO: Deduplicate with AtomParsers.parseAvcCFromParent.
         buffer.setPosition(4);
         int nalUnitLengthFieldLength = (buffer.readUnsignedByte() & 0x03) + 1;
-        Assertions.checkState(nalUnitLengthFieldLength != 3);
+        if (nalUnitLengthFieldLength == 3) {
+          throw new ParserException();
+        }
         List<byte[]> initializationData = new ArrayList<>();
         int numSequenceParameterSets = buffer.readUnsignedByte() & 0x1F;
         for (int i = 0; i < numSequenceParameterSets; i++) {