Skip to content

Commit f0e1003

Browse files
Fix compilation on Linux
1 parent b250800 commit f0e1003

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

YUViewLib/src/filesource/FileSource.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
#include <common/Formatting.h>
3636
#include <common/Typedef.h>
3737

38-
#include <format>
39-
4038
#include <QDateTime>
4139
#include <QDir>
4240
#include <QSettings>

YUViewLib/src/parser/ParserAnnexB.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ bool ParserAnnexB::runParsingOfFile(const std::filesystem::path &compressedFileP
287287
return this->parseAnnexBFile(file);
288288
}
289289

290-
vector<QTreeWidgetItem *> ParserAnnexB::StreamInfo::getStreamInfo()
290+
vector<QTreeWidgetItem *> ParserAnnexB::createTreeItemsFromStreamInfo() const
291291
{
292292
vector<QTreeWidgetItem *> infoList;
293-
infoList.push_back(
294-
new QTreeWidgetItem(QStringList() << "File size" << QString::number(file_size)));
295-
if (parsing)
293+
infoList.push_back(new QTreeWidgetItem(
294+
QStringList() << "File size" << QString::number(this->streamInfo.file_size)));
295+
if (this->streamInfo.parsing)
296296
{
297297
infoList.push_back(new QTreeWidgetItem(QStringList() << "Number NAL units"
298298
<< "Parsing..."));
@@ -301,10 +301,10 @@ vector<QTreeWidgetItem *> ParserAnnexB::StreamInfo::getStreamInfo()
301301
}
302302
else
303303
{
304-
infoList.push_back(new QTreeWidgetItem(QStringList() << "Number NAL units"
305-
<< QString::number(this->nrNalUnits)));
306-
infoList.push_back(
307-
new QTreeWidgetItem(QStringList() << "Number Frames" << QString::number(this->nrFrames)));
304+
infoList.push_back(new QTreeWidgetItem(
305+
QStringList() << "Number NAL units" << QString::number(this->streamInfo.nrNalUnits)));
306+
infoList.push_back(new QTreeWidgetItem(
307+
QStringList() << "Number Frames" << QString::number(this->streamInfo.nrFrames)));
308308
}
309309

310310
return infoList;

YUViewLib/src/parser/ParserAnnexB.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ParserAnnexB : public Parser
6767
// Clear all knowledge about the bitstream.
6868
void clearData();
6969

70-
vector<QTreeWidgetItem *> getStreamInfo() override { return this->streamInfo.getStreamInfo(); }
70+
vector<QTreeWidgetItem *> getStreamInfo() override { return createTreeItemsFromStreamInfo(); }
7171
unsigned int getNrStreams() override { return 1; }
7272
std::string getShortStreamDescription(const int streamIndex) const override;
7373

@@ -161,14 +161,13 @@ class ParserAnnexB : public Parser
161161
// Save general information about the file here
162162
struct StreamInfo
163163
{
164-
vector<QTreeWidgetItem *> getStreamInfo();
165-
166164
int64_t file_size{};
167165
unsigned nrNalUnits{0};
168166
unsigned nrFrames{0};
169167
bool parsing{false};
170168
};
171-
StreamInfo streamInfo{};
169+
StreamInfo streamInfo{};
170+
vector<QTreeWidgetItem *> createTreeItemsFromStreamInfo() const;
172171

173172
int getFramePOC(FrameIndexDisplayOrder frameIdx);
174173

0 commit comments

Comments
 (0)