Flatten packages within the RTSP package.

#minor-release

PiperOrigin-RevId: 371337762

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.sdp;
+package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.message.RtspMessageUtil.parseInt;
+import static com.google.android.exoplayer2.source.rtsp.RtspMessageUtil.parseInt;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_FMTP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_FMTP;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_RTPMAP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_RTPMAP;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
@@ -35,7 +35,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /** Represents one media description section in a SDP message. */
-public final class MediaDescription {
+/* package */ final class MediaDescription {
 
   /** Represents the mandatory RTPMAP attribute in MediaDescription. Reference RFC 2327 Page 22. */
   public static final class RtpMapAttribute {

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataChannel.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import com.google.android.exoplayer2.upstream.DataSource;
 
 /** An RTP {@link DataSource}. */
-public interface RtpDataChannel extends DataSource {
+/* package */ interface RtpDataChannel extends DataSource {
 
   /** Creates {@link RtpDataChannel} for RTSP streams. */
   interface Factory {

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpDataLoadable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Util.closeQuietly;
@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
-import com.google.android.exoplayer2.source.rtsp.RtspMediaTrack;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.Loader;
 import com.google.android.exoplayer2.util.Util;
@@ -47,7 +46,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  * <p>Received RTP packets' payloads will be extracted by an {@link RtpExtractor}, and will be
  * written to the {@link ExtractorOutput} instance provided at construction.
  */
-public final class RtpDataLoadable implements Loader.Loadable {
+/* package */ final class RtpDataLoadable implements Loader.Loadable {
 
   /** Called on loadable events. */
   public interface EventListener {

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpExtractor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
@@ -27,8 +27,8 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.extractor.SeekMap;
-import com.google.android.exoplayer2.source.rtsp.rtp.reader.DefaultRtpPayloadReaderFactory;
+import com.google.android.exoplayer2.source.rtsp.reader.DefaultRtpPayloadReaderFactory;
-import com.google.android.exoplayer2.source.rtsp.rtp.reader.RtpPayloadReader;
+import com.google.android.exoplayer2.source.rtsp.reader.RtpPayloadReader;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpPacket.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpPacketReorderingQueue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static java.lang.Math.abs;
 import static java.lang.Math.max;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtpPayloadFormat.java

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription;
-import com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableMap;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspClient.java

@@ -15,20 +15,20 @@
  */
 package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.message.RtspMessageChannel.DEFAULT_RTSP_PORT;
+import static com.google.android.exoplayer2.source.rtsp.RtspMessageChannel.DEFAULT_RTSP_PORT;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_ANNOUNCE;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_ANNOUNCE;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_DESCRIBE;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_DESCRIBE;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_GET_PARAMETER;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_GET_PARAMETER;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_OPTIONS;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_OPTIONS;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_PAUSE;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_PAUSE;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_PLAY;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_PLAY;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_PLAY_NOTIFY;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_PLAY_NOTIFY;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_RECORD;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_RECORD;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_REDIRECT;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_REDIRECT;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_SETUP;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_SETUP;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_SET_PARAMETER;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_SET_PARAMETER;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_TEARDOWN;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_TEARDOWN;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_UNSET;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_UNSET;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
@@ -42,20 +42,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.source.rtsp.RtspMediaPeriod.RtpLoadInfo;
 import com.google.android.exoplayer2.source.rtsp.RtspMediaSource.RtspPlaybackException;
-import com.google.android.exoplayer2.source.rtsp.message.RtspDescribeResponse;
+import com.google.android.exoplayer2.source.rtsp.RtspMessageUtil.RtspSessionHeader;
-import com.google.android.exoplayer2.source.rtsp.message.RtspHeaders;
-import com.google.android.exoplayer2.source.rtsp.message.RtspMessageChannel;
-import com.google.android.exoplayer2.source.rtsp.message.RtspMessageUtil;
-import com.google.android.exoplayer2.source.rtsp.message.RtspMessageUtil.RtspSessionHeader;
-import com.google.android.exoplayer2.source.rtsp.message.RtspOptionsResponse;
-import com.google.android.exoplayer2.source.rtsp.message.RtspPlayResponse;
-import com.google.android.exoplayer2.source.rtsp.message.RtspRequest;
-import com.google.android.exoplayer2.source.rtsp.message.RtspResponse;
-import com.google.android.exoplayer2.source.rtsp.message.RtspSetupResponse;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
-import com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription;
-import com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription;
-import com.google.android.exoplayer2.source.rtsp.sdp.SessionDescriptionParser;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspDescribeResponse.java

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
-
-import com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription;
 
 /** Represents an RTSP DESCRIBE response. */
-public final class RtspDescribeResponse {
+/* package */ final class RtspDescribeResponse {
   /** The response's status code. */
   public final int status;
   /** The {@link SessionDescription} (see RFC2327) in the DESCRIBE response. */

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspHeaders.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Util;
@@ -33,7 +33,7 @@ import java.util.Map;
  * with case-insensitive header names. The extra spaces around header names and values are trimmed.
  * Contrary to HTTP, RTSP does not allow ambiguous/arbitrary header names (RFC 2326 Section 12).
  */
-public final class RtspHeaders {
+/* package */ final class RtspHeaders {
 
   public static final String ACCEPT = "Accept";
   public static final String ALLOW = "Allow";

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriod.java

@@ -43,8 +43,6 @@ import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.rtsp.RtspClient.PlaybackEventListener;
 import com.google.android.exoplayer2.source.rtsp.RtspMediaSource.RtspPlaybackException;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpDataChannel;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpDataLoadable;
 import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
@@ -61,7 +59,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** A {@link MediaPeriod} that loads an RTSP stream. */
-public final class RtspMediaPeriod implements MediaPeriod {
+/* package */ final class RtspMediaPeriod implements MediaPeriod {
 
   private static final String TAG = "RtspMediaPeriod";
   /** The maximum times to retry if the underlying data channel failed to bind. */

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaSource.java

@@ -31,7 +31,6 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSourceFactory;
 import com.google.android.exoplayer2.source.SinglePeriodTimeline;
 import com.google.android.exoplayer2.source.rtsp.RtspClient.SessionInfoListener;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpDataChannel;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrack.java

@@ -15,10 +15,10 @@
  */
 package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat.getMimeTypeFromRtpMediaType;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.MEDIA_TYPE_AUDIO;
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.MEDIA_TYPE_AUDIO;
+import static com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat.getMimeTypeFromRtpMediaType;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_CONTROL;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_CONTROL;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_RTPMAP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_RTPMAP;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.NalUnitUtil.NAL_START_CODE;
@@ -31,8 +31,6 @@ import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AacUtil;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
-import com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -40,7 +38,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
 /** Represents a media track in an RTSP playback. */
-public final class RtspMediaTrack {
+/* package */ final class RtspMediaTrack {
   // Format specific parameter names.
   private static final String PARAMETER_PROFILE_LEVEL_ID = "profile-level-id";
   private static final String PARAMETER_SPROP_PARAMS = "sprop-parameter-sets";

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMessageChannel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
 
@@ -39,7 +39,7 @@ import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Sends and receives RTSP messages. */
-public final class RtspMessageChannel implements Closeable {
+/* package */ final class RtspMessageChannel implements Closeable {
 
   private static final String TAG = "RtspMessageChannel";
   private static final boolean LOG_RTSP_MESSAGES = false;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMessageUtil.java

@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_ANNOUNCE;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_ANNOUNCE;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_DESCRIBE;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_DESCRIBE;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_GET_PARAMETER;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_GET_PARAMETER;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_OPTIONS;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_OPTIONS;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_PAUSE;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_PAUSE;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_PLAY;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_PLAY;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_PLAY_NOTIFY;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_PLAY_NOTIFY;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_RECORD;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_RECORD;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_REDIRECT;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_REDIRECT;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_SETUP;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_SETUP;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_SET_PARAMETER;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_SET_PARAMETER;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_TEARDOWN;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_TEARDOWN;
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_UNSET;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_UNSET;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
@@ -45,7 +45,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /** Utility methods for RTSP messages. */
-public final class RtspMessageUtil {
+/* package */ final class RtspMessageUtil {
   /** Represents a RTSP Session header (RFC2326 Section 12.37). */
   public static final class RtspSessionHeader {
     /** The session ID. */

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspOptionsResponse.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -21,7 +21,7 @@ import java.util.List;
 /** Represents an RTSP OPTIONS response. */
 // TODO(b/180434754) Move all classes under message to the parent rtsp package, and change the
 // visibility.
-public final class RtspOptionsResponse {
+/* package */ final class RtspOptionsResponse {
   /** The response's status code. */
   public final int status;
   /**

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspPlayResponse.java

@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
-import com.google.android.exoplayer2.source.rtsp.RtspSessionTiming;
-import com.google.android.exoplayer2.source.rtsp.RtspTrackTiming;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 /** Represents an RTSP PLAY response. */
-public final class RtspPlayResponse {
+/* package */ final class RtspPlayResponse {
   /** The response's status code. */
   public final int status;
   /** The playback start timing, {@link RtspSessionTiming#DEFAULT} if not present. */

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 import android.net.Uri;
 import androidx.annotation.IntDef;
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /** Represents an RTSP request. */
-public final class RtspRequest {
+/* package */ final class RtspRequest {
   /**
    * RTSP request methods, as defined in RFC2326 Section 10.
    *

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspResponse.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 /** Represents an RTSP Response. */
-public final class RtspResponse {
+/* package */ final class RtspResponse {
   // TODO(b/172331505) Move this constant to MimeTypes.
   /** The MIME type associated with Session Description Protocol (RFC4566). */
   public static final String SDP_MIME_TYPE = "application/sdp";

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspSessionTiming.java

@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
  *
  * <p>Currently only NPT is supported. See RFC2326 Section 3.6 for detail of NPT.
  */
-public final class RtspSessionTiming {
+/* package */ final class RtspSessionTiming {
   /** The default session timing starting from 0.000 and indefinite length, effectively live. */
   public static final RtspSessionTiming DEFAULT =
       new RtspSessionTiming(/* startTimeMs= */ 0, /* stopTimeMs= */ C.TIME_UNSET);

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspSetupResponse.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 /** Represents an RTSP SETUP response. */
 // TODO(b/180434754) Move all classes under message to the parent rtsp package, and change the
 // visibility.
-public final class RtspSetupResponse {
+/* package */ final class RtspSetupResponse {
 
   /** The response's status code. */
   public final int status;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspTrackTiming.java

@@ -19,7 +19,6 @@ import android.net.Uri;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
-import com.google.android.exoplayer2.source.rtsp.message.RtspHeaders;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 
@@ -29,7 +28,7 @@ import com.google.common.collect.ImmutableList;
  *
  * <p>The fields {@link #rtpTimestamp} and {@link #sequenceNumber} will not both be {@code null}.
  */
-public final class RtspTrackTiming {
+/* package */ final class RtspTrackTiming {
 
   /**
    * Parses the RTP-Info header into a list of {@link RtspTrackTiming RtspTrackTimings}.

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/SessionDescription.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.sdp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableMap;
  * <p>SDP messages encapsulate information on the media play back session, including session
  * configuration information, formats of each playable track, etc. SDP is defined in RFC4566.
  */
-public final class SessionDescription {
+/* package */ final class SessionDescription {
 
   /** Builder class for {@link SessionDescription}. */
   public static final class Builder {

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/SessionDescriptionParser.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.sdp;
+package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.SUPPORTED_SDP_VERSION;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.SUPPORTED_SDP_VERSION;
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.base.Strings.nullToEmpty;
@@ -29,7 +29,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /** Parses a String based SDP message into {@link SessionDescription}. */
-public final class SessionDescriptionParser {
+/* package */ final class SessionDescriptionParser {
   // SDP line always starts with an one letter tag, followed by an equal sign. The information
   // under the given tag follows an optional space.
   private static final Pattern SDP_LINE_PATTERN = Pattern.compile("([a-z])=\\s?(.+)");

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/UdpDataSourceRtpDataChannel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
@@ -23,7 +23,7 @@ import com.google.android.exoplayer2.upstream.UdpDataSource;
 import java.io.IOException;
 
 /** An {@link RtpDataChannel} for UDP transport. */
-public final class UdpDataSourceRtpDataChannel implements RtpDataChannel {
+/* package */ final class UdpDataSourceRtpDataChannel implements RtpDataChannel {
   private final UdpDataSource dataSource;
 
   /** Creates a new instance. */

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/message/package-info.java

@@ -1,19 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-@NonNullApi
-package com.google.android.exoplayer2.source.rtsp.message;
-
-import com.google.android.exoplayer2.util.NonNullApi;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/DefaultRtpPayloadReaderFactory.java

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp.reader;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
+import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
 import com.google.android.exoplayer2.util.MimeTypes;
 
 /** Default {@link RtpPayloadReader.Factory} implementation. */
-public final class DefaultRtpPayloadReaderFactory implements RtpPayloadReader.Factory {
+/* package */ public final class DefaultRtpPayloadReaderFactory
+    implements RtpPayloadReader.Factory {
 
   @Override
   @Nullable

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAacReader.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp.reader;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
+import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3Reader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp.reader;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
@@ -23,14 +23,14 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.audio.Ac3Util;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
+import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Parses an AC3 byte stream carried on RTP packets, and extracts AC3 frames. */
-public final class RtpAc3Reader implements RtpPayloadReader {
+/* package */ public final class RtpAc3Reader implements RtpPayloadReader {
 
   /** AC3 frame types defined in RFC4184 Section 4.1.1. */
   private static final int AC3_FRAME_TYPE_COMPLETE_FRAME = 0;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpH264Reader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp.reader;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
@@ -23,8 +23,8 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPacket;
+import com.google.android.exoplayer2.source.rtsp.RtpPacket;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
+import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
 import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpPayloadReader.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp.reader;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
+import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /** Extracts media samples from the payload of received RTP packets. */
-public interface RtpPayloadReader {
+/* package */ public interface RtpPayloadReader {
 
   /** Factory of {@link RtpPayloadReader} instances. */
   interface Factory {

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/package-info.java

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 @NonNullApi
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import com.google.android.exoplayer2.util.NonNullApi;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/rtp/reader/package-info.java

@@ -1,19 +0,0 @@
-/*
- * Copyright 2020 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.
- */
-@NonNullApi
-package com.google.android.exoplayer2.source.rtsp.rtp.reader;
-
-import com.google.android.exoplayer2.util.NonNullApi;

library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/sdp/package-info.java

@@ -1,19 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-@NonNullApi
-package com.google.android.exoplayer2.source.rtsp.sdp;
-
-import com.google.android.exoplayer2.util.NonNullApi;

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketReorderingQueueTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.common.truth.Truth.assertThat;
 

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Util.getBytesFromHexString;

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspHeadersTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.common.truth.Truth.assertThat;
 

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriodTest.java

@@ -23,9 +23,6 @@ import androidx.annotation.Nullable;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpDataChannel;
-import com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription;
-import com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.common.collect.ImmutableList;
 import java.util.concurrent.atomic.AtomicBoolean;

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java

@@ -15,20 +15,18 @@
  */
 package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.MEDIA_TYPE_AUDIO;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.MEDIA_TYPE_AUDIO;
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.MEDIA_TYPE_VIDEO;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.MEDIA_TYPE_VIDEO;
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.RTP_AVP_PROFILE;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.RTP_AVP_PROFILE;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_CONTROL;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_CONTROL;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_FMTP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_FMTP;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_RTPMAP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_RTPMAP;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AacUtil;
-import com.google.android.exoplayer2.source.rtsp.rtp.RtpPayloadFormat;
-import com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageUtilTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.message;
+package com.google.android.exoplayer2.source.rtsp;
 
 import static com.google.common.truth.Truth.assertThat;
 

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspServer.java

@@ -15,16 +15,11 @@
  */
 package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.message.RtspRequest.METHOD_OPTIONS;
+import static com.google.android.exoplayer2.source.rtsp.RtspRequest.METHOD_OPTIONS;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
 import android.os.Handler;
 import android.os.Looper;
-import com.google.android.exoplayer2.source.rtsp.message.RtspHeaders;
-import com.google.android.exoplayer2.source.rtsp.message.RtspMessageChannel;
-import com.google.android.exoplayer2.source.rtsp.message.RtspMessageUtil;
-import com.google.android.exoplayer2.source.rtsp.message.RtspRequest;
-import com.google.android.exoplayer2.source.rtsp.message.RtspResponse;
 import com.google.android.exoplayer2.util.Util;
 import java.io.Closeable;
 import java.io.IOException;

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/SessionDescriptionTest.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.source.rtsp.sdp;
+package com.google.android.exoplayer2.source.rtsp;
 
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.MEDIA_TYPE_AUDIO;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.MEDIA_TYPE_AUDIO;
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.MEDIA_TYPE_VIDEO;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.MEDIA_TYPE_VIDEO;
-import static com.google.android.exoplayer2.source.rtsp.sdp.MediaDescription.RTP_AVP_PROFILE;
+import static com.google.android.exoplayer2.source.rtsp.MediaDescription.RTP_AVP_PROFILE;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_CONTROL;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_CONTROL;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_FMTP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_FMTP;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_RANGE;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_RANGE;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_RTPMAP;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_RTPMAP;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_TOOL;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_TOOL;
-import static com.google.android.exoplayer2.source.rtsp.sdp.SessionDescription.ATTR_TYPE;
+import static com.google.android.exoplayer2.source.rtsp.SessionDescription.ATTR_TYPE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 

library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3ReaderTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.source.rtsp.rtp;
+package com.google.android.exoplayer2.source.rtsp.reader;
 
 import static com.google.android.exoplayer2.util.Util.getBytesFromHexString;
 import static com.google.common.truth.Truth.assertThat;
@@ -23,7 +23,8 @@ import static org.mockito.Mockito.when;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
-import com.google.android.exoplayer2.source.rtsp.rtp.reader.RtpAc3Reader;
+import com.google.android.exoplayer2.source.rtsp.RtpPacket;
+import com.google.android.exoplayer2.source.rtsp.RtpPayloadFormat;
 import com.google.android.exoplayer2.testutil.FakeTrackOutput;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;