зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1747760 - P10: Remove AudioInfo.mExtraData. r=kinetik
This is no longer needed as the codec specific data member covers all codec specific data. Differential Revision: https://phabricator.services.mozilla.com/D145523
This commit is contained in:
Родитель
45ccca4aaf
Коммит
3df14aa79d
|
@ -52,8 +52,7 @@ bool AudioInfo::operator==(const AudioInfo& rhs) const {
|
|||
mChannels == rhs.mChannels && mChannelMap == rhs.mChannelMap &&
|
||||
mBitDepth == rhs.mBitDepth && mProfile == rhs.mProfile &&
|
||||
mExtendedProfile == rhs.mExtendedProfile &&
|
||||
mCodecSpecificConfig == rhs.mCodecSpecificConfig &&
|
||||
*mExtraData == *rhs.mExtraData);
|
||||
mCodecSpecificConfig == rhs.mCodecSpecificConfig);
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
|
|
@ -469,8 +469,7 @@ class AudioInfo : public TrackInfo {
|
|||
mChannelMap(AudioConfig::ChannelLayout::UNKNOWN_MAP),
|
||||
mBitDepth(0),
|
||||
mProfile(0),
|
||||
mExtendedProfile(0),
|
||||
mExtraData(new MediaByteBuffer) {}
|
||||
mExtendedProfile(0) {}
|
||||
|
||||
AudioInfo(const AudioInfo& aOther) = default;
|
||||
|
||||
|
@ -511,8 +510,6 @@ class AudioInfo : public TrackInfo {
|
|||
int8_t mExtendedProfile;
|
||||
|
||||
AudioCodecSpecificVariant mCodecSpecificConfig{NoCodecSpecificData{}};
|
||||
RefPtr<MediaByteBuffer> mExtraData; // TODO(bryce) remove this, it can be
|
||||
// replaced with codec specific entriely.
|
||||
};
|
||||
|
||||
class EncryptionInfo {
|
||||
|
|
|
@ -177,7 +177,6 @@ struct ParamTraits<mozilla::AudioInfo> {
|
|||
WriteParam(aWriter, aParam.mProfile);
|
||||
WriteParam(aWriter, aParam.mExtendedProfile);
|
||||
WriteParam(aWriter, aParam.mCodecSpecificConfig);
|
||||
WriteParam(aWriter, *aParam.mExtraData);
|
||||
}
|
||||
|
||||
static bool Read(MessageReader* aReader, paramType* aResult) {
|
||||
|
@ -188,8 +187,7 @@ struct ParamTraits<mozilla::AudioInfo> {
|
|||
ReadParam(aReader, &aResult->mBitDepth) &&
|
||||
ReadParam(aReader, &aResult->mProfile) &&
|
||||
ReadParam(aReader, &aResult->mExtendedProfile) &&
|
||||
ReadParam(aReader, &aResult->mCodecSpecificConfig) &&
|
||||
ReadParam(aReader, aResult->mExtraData.get())) {
|
||||
ReadParam(aReader, &aResult->mCodecSpecificConfig)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
Загрузка…
Ссылка в новой задаче