Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLAT-7003-FIX-WM-for-true-portrait-sources #5489

Merged
merged 1 commit into from Apr 27, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion infra/cdl/kdl/KDLFlavor.php
Expand Up @@ -1326,8 +1326,12 @@ private static function evaluateTargetWaterMark(KDLVideoData $sourceVid, KDLVide
* On 'fixed/forced-frame-size' mode (flavorVid::_width/flavorVid::_height != 0),
* use the calculated 'forced-dar', rather than source::dar.
*/
if(isset($flavorVid->_width) && $flavorVid->_width>0 && isset($flavorVid->_height) && $flavorVid->_height>0)
if(isset($flavorVid->_width) && $flavorVid->_width>0 && isset($flavorVid->_height) && $flavorVid->_height>0){
$dar = $flavorVid->_width/$flavorVid->_height;
// Handles 'truely' rotated/portrait sources - wid<hgt
if($sourceVid->_width<$sourceVid->_height)
$dar = 1/$dar;
}
else if(isset($sourceVid->_dar))
$dar = $sourceVid->_dar;
else $dar = null;
Expand Down