From 7400534d203742e753ff802ee827405d89d17dfa Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 27 Jun 2017 00:37:56 +0200 Subject: [PATCH] Use frame instead of sample count for video tracks --- cli/mainfeatures.cpp | 5 ++++- gui/fileinfomodel.cpp | 4 +++- misc/htmlinfo.cpp | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cli/mainfeatures.cpp b/cli/mainfeatures.cpp index b6f91a3..802542b 100644 --- a/cli/mainfeatures.cpp +++ b/cli/mainfeatures.cpp @@ -188,7 +188,10 @@ void displayFileInfo(const ArgumentOccurrence &, const Argument &filesArg, const printProperty("Bits per sample", track->bitsPerSample()); printProperty("Sampling frequency", track->samplingFrequency(), "Hz"); printProperty("Extension sampling frequency", track->extensionSamplingFrequency(), "Hz"); - printProperty("Sample count", track->sampleCount()); + printProperty(track->mediaType() == MediaType::Video + ? "Frame count" + : "Sample count", + track->sampleCount()); printProperty("Creation time", track->creationTime()); printProperty("Modification time", track->modificationTime()); vector labels; diff --git a/gui/fileinfomodel.cpp b/gui/fileinfomodel.cpp index 1b4e993..d893d20 100644 --- a/gui/fileinfomodel.cpp +++ b/gui/fileinfomodel.cpp @@ -396,7 +396,9 @@ void FileInfoModel::updateCache() ? QString::number(track->extensionSamplingFrequency()) % QStringLiteral(" Hz / ") % QString::number(track->samplingFrequency()) % QStringLiteral(" Hz") : QString::number(track->samplingFrequency()) + QStringLiteral(" Hz")); } - trackHelper.appendRow(tr("Sample count"), track->sampleCount()); + trackHelper.appendRow(track->mediaType() == MediaType::Video + ? tr("Frame count") + : tr("Sample count"), track->sampleCount()); trackHelper.appendRow(tr("Bits per sample"), track->bitsPerSample()); trackHelper.appendRow(tr("Quality"), track->quality()); trackHelper.appendRow(tr("Pixel size"), track->pixelSize()); diff --git a/misc/htmlinfo.cpp b/misc/htmlinfo.cpp index 1341e97..84b0a5d 100644 --- a/misc/htmlinfo.cpp +++ b/misc/htmlinfo.cpp @@ -562,7 +562,10 @@ public: } } if(track->sampleCount()) { - rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Sample count"), QString::number(track->sampleCount())); + rowMaker.mkRow(track->mediaType() == MediaType::Video + ? QCoreApplication::translate("HtmlInfo", "Frame count") + : QCoreApplication::translate("HtmlInfo", "Sample count"), + QString::number(track->sampleCount())); } if(track->bitsPerSample()) { rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Bits per sample"), QString::number(track->bitsPerSample()));