Skip to content

Commit

Permalink
Aligned naming scheme of parsers to ParserXXX
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChristianFeldmann
ChristianFeldmann committed Feb 6, 2023
1 parent a913fec commit b1690cd
Show file tree
Hide file tree
Showing 16 changed files with 177 additions and 166 deletions.
2 changes: 1 addition & 1 deletion YUViewLib/src/parser/AV1/AV1OBU.cpp → YUViewLib/src/parser/AV1/ParserAV1OBU.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "AV1OBU.h"
#include "ParserAV1OBU.h"

#include "OpenBitstreamUnit.h"
#include "frame_header_obu.h"
Expand Down
0 YUViewLib/src/parser/AV1/AV1OBU.h → YUViewLib/src/parser/AV1/ParserAV1OBU.h
View file
File renamed without changes.
56 changes: 29 additions & 27 deletions YUViewLib/src/parser/AVC/AnnexBAVC.cpp → YUViewLib/src/parser/AVC/ParserAnnexBAVC.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "AnnexBAVC.h"
#include "ParserAnnexBAVC.h"

#include <cmath>

Expand Down Expand Up @@ -92,7 +92,7 @@ getFrameDataWithUpdatedPosition(std::optional<FrameParsingData> data,

} // namespace

double AnnexBAVC::getFramerate() const
double ParserAnnexBAVC::getFramerate() const
{
// Find the first SPS and return the framerate (if signaled)
for (auto &nal : this->nalUnitsForSeeking)
Expand All @@ -109,7 +109,7 @@ double AnnexBAVC::getFramerate() const
return 0.0;
}

Size AnnexBAVC::getSequenceSizeSamples() const
Size ParserAnnexBAVC::getSequenceSizeSamples() const
{
// Find the first SPS and return the size
for (auto &nal : this->nalUnitsForSeeking)
Expand All @@ -136,7 +136,7 @@ Size AnnexBAVC::getSequenceSizeSamples() const
return {};
}

video::yuv::PixelFormatYUV AnnexBAVC::getPixelFormat() const
video::yuv::PixelFormatYUV ParserAnnexBAVC::getPixelFormat() const
{
using Subsampling = video::yuv::Subsampling;

Expand Down Expand Up @@ -178,11 +178,11 @@ video::yuv::PixelFormatYUV AnnexBAVC::getPixelFormat() const
}

ParserAnnexB::ParseResult
AnnexBAVC::parseAndAddNALUnit(int nalID,
const ByteVector & data,
std::optional<BitratePlotModel::BitrateEntry> bitrateEntry,
std::optional<pairUint64> nalStartEndPosFile,
std::shared_ptr<TreeItem> parent)
ParserAnnexBAVC::parseAndAddNALUnit(int nalID,
const ByteVector & data,
std::optional<BitratePlotModel::BitrateEntry> bitrateEntry,
std::optional<pairUint64> nalStartEndPosFile,
std::shared_ptr<TreeItem> parent)
{
ParserAnnexB::ParseResult parseResult;

Expand All @@ -201,13 +201,13 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
return parseResult;
}
if (this->curFrameData->fileStartEndPos)
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Adding start/end "
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Adding start/end "
<< this->curFrameData->fileStartEndPos->first << "/"
<< this->curFrameData->fileStartEndPos->second << " - POC "
<< *this->curFrameData->poc
<< (this->curFrameData->isRandomAccess ? " - ra" : ""));
else
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Adding start/end NA/NA - POC "
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Adding start/end NA/NA - POC "
<< *this->curFrameData->poc
<< (this->curFrameData->isRandomAccess ? " - ra" : ""));
}
Expand Down Expand Up @@ -263,7 +263,7 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
newSPS->seqParameterSetData.vuiParameters.nalHrdParameters.CpbSize[0]);
}

DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Parse SPS ID "
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Parse SPS ID "
<< newSPS->seqParameterSetData.seq_parameter_set_id);

nalAVC->rbsp = newSPS;
Expand All @@ -282,7 +282,8 @@ AnnexBAVC::parseAndAddNALUnit(int nalI

specificDescription += " ID " + std::to_string(newPPS->pic_parameter_set_id);

DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Parse PPS ID " << newPPS->pic_parameter_set_id);
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Parse PPS ID "
<< newPPS->pic_parameter_set_id);

