diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
index c799166f6b..7536c3d3be 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
@@ -92,12 +92,12 @@ public final class Ac3Util {
}
/**
- * A non-standard codec string for E-AC-3. Use of this constant allows for disambiguation between
- * regular AC-3 ("ec-3") and E-AC-3 ("ec+3") streams from the codec string alone. The standard is
+ * A non-standard codec string for E-AC3-JOC. Use of this constant allows for disambiguation between
+ * regular E-AC3 ("ec-3") and E-AC3-JOC ("ec+3") streams from the codec string alone. The standard is
* to use "ec-3" for both, as per the MP4RA registered codec
* types.
*/
- public static final String E_AC_3_CODEC_STRING = "ec+3";
+ public static final String E_AC3_JOC_CODEC_STRING = "ec+3";
/** Maximum rate for an AC-3 audio stream, in bytes per second. */
public static final int AC3_MAX_RATE_BYTES_PER_SECOND = 640 * 1000 / 8;
/** Maximum rate for an E-AC-3 audio stream, in bytes per second. */
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index 066cdc9ea4..5108f990f4 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -376,7 +376,7 @@ public final class MimeTypes {
return MimeTypes.AUDIO_AC3;
} else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) {
return MimeTypes.AUDIO_E_AC3;
- } else if (codec.startsWith(Ac3Util.E_AC_3_CODEC_STRING)) {
+ } else if (codec.startsWith(Ac3Util.E_AC3_JOC_CODEC_STRING)) {
return MimeTypes.AUDIO_E_AC3_JOC;
} else if (codec.startsWith("ac-4") || codec.startsWith("dac4")) {
return MimeTypes.AUDIO_AC4;
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index 961cf15195..f58e428a6f 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -776,7 +776,7 @@ public class DashManifestParser extends DefaultHandler
if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
if (MimeTypes.AUDIO_E_AC3_JOC.equals(sampleMimeType)) {
- codecs = Ac3Util.E_AC_3_CODEC_STRING;
+ codecs = Ac3Util.E_AC3_JOC_CODEC_STRING;
}
}
@C.SelectionFlags int selectionFlags = parseSelectionFlagsFromRoleDescriptors(roleDescriptors);
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 52f23448f4..ce44211b31 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -518,7 +518,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser