Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Theora parser: use rationals for calculation of display dimensions

Browse Source
This commit is contained in:
Moritz Bunkus 2021-07-06 10:17:10 +02:00
parent b0748b33c0
commit b842bf6cdd
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/theora.cpp
View File

@ -13,9 +13,8 @@
#include "common/common_pch.h"
#include <cmath>
#include "common/bit_reader.h"
#include "common/math_fwd.h"
#include "common/theora.h"
namespace mtx::theora {
@ -65,12 +64,12 @@ parse_identification_header(unsigned char *buffer,
header.pf = bc.get_bits(2);
if ((0 != header.parn) && (0 != header.pard)) {
if ((static_cast<double>(header.fmbw) / header.fmbh) < (static_cast<double>(header.parn) / header.pard)) {
header.display_width = std::llround(static_cast<double>(header.fmbw) * header.parn / header.pard);
if (mtx::rational(header.fmbw, header.fmbh) < mtx::rational(header.parn, header.pard)) {
header.display_width = mtx::to_int_rounded(mtx::rational(header.fmbw * header.parn, header.pard));
header.display_height = header.fmbh;
} else {
header.display_width = header.fmbw;
header.display_height = std::llround(static_cast<double>(header.fmbh) * header.pard / header.parn);
header.display_height = mtx::to_int_rounded(mtx::rational(header.fmbh * header.pard, header.parn));
}
}
}