Use frame instead of sample count for video tracks

This commit is contained in:
Martchus 2017-06-27 00:37:56 +02:00
parent f8668d38d9
commit 7400534d20
3 changed files with 11 additions and 3 deletions

View File

@ -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<string> labels;

View File

@ -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());

View File

@ -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()));