nalAVC->rbsp = newPPS;
nalAVC->rawData = data;
Expand Down Expand Up @@ -363,7 +364,8 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
currentSliceIntra = isRandomAccess;
currentSliceType = to_string(newSliceHeader->slice_type);

DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Parsed Slice POC " << newSliceHeader->globalPOC);
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Parsed Slice POC "
<< newSliceHeader->globalPOC);
parseResult.nalTypeName = "Slice(POC " + std::to_string(newSliceHeader->globalPOC) + ") ";
}
else if (nalAVC->header.nal_unit_type == NalType::CODED_SLICE_DATA_PARTITION_B)
Expand Down Expand Up @@ -418,20 +420,20 @@ AnnexBAVC::parseAndAddNALUnit(int nalI

nalAVC->rbsp = newSEI;
specificDescription += "(x" + std::to_string(newSEI->seis.size()) + ")";
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Parsed SEI (" << newSEI->seis.size()
<< " messages)");
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Parsed SEI (" << newSEI->seis.size()
<< " messages)");
parseResult.nalTypeName = "SEI(x" + std::to_string(newSEI->seis.size()) + ") ";
}
else if (nalAVC->header.nal_unit_type == NalType::FILLER)
{
specificDescription = " Filler";
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Parsed Filler data");
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Parsed Filler data");
parseResult.nalTypeName = "Filler ";
}
else if (nalAVC->header.nal_unit_type == NalType::AUD)
{
specificDescription = " AUD";
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Parsed AUD");
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Parsed AUD");
parseResult.nalTypeName = "AUD ";
}

Expand All @@ -452,7 +454,7 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
catch (const std::exception &e)
{
(void)e;
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Error reparsing SEI");
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Error reparsing SEI");
}
}
}
Expand All @@ -461,7 +463,7 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
{
specificDescription += " ERROR " + std::string(e.what());
parseResult.success = false;
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit " << e.what());
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit " << e.what());
}

std::optional<int> curSlicePoc;
Expand All @@ -478,17 +480,17 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
" already in the POC list");
}
if (this->curFrameData->fileStartEndPos)
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Adding start/end "
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Adding start/end "
<< this->curFrameData->fileStartEndPos->first << "/"
<< this->curFrameData->fileStartEndPos->second << " - POC "
<< *this->curFrameData->poc << (this->curFrameData->isRandomAccess ? " - ra" : ""));
else
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Adding start/end NA/NA - POC "
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Adding start/end NA/NA - POC "
<< *this->curFrameData->poc << (this->curFrameData->isRandomAccess ? " - ra" : ""));

if (this->sizeCurrentAU > 0)
{
DEBUG_AVC("AnnexBAVC::parseAndAddNALUnit Start of new AU. Adding bitrate "
DEBUG_AVC("ParserAnnexBAVC::parseAndAddNALUnit Start of new AU. Adding bitrate "
<< this->sizeCurrentAU);

BitratePlotModel::BitrateEntry entry;
Expand Down Expand Up @@ -573,7 +575,7 @@ AnnexBAVC::parseAndAddNALUnit(int nalI
return parseResult;
}

std::optional<ParserAnnexB::SeekData> AnnexBAVC::getSeekData(int iFrameNr)
std::optional<ParserAnnexB::SeekData> ParserAnnexBAVC::getSeekData(int iFrameNr)
{
if (iFrameNr >= int(this->getNumberPOCs()) || iFrameNr < 0)
return {};
Expand Down Expand Up @@ -638,7 +640,7 @@ std::optional<ParserAnnexB::SeekData> AnnexBAVC::getSeekData(int iFrameNr)
return {};
}

QByteArray AnnexBAVC::getExtradata()
QByteArray ParserAnnexBAVC::getExtradata()
{
// Convert the SPS and PPS that we found in the bitstream to the libavformat avcc format (see
// avc.c)
Expand Down Expand Up @@ -713,7 +715,7 @@ QByteArray AnnexBAVC::getExtradata()
return reader::SubByteReaderLogging::convertToQByteArray(e);
}

IntPair AnnexBAVC::getProfileLevel()
IntPair ParserAnnexBAVC::getProfileLevel()
{
for (auto nal : this->nalUnitsForSeeking)
{
Expand All @@ -726,7 +728,7 @@ IntPair AnnexBAVC::getProfileLevel()
return {};
}

Ratio AnnexBAVC::getSampleAspectRatio()
Ratio ParserAnnexBAVC::getSampleAspectRatio()
{
for (auto nal : this->nalUnitsForSeeking)
{
Expand Down
6 changes: 3 additions & 3 deletions YUViewLib/src/parser/AVC/AnnexBAVC.h → YUViewLib/src/parser/AVC/ParserAnnexBAVC.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ struct FrameParsingData
} // namespace avc

// This class knows how to parse the bitrstream of HEVC annexB files
class AnnexBAVC : public ParserAnnexB
class ParserAnnexBAVC : public ParserAnnexB
{
Q_OBJECT

public:
AnnexBAVC(QObject *parent = nullptr) : ParserAnnexB(parent){};
~AnnexBAVC() = default;
ParserAnnexBAVC(QObject *parent = nullptr) : ParserAnnexB(parent){};
~ParserAnnexBAVC() = default;

// Get properties
double getFramerate() const override;
Expand Down
6 changes: 3 additions & 3 deletions YUViewLib/src/parser/AVFormat/HVCC.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using namespace reader;

void HVCCNalUnit::parse(unsigned unitID,
SubByteReaderLogging &reader,
AnnexBHEVC * hevcParser,
ParserAnnexBHEVC * hevcParser,
BitratePlotModel * bitrateModel)
{
SubByteReaderLoggingSubLevel subLevel(reader, "nal unit " + std::to_string(unitID));
Expand All @@ -58,7 +58,7 @@ void HVCCNalUnit::parse(unsigned unitID,

void HVCCNalArray::parse(unsigned arrayID,
SubByteReaderLogging &reader,
AnnexBHEVC * hevcParser,
ParserAnnexBHEVC * hevcParser,
BitratePlotModel * bitrateModel)
{
SubByteReaderLoggingSubLevel subLevel(reader, "nal unit array " + std::to_string(arrayID));
Expand All @@ -79,7 +79,7 @@ void HVCCNalArray::parse(unsigned arrayID,

void HVCC::parse(ByteVector & data,
std::shared_ptr<TreeItem> root,
AnnexBHEVC * hevcParser,
ParserAnnexBHEVC * hevcParser,
BitratePlotModel * bitrateModel)
{
SubByteReaderLogging reader(data, root, "Extradata (HEVC hvcC format)");
Expand Down
8 changes: 4 additions & 4 deletions YUViewLib/src/parser/AVFormat/HVCC.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#pragma once

#include <common/Typedef.h>
#include <parser/HEVC/AnnexBHEVC.h>
#include <parser/HEVC/ParserAnnexBHEVC.h>
#include <parser/common/BitratePlotModel.h>
#include <parser/common/SubByteReaderLogging.h>
#include <parser/common/TreeItem.h>
Expand All @@ -48,7 +48,7 @@ class HVCCNalUnit

void parse(unsigned unitID,
reader::SubByteReaderLogging &reader,
AnnexBHEVC * hevcParser,
ParserAnnexBHEVC * hevcParser,
BitratePlotModel * bitrateModel);

unsigned nalUnitLength{};
Expand All @@ -61,7 +61,7 @@ class HVCCNalArray

void parse(unsigned arrayID,
reader::SubByteReaderLogging &reader,
AnnexBHEVC * hevcParser,
ParserAnnexBHEVC * hevcParser,
BitratePlotModel * bitrateModel);

bool array_completeness{};
Expand All @@ -77,7 +77,7 @@ class HVCC

void parse(ByteVector & data,
std::shared_ptr<TreeItem> root,
AnnexBHEVC * hevcParser,
ParserAnnexBHEVC * hevcParser,
BitratePlotModel * bitrateModel);

unsigned configurationVersion{};
Expand Down
Loading

0 comments on commit b1690cd

Please sign in to comment.