# HG changeset patch # User Mahesh Pittala <mah...@multicorewareinc.com> # Date 1461582611 -19800 # Mon Apr 25 16:40:11 2016 +0530 # Node ID f90f359eb770652e822e3a813c0b9eaf47036122 # Parent 91de20bfe2affa6e225681be129208e654c2ba48 uhdbd: fix sourceHeight check
when sourceHeight is 1080, it is padded by some value to become multiple of the minimum CU size(for ex- 1088) so just moved down those calculations after uhd-bd. diff -r 91de20bfe2af -r f90f359eb770 source/encoder/encoder.cpp --- a/source/encoder/encoder.cpp Fri Jun 03 12:02:05 2016 +0530 +++ b/source/encoder/encoder.cpp Mon Apr 25 16:40:11 2016 +0530 @@ -1845,16 +1845,6 @@ m_conformanceWindow.rightOffset = padsize; } - /* set pad size if height is not multiple of the minimum CU size */ - if (p->sourceHeight & (p->minCUSize - 1)) - { - uint32_t rem = p->sourceHeight & (p->minCUSize - 1); - uint32_t padsize = p->minCUSize - rem; - p->sourceHeight += padsize; - - m_conformanceWindow.bEnabled = true; - m_conformanceWindow.bottomOffset = padsize; - } if (p->bEnableRdRefine && (p->rdLevel < 5 || !p->rc.aqMode)) { p->bEnableRdRefine = false; @@ -1974,6 +1964,15 @@ } } + /* set pad size if height is not multiple of the minimum CU size */ + if (p->sourceHeight & (p->minCUSize - 1)) + { + uint32_t rem = p->sourceHeight & (p->minCUSize - 1); + uint32_t padsize = p->minCUSize - rem; + p->sourceHeight += padsize; + m_conformanceWindow.bEnabled = true; + m_conformanceWindow.bottomOffset = padsize; + } if (p->bLogCuStats) x265_log(p, X265_LOG_WARNING, "--cu-stats option is now deprecated\n"); -- Deepthi Nandakumar Engineering Manager, x265 Multicoreware, Inc
_______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel