diff options
-rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 | ||||
-rw-r--r-- | media/base/audio_decoder_config.h | 28 | ||||
-rw-r--r-- | media/base/media_switches.cc | 3 | ||||
-rw-r--r-- | media/base/media_switches.h | 2 | ||||
-rw-r--r-- | media/filters/stream_parser_factory.cc | 16 | ||||
-rw-r--r-- | media/mp4/es_descriptor.h | 3 | ||||
-rw-r--r-- | media/mp4/fourccs.h | 1 | ||||
-rw-r--r-- | media/mp4/mp4_stream_parser.cc | 9 |
8 files changed, 16 insertions, 47 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 3296794..9cfca46 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1013,7 +1013,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnableDeadlineScheduling, switches::kEnableDeferredImageDecoding, switches::kEnableDelegatedRenderer, - switches::kEnableEac3Playback, switches::kEnableEncryptedMedia, switches::kEnableExperimentalCanvasFeatures, switches::kEnableExperimentalWebPlatformFeatures, diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h index 53705cc..77d4fc2 100644 --- a/media/base/audio_decoder_config.h +++ b/media/base/audio_decoder_config.h @@ -20,20 +20,20 @@ enum AudioCodec { // values. When deleting a codec replace it with a dummy value; when adding a // codec, do so at the bottom before kAudioCodecMax. kUnknownAudioCodec = 0, - kCodecAAC, - kCodecMP3, - kCodecPCM, - kCodecVorbis, - kCodecFLAC, - kCodecAMR_NB, - kCodecAMR_WB, - kCodecPCM_MULAW, - kCodecGSM_MS, - kCodecPCM_S16BE, - kCodecPCM_S24BE, - kCodecOpus, - kCodecEAC3, - kCodecPCM_ALAW, + kCodecAAC = 1, + kCodecMP3 = 2, + kCodecPCM = 3, + kCodecVorbis = 4, + kCodecFLAC = 5, + kCodecAMR_NB = 6, + kCodecAMR_WB = 7, + kCodecPCM_MULAW = 8, + kCodecGSM_MS = 9, + kCodecPCM_S16BE = 10, + kCodecPCM_S24BE = 11, + kCodecOpus = 12, + // kCodecEAC3 = 13, + kCodecPCM_ALAW = 14, // DO NOT ADD RANDOM AUDIO CODECS! // // The only acceptable time to add a new codec is if there is production code diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 7656c06..d96775a 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -9,9 +9,6 @@ namespace switches { // Allow users to specify a custom buffer size for debugging purpose. const char kAudioBufferSize[] = "audio-buffer-size"; -// Enable EAC3 playback in MSE. -const char kEnableEac3Playback[] = "enable-eac3-playback"; - // Disables Opus playback in media elements. const char kDisableOpusPlayback[] = "disable-opus-playback"; diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 9a974b4..66da9ba 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -14,8 +14,6 @@ namespace switches { MEDIA_EXPORT extern const char kAudioBufferSize[]; -MEDIA_EXPORT extern const char kEnableEac3Playback[]; - MEDIA_EXPORT extern const char kDisableOpusPlayback[]; MEDIA_EXPORT extern const char kDisableVp8AlphaPlayback[]; diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc index 53ee1b7..3d99e93 100644 --- a/media/filters/stream_parser_factory.cc +++ b/media/filters/stream_parser_factory.cc @@ -141,11 +141,6 @@ static const CodecInfo kMPEG2AACLCCodecInfo = { "mp4a.67", CodecInfo::AUDIO, NULL, CodecInfo::HISTOGRAM_MPEG2AAC }; -#if defined(ENABLE_EAC3_PLAYBACK) -static const CodecInfo kEAC3CodecInfo = { "mp4a.a6", CodecInfo::AUDIO, NULL, - CodecInfo::HISTOGRAM_EAC3 }; -#endif - static const CodecInfo* kVideoMP4Codecs[] = { &kH264AVC1CodecInfo, &kH264AVC3CodecInfo, @@ -157,9 +152,6 @@ static const CodecInfo* kVideoMP4Codecs[] = { static const CodecInfo* kAudioMP4Codecs[] = { &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, -#if defined(ENABLE_EAC3_PLAYBACK) - &kEAC3CodecInfo, -#endif NULL }; @@ -168,10 +160,6 @@ static StreamParser* BuildMP4Parser( std::set<int> audio_object_types; bool has_sbr = false; -#if defined(ENABLE_EAC3_PLAYBACK) - bool enable_eac3 = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableEac3Playback); -#endif for (size_t i = 0; i < codecs.size(); ++i) { std::string codec_id = codecs[i]; if (MatchPattern(codec_id, kMPEG2AACLCCodecInfo.pattern)) { @@ -186,10 +174,6 @@ static StreamParser* BuildMP4Parser( has_sbr = true; break; } -#if defined(ENABLE_EAC3_PLAYBACK) - } else if (enable_eac3 && MatchPattern(codec_id, kEAC3CodecInfo.pattern)) { - audio_object_types.insert(mp4::kEAC3); -#endif } } diff --git a/media/mp4/es_descriptor.h b/media/mp4/es_descriptor.h index 36e1bf2..47ba06c 100644 --- a/media/mp4/es_descriptor.h +++ b/media/mp4/es_descriptor.h @@ -21,8 +21,7 @@ namespace mp4 { enum ObjectType { kForbidden = 0, kISO_14496_3 = 0x40, // MPEG4 AAC - kISO_13818_7_AAC_LC = 0x67, // MPEG2 AAC-LC - kEAC3 = 0xa6 // Dolby Digital Plus + kISO_13818_7_AAC_LC = 0x67 // MPEG2 AAC-LC }; // This class parse object type and decoder specific information from an diff --git a/media/mp4/fourccs.h b/media/mp4/fourccs.h index 01cce2b..8f5cb90 100644 --- a/media/mp4/fourccs.h +++ b/media/mp4/fourccs.h @@ -20,7 +20,6 @@ enum FourCC { FOURCC_CO64 = 0x636f3634, FOURCC_CTTS = 0x63747473, FOURCC_DINF = 0x64696e66, - FOURCC_EAC3 = 0x65632d33, FOURCC_EDTS = 0x65647473, FOURCC_ELST = 0x656c7374, FOURCC_ENCA = 0x656e6361, diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc index 62cc751..8b27a64 100644 --- a/media/mp4/mp4_stream_parser.cc +++ b/media/mp4/mp4_stream_parser.cc @@ -197,7 +197,7 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { const AudioSampleEntry& entry = samp_descr.audio_entries[desc_idx]; const AAC& aac = entry.esds.aac; - if (!(entry.format == FOURCC_MP4A || entry.format == FOURCC_EAC3 || + if (!(entry.format == FOURCC_MP4A || (entry.format == FOURCC_ENCA && entry.sinf.format.format == FOURCC_MP4A))) { MEDIA_LOG(log_cb_) << "Unsupported audio format 0x" @@ -207,9 +207,6 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { uint8 audio_type = entry.esds.object_type; DVLOG(1) << "audio_type " << std::hex << audio_type; - if (audio_type == kForbidden && entry.format == FOURCC_EAC3) { - audio_type = kEAC3; - } if (audio_object_types_.find(audio_type) == audio_object_types_.end()) { MEDIA_LOG(log_cb_) << "audio object type 0x" << std::hex << audio_type << " does not match what is specified in the" @@ -230,10 +227,6 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { #if defined(OS_ANDROID) extra_data = aac.codec_specific_data(); #endif - } else if (audio_type == kEAC3) { - codec = kCodecEAC3; - channel_layout = GuessChannelLayout(entry.channelcount); - sample_per_second = entry.samplerate; } else { MEDIA_LOG(log_cb_) << "Unsupported audio object type 0x" << std::hex << audio_type << " in esds."; |