Refactor WaveFormatHeader::parse()
This commit is contained in:
parent
48ee8023b2
commit
0c2056c2f9
|
@ -466,14 +466,10 @@ void MatroskaTrack::internalParseHeader(Diagnostics &diag)
|
||||||
case GeneralMediaFormat::MicrosoftAudioCodecManager:
|
case GeneralMediaFormat::MicrosoftAudioCodecManager:
|
||||||
if ((codecPrivateElement = m_trackElement->childById(MatroskaIds::CodecPrivate, diag))) {
|
if ((codecPrivateElement = m_trackElement->childById(MatroskaIds::CodecPrivate, diag))) {
|
||||||
// parse WAVE header to determine actual format
|
// parse WAVE header to determine actual format
|
||||||
if (codecPrivateElement->dataSize() >= 16) {
|
m_istream->seekg(static_cast<streamoff>(codecPrivateElement->dataOffset()));
|
||||||
m_istream->seekg(static_cast<streamoff>(codecPrivateElement->dataOffset()));
|
WaveFormatHeader waveFormatHeader;
|
||||||
WaveFormatHeader waveFormatHeader;
|
waveFormatHeader.parse(reader(), codecPrivateElement->dataSize(), diag);
|
||||||
waveFormatHeader.parse(reader());
|
WaveAudioStream::addInfo(waveFormatHeader, *this);
|
||||||
WaveAudioStream::addInfo(waveFormatHeader, *this);
|
|
||||||
} else {
|
|
||||||
diag.emplace_back(DiagLevel::Critical, "BITMAPINFOHEADER structure (in \"CodecPrivate\"-element) is truncated.", context);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GeneralMediaFormat::Aac:
|
case GeneralMediaFormat::Aac:
|
||||||
|
|
|
@ -18,86 +18,58 @@ namespace TagParser {
|
||||||
* \brief The WaveFormatHeader class parses the WAVEFORMATEX structure defined by MS.
|
* \brief The WaveFormatHeader class parses the WAVEFORMATEX structure defined by MS.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
|
||||||
* \brief Parses the WAVE "fmt " header segment using the specified \a reader.
|
|
||||||
* \remarks Reads 16 bytes from the associated stream.
|
|
||||||
*/
|
|
||||||
void WaveFormatHeader::parse(CppUtilities::BinaryReader &reader)
|
|
||||||
{
|
|
||||||
Diagnostics diag;
|
|
||||||
parseExt(reader, 16, diag);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Parses the WAVE "fmt " header segment using the specified \a reader.
|
* \brief Parses the WAVE "fmt " header segment using the specified \a reader.
|
||||||
* \returns Returns the detected media format and the number of bytes read.
|
* \returns Returns the detected media format and the number of bytes read.
|
||||||
* \todo
|
|
||||||
* - Make sampleRate and bytesPerSecond 32-bit in v9.
|
|
||||||
* - Make GUID a field of WaveFormatHeader instead of returning the MediaFormat in v9.
|
|
||||||
* - Replace parse() function with this.
|
|
||||||
*/
|
*/
|
||||||
pair<MediaFormat, std::uint64_t> WaveFormatHeader::parseExt(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag)
|
std::uint64_t WaveFormatHeader::parse(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag)
|
||||||
{
|
{
|
||||||
auto result = make_pair<MediaFormat, std::uint64_t>(GeneralMediaFormat::Unknown, 0);
|
uint64_t bytesRead = 0;
|
||||||
if (maxSize < 16) {
|
if (maxSize < 16) {
|
||||||
diag.emplace_back(DiagLevel::Warning, "\"fmt \" segment is truncated.", "parsing WAVE format header");
|
diag.emplace_back(DiagLevel::Warning, "\"fmt \" segment is truncated.", "parsing WAVE format header");
|
||||||
return result;
|
return bytesRead;
|
||||||
}
|
}
|
||||||
|
|
||||||
formatTag = reader.readUInt16LE();
|
formatTag = reader.readUInt16LE();
|
||||||
result.first = format();
|
|
||||||
channelCount = reader.readUInt16LE();
|
channelCount = reader.readUInt16LE();
|
||||||
sampleRate = reader.readUInt32LE();
|
sampleRate = reader.readUInt32LE();
|
||||||
bytesPerSecond = reader.readUInt32LE();
|
bytesPerSecond = reader.readUInt32LE();
|
||||||
chunkSize = reader.readUInt16LE();
|
chunkSize = reader.readUInt16LE();
|
||||||
bitsPerSample = reader.readUInt16LE();
|
bitsPerSample = reader.readUInt16LE();
|
||||||
result.second = 16;
|
bytesRead = 16;
|
||||||
|
|
||||||
// read extended header unless format is PCM
|
// read extended header unless format is PCM
|
||||||
if (result.first.general == GeneralMediaFormat::Pcm) {
|
if (formatTag == 0x0001u || formatTag == 0x0003u) {
|
||||||
return result;
|
return bytesRead;
|
||||||
}
|
}
|
||||||
if ((maxSize -= 16) < 2) {
|
if ((maxSize -= 16) < 2) {
|
||||||
diag.emplace_back(DiagLevel::Warning, "\"fmt \" segment is truncated (extended header missing).", "parsing WAVE format header");
|
diag.emplace_back(DiagLevel::Warning, "\"fmt \" segment is truncated (extended header missing).", "parsing WAVE format header");
|
||||||
return result;
|
return bytesRead;
|
||||||
}
|
}
|
||||||
const auto extensionSize = reader.readUInt16LE();
|
const auto extensionSize = reader.readUInt16LE();
|
||||||
result.second += 2;
|
bytesRead += 2;
|
||||||
if ((maxSize -= 2) < 2) {
|
if ((maxSize -= 2) < 2) {
|
||||||
diag.emplace_back(DiagLevel::Warning, "\"fmt \" segment is truncated (extended header truncated).", "parsing WAVE format header");
|
diag.emplace_back(DiagLevel::Warning, "\"fmt \" segment is truncated (extended header truncated).", "parsing WAVE format header");
|
||||||
return result;
|
return bytesRead;
|
||||||
}
|
}
|
||||||
|
|
||||||
// skip extended header unless format is "WAVE_FORMAT_EXTENSIBLE"
|
// skip extended header unless format is "WAVE_FORMAT_EXTENSIBLE"
|
||||||
if (formatTag != 65534) {
|
if (formatTag != 65534) {
|
||||||
reader.stream()->seekg(extensionSize, ios_base::cur);
|
reader.stream()->seekg(extensionSize, ios_base::cur);
|
||||||
result.second += extensionSize;
|
bytesRead += extensionSize;
|
||||||
return result;
|
return bytesRead;
|
||||||
}
|
}
|
||||||
|
|
||||||
// read extended header for "WAVE_FORMAT_EXTENSIBLE"
|
// read extended header for "WAVE_FORMAT_EXTENSIBLE"
|
||||||
if (extensionSize != 22) {
|
if (extensionSize != 22) {
|
||||||
diag.emplace_back(DiagLevel::Warning, "\"fmt \" extended header has unexptected size.", "parsing WAVE format header");
|
diag.emplace_back(DiagLevel::Warning, "\"fmt \" extended header has unexptected size.", "parsing WAVE format header");
|
||||||
return result;
|
return bytesRead;
|
||||||
}
|
}
|
||||||
bitsPerSample = reader.readUInt16LE();
|
bitsPerSample = reader.readUInt16LE();
|
||||||
reader.stream()->seekg(4, ios_base::cur); // skip channel mask
|
channelMask = reader.readUInt32LE();
|
||||||
const auto guid1 = reader.readUInt64BE();
|
guid1 = reader.readUInt64BE();
|
||||||
const auto guid2 = reader.readUInt64BE();
|
guid2 = reader.readUInt64BE();
|
||||||
result.second += 22;
|
return bytesRead += 22;
|
||||||
switch (guid2) {
|
|
||||||
case 0x000800000aa00389b71:
|
|
||||||
switch (guid1) {
|
|
||||||
case 0x0100000000001000ul:
|
|
||||||
result.first = MediaFormat(GeneralMediaFormat::Pcm, SubFormats::PcmIntLe);
|
|
||||||
break;
|
|
||||||
case 0x0300000000001000ul:
|
|
||||||
result.first = MediaFormat(GeneralMediaFormat::Pcm, SubFormats::PcmFloatIeee);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -115,6 +87,16 @@ MediaFormat WaveFormatHeader::format() const
|
||||||
case 0x0055u:
|
case 0x0055u:
|
||||||
return MediaFormat(GeneralMediaFormat::Mpeg1Audio, SubFormats::Mpeg1Layer3);
|
return MediaFormat(GeneralMediaFormat::Mpeg1Audio, SubFormats::Mpeg1Layer3);
|
||||||
default:
|
default:
|
||||||
|
switch (guid2) {
|
||||||
|
case 0x000800000aa00389b71:
|
||||||
|
switch (guid1) {
|
||||||
|
case 0x0100000000001000ul:
|
||||||
|
return MediaFormat(GeneralMediaFormat::Pcm, SubFormats::PcmIntLe);
|
||||||
|
case 0x0300000000001000ul:
|
||||||
|
return MediaFormat(GeneralMediaFormat::Pcm, SubFormats::PcmFloatIeee);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
return GeneralMediaFormat::Unknown;
|
return GeneralMediaFormat::Unknown;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -152,6 +134,7 @@ TrackType WaveAudioStream::type() const
|
||||||
*/
|
*/
|
||||||
void WaveAudioStream::addInfo(const WaveFormatHeader &waveHeader, AbstractTrack &track)
|
void WaveAudioStream::addInfo(const WaveFormatHeader &waveHeader, AbstractTrack &track)
|
||||||
{
|
{
|
||||||
|
track.m_format += waveHeader.format();
|
||||||
track.m_formatId = numberToString(waveHeader.formatTag);
|
track.m_formatId = numberToString(waveHeader.formatTag);
|
||||||
track.m_channelCount = waveHeader.channelCount;
|
track.m_channelCount = waveHeader.channelCount;
|
||||||
track.m_samplingFrequency = waveHeader.sampleRate;
|
track.m_samplingFrequency = waveHeader.sampleRate;
|
||||||
|
@ -180,8 +163,7 @@ void WaveAudioStream::internalParseHeader(Diagnostics &diag)
|
||||||
switch (segmentId) {
|
switch (segmentId) {
|
||||||
case 0x666D7420u: { // format segment
|
case 0x666D7420u: { // format segment
|
||||||
WaveFormatHeader waveHeader;
|
WaveFormatHeader waveHeader;
|
||||||
std::uint64_t bytesRead;
|
const auto bytesRead = waveHeader.parse(m_reader, restHeaderLen, diag);
|
||||||
tie(m_format, bytesRead) = waveHeader.parseExt(m_reader, restHeaderLen, diag);
|
|
||||||
addInfo(waveHeader, *this);
|
addInfo(waveHeader, *this);
|
||||||
restHeaderLen -= bytesRead;
|
restHeaderLen -= bytesRead;
|
||||||
} break;
|
} break;
|
||||||
|
|
|
@ -9,29 +9,34 @@ class TAG_PARSER_EXPORT WaveFormatHeader {
|
||||||
public:
|
public:
|
||||||
constexpr WaveFormatHeader();
|
constexpr WaveFormatHeader();
|
||||||
|
|
||||||
void parse(CppUtilities::BinaryReader &reader);
|
std::uint64_t parse(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
|
||||||
std::pair<MediaFormat, std::uint64_t> parseExt(CppUtilities::BinaryReader &reader, std::uint64_t maxSize, Diagnostics &diag);
|
|
||||||
MediaFormat format() const;
|
MediaFormat format() const;
|
||||||
constexpr std::uint32_t bitrate() const;
|
constexpr std::uint32_t bitrate() const;
|
||||||
|
|
||||||
|
std::uint64_t guid1;
|
||||||
|
std::uint64_t guid2;
|
||||||
std::uint16_t formatTag;
|
std::uint16_t formatTag;
|
||||||
std::uint16_t channelCount;
|
std::uint16_t channelCount;
|
||||||
std::uint16_t sampleRate;
|
std::uint32_t sampleRate;
|
||||||
std::uint16_t bytesPerSecond;
|
std::uint32_t bytesPerSecond;
|
||||||
std::uint16_t chunkSize;
|
std::uint16_t chunkSize;
|
||||||
std::uint16_t bitsPerSample;
|
std::uint16_t bitsPerSample;
|
||||||
|
std::uint32_t channelMask;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Constructs a new WaveFormatHeader.
|
* \brief Constructs a new WaveFormatHeader.
|
||||||
*/
|
*/
|
||||||
constexpr WaveFormatHeader::WaveFormatHeader()
|
constexpr WaveFormatHeader::WaveFormatHeader()
|
||||||
: formatTag(0)
|
: guid1(0)
|
||||||
|
, guid2(0)
|
||||||
|
, formatTag(0)
|
||||||
, channelCount(0)
|
, channelCount(0)
|
||||||
, sampleRate(0)
|
, sampleRate(0)
|
||||||
, bytesPerSecond(0)
|
, bytesPerSecond(0)
|
||||||
, chunkSize(0)
|
, chunkSize(0)
|
||||||
, bitsPerSample(0)
|
, bitsPerSample(0)
|
||||||
|
, channelMask(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue