Bug 1358024 - sync names of codec specific data same as gecko. r=rillian

MozReview-Commit-ID: 696ymQu8bpL

--HG--
extra : rebase_source : 9d39ab27142fde3c4b0556d56d5b87d95b733b5b
This commit is contained in:
Alfredo.Yang 2017-04-20 14:30:28 +08:00
Родитель 2051679921
Коммит b4b874d5e1
1 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -213,10 +213,10 @@ MP4AudioInfo::Update(const mp4parse_track_info* track,
// The Opus decoder expects the container's codec delay or
// pre-skip value, in microseconds, as a 64-bit int at the
// start of the codec-specific config blob.
MOZ_ASSERT(audio->codec_specific_config.data);
MOZ_ASSERT(audio->codec_specific_config.length >= 12);
MOZ_ASSERT(audio->extra_data.data);
MOZ_ASSERT(audio->extra_data.length >= 12);
uint16_t preskip =
LittleEndian::readUint16(audio->codec_specific_config.data + 10);
LittleEndian::readUint16(audio->extra_data.data + 10);
OpusDataDecoder::AppendCodecDelay(mCodecSpecificConfig,
mozilla::FramesToUsecs(preskip, 48000).value());
} else if (track->codec == mp4parse_codec_AAC) {
@ -241,14 +241,14 @@ MP4AudioInfo::Update(const mp4parse_track_info* track,
mProfile = audio->profile;
}
if (audio->codec_specific_config.length > 0) {
mExtraData->AppendElements(audio->codec_specific_config.data,
audio->codec_specific_config.length);
if (audio->extra_data.length > 0) {
mExtraData->AppendElements(audio->extra_data.data,
audio->extra_data.length);
}
if (audio->codec_specific_data.length > 0) {
mCodecSpecificConfig->AppendElements(audio->codec_specific_data.data,
audio->codec_specific_data.length);
if (audio->codec_specific_config.length > 0) {
mCodecSpecificConfig->AppendElements(audio->codec_specific_config.data,
audio->codec_specific_config.length);
}
}