sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-29 10:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Restore to the original solution after further discussion"

Browse source 
This reverts commit e7d1adf917.
This commit is contained in:
ybai001 2021-06-10 20:55:46 +08:00
parent e7d1adf917
commit aefc6bf51c
4 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
demos/main/src/main/assets/media.exolist.json
View file

@ -1,17 +1,4 @@
[
{
"name": "Nanda Stream",
"samples": [
{
"name": "HLS",
"uri": "https://ott.dolby.com/OnDelKits/AC-4/Dolby_AC-4_Online_Delivery_Kit_1.5/Test_Signals/example_streams/HLS/Manifest_fMP4/Holi_25fps_example_2.m3u8"
},
{
"name": "DASH",
"uri": "https://ott.dolby.com/OnDelKits/AC-4/Dolby_AC-4_Online_Delivery_Kit_1.5/Test_Signals/example_streams/DASH/OnDemand/MPD/Holi_25fps_example_2.mpd"
}
]
},
{
"name": "Clear DASH",
"samples": [

3
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
View file

@ -279,6 +279,9 @@ public final class MediaCodecInfo {
if (format.codecs == null || mimeType == null) {
return true;
}
if (MimeTypes.AUDIO_E_AC3_JOC.equals(mimeType)) {
return true;
}
String codecMimeType = MimeTypes.getMediaMimeType(format.codecs);
if (codecMimeType == null) {
return true;

3
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View file

@ -765,9 +765,6 @@ public class DashManifestParser extends DefaultHandler
@Nullable String sampleMimeType = getSampleMimeType(containerMimeType, codecs);
if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
if (MimeTypes.AUDIO_E_AC3_JOC.equals(sampleMimeType)) {
codecs = "ec+3";
}
}
@C.SelectionFlags int selectionFlags = parseSelectionFlagsFromRoleDescriptors(roleDescriptors);
@C.RoleFlags int roleFlags = parseRoleFlagsFromRoleDescriptors(roleDescriptors);

1
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
View file

@ -515,7 +515,6 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
formatBuilder.setChannelCount(channelCount);
if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType) && channelsString.endsWith("/JOC")) {
sampleMimeType = MimeTypes.AUDIO_E_AC3_JOC;
formatBuilder.setCodecs("ec+3");
}
}
formatBuilder.setSampleMimeType(sampleMimeType);