diff options
| author | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 16:13:59 +0000 |
|---|---|---|
| committer | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-18 16:13:59 +0000 |
| commit | 919eb99951e5c9c079d38056433b0cd18bb54f93 (patch) | |
| tree | 0ac411f5a260c47ae9ace895b6c95d09afdfbfd4 /media/mp4 | |
| parent | 40ecb99bab1d6a34a1ea822820bae6ce54c1a4ab (diff) | |
| download | chromium_src-919eb99951e5c9c079d38056433b0cd18bb54f93.zip chromium_src-919eb99951e5c9c079d38056433b0cd18bb54f93.tar.gz chromium_src-919eb99951e5c9c079d38056433b0cd18bb54f93.tar.bz2 | |
Remove EAC3 supports.
This reverts https://codereview.chromium.org/14641006/.
BUG=334126
TEST=media_unittests
Review URL: https://codereview.chromium.org/138743006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -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 |
3 files changed, 2 insertions, 11 deletions
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."; |