Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small adjustments

This commit is contained in:
Martchus 2015-08-10 00:02:03 +02:00
parent c5400ba562
commit 8dc85941eb
6 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adts/adtsstream.cpp
View File

@ -33,7 +33,7 @@ void AdtsStream::internalParseHeader()
m_format = Mpeg4AudioObjectIds::idToMediaFormat(m_firstFrame.mpeg4AudioObjectId()); m_format = Mpeg4AudioObjectIds::idToMediaFormat(m_firstFrame.mpeg4AudioObjectId());
m_channelCount = Mpeg4ChannelConfigs::channelCount(m_channelConfig = m_firstFrame.mpeg4ChannelConfig()); m_channelCount = Mpeg4ChannelConfigs::channelCount(m_channelConfig = m_firstFrame.mpeg4ChannelConfig());
byte sampleRateIndex = m_firstFrame.mpeg4SamplingFrequencyIndex(); byte sampleRateIndex = m_firstFrame.mpeg4SamplingFrequencyIndex();
m_sampleRate = sampleRateIndex < sizeof(mpeg4SampleRateTable) ? mpeg4SampleRateTable[sampleRateIndex] : 0; m_sampleRate = sampleRateIndex < sizeof(mpeg4SamplingFrequencyTable) ? mpeg4SamplingFrequencyTable[sampleRateIndex] : 0;
} }
} // namespace Media } // namespace Media

2
mp4/mp4ids.cpp
View File

@ -279,7 +279,7 @@ LIB_EXPORT MediaFormat idToMediaFormat(byte mpeg4AudioObjectId, bool sbrPresent,
} }
uint32 mpeg4SampleRateTable[] = { uint32 mpeg4SamplingFrequencyTable[] = {
96000, 88200, 64000, 48000, 44100, 32000, 96000, 88200, 64000, 48000, 44100, 32000,
24000, 22050, 16000, 12000, 11025, 8000, 7350 24000, 22050, 16000, 12000, 11025, 8000, 7350
}; };

2
mp4/mp4ids.h
View File

@ -585,7 +585,7 @@ LIB_EXPORT MediaFormat idToMediaFormat(byte mpeg4AudioObjectId, bool sbrPresent
} }
extern uint32 mpeg4SampleRateTable[13]; extern uint32 mpeg4SamplingFrequencyTable[13];
namespace Mpeg4ChannelConfigs { namespace Mpeg4ChannelConfigs {
enum Mpeg4ChannelConfig : byte enum Mpeg4ChannelConfig : byte

8
mp4/mp4tag.cpp
View File

@ -122,14 +122,10 @@ bool Mp4Tag::setValue(KnownField field, const TagValue &value)
case KnownField::Genre: case KnownField::Genre:
switch(value.type()) { switch(value.type()) {
case TagDataType::StandardGenreIndex: case TagDataType::StandardGenreIndex:
if(fields().count(Mp4TagAtomIds::Genre)) { fields().erase(Mp4TagAtomIds::Genre);
fields().erase(Mp4TagAtomIds::Genre);
}
return FieldMapBasedTag<fieldType>::setValue(Mp4TagAtomIds::PreDefinedGenre, value); return FieldMapBasedTag<fieldType>::setValue(Mp4TagAtomIds::PreDefinedGenre, value);
default: default:
if(fields().count(Mp4TagAtomIds::PreDefinedGenre)) { fields().erase(Mp4TagAtomIds::PreDefinedGenre);
fields().erase(Mp4TagAtomIds::PreDefinedGenre);
}
return FieldMapBasedTag<fieldType>::setValue(Mp4TagAtomIds::Genre, value); return FieldMapBasedTag<fieldType>::setValue(Mp4TagAtomIds::Genre, value);
} }
case KnownField::EncoderSettings: case KnownField::EncoderSettings:

8
mp4/mp4track.cpp
View File

@ -1366,15 +1366,15 @@ void Mp4Track::internalParseHeader()
m_format += Mpeg4AudioObjectIds::idToMediaFormat(m_esInfo->audioSpecificConfig->audioObjectType, m_esInfo->audioSpecificConfig->sbrPresent, m_esInfo->audioSpecificConfig->psPresent); m_format += Mpeg4AudioObjectIds::idToMediaFormat(m_esInfo->audioSpecificConfig->audioObjectType, m_esInfo->audioSpecificConfig->sbrPresent, m_esInfo->audioSpecificConfig->psPresent);
if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex == 0xF) { if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex == 0xF) {
m_sampleRate = m_esInfo->audioSpecificConfig->sampleFrequency; m_sampleRate = m_esInfo->audioSpecificConfig->sampleFrequency;
} else if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex < sizeof(mpeg4SampleRateTable)) { } else if(m_esInfo->audioSpecificConfig->sampleFrequencyIndex < sizeof(mpeg4SamplingFrequencyTable)) {
m_sampleRate = mpeg4SampleRateTable[m_esInfo->audioSpecificConfig->sampleFrequencyIndex]; m_sampleRate = mpeg4SamplingFrequencyTable[m_esInfo->audioSpecificConfig->sampleFrequencyIndex];
} else { } else {
addNotification(NotificationType::Warning, "Audio specific config has invalid sample frequency index.", context); addNotification(NotificationType::Warning, "Audio specific config has invalid sample frequency index.", context);
} }
if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex == 0xF) { if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex == 0xF) {
m_extensionSampleRate = m_esInfo->audioSpecificConfig->extensionSampleFrequency; m_extensionSampleRate = m_esInfo->audioSpecificConfig->extensionSampleFrequency;
} else if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex < sizeof(mpeg4SampleRateTable)) { } else if(m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex < sizeof(mpeg4SamplingFrequencyTable)) {
m_extensionSampleRate = mpeg4SampleRateTable[m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex]; m_extensionSampleRate = mpeg4SamplingFrequencyTable[m_esInfo->audioSpecificConfig->extensionSampleFrequencyIndex];
} else { } else {
addNotification(NotificationType::Warning, "Audio specific config has invalid extension sample frequency index.", context); addNotification(NotificationType::Warning, "Audio specific config has invalid extension sample frequency index.", context);
} }

5
tag.h
View File

@ -135,9 +135,8 @@ protected:
std::string m_version; std::string m_version;
uint32 m_size; uint32 m_size;
TagTarget m_target; TagTarget m_target;
Tag *m_parent; // Tag *m_parent;
std::vector<Tag *> m_nestedTags; // std::vector<Tag *> m_nestedTags;
}; };
/*! /*!