On Tue, Jan 8, 2019 at 11:08 AM Pooja Venkatesan <[email protected]> wrote:
> > > On Tue, Jan 8, 2019 at 10:59 AM Pradeep Ramachandran < > [email protected]> wrote: > >> >> >> On Tue, Jan 8, 2019 at 9:34 AM <[email protected]> wrote: >> >>> # HG changeset patch >>> # User Pooja Venkatesan <[email protected]> >>> # Date 1546170546 -19800 >>> # Sun Dec 30 17:19:06 2018 +0530 >>> # Node ID 9c28a4122495d57b8ebd36ba37813b2cbfd60d28 >>> # Parent 8aebc58efe5cbd5bf04b32120184b082a940eb9b >>> aq: Disable hevc-aq based on checks >>> >>> diff -r 8aebc58efe5c -r 9c28a4122495 source/common/param.cpp >>> --- a/source/common/param.cpp Wed Jan 02 14:15:53 2019 +0530 >>> +++ b/source/common/param.cpp Sun Dec 30 17:19:06 2018 +0530 >>> @@ -353,6 +353,7 @@ >>> param->limitReferences = 0; >>> param->rc.aqStrength = 0.0; >>> param->rc.aqMode = X265_AQ_NONE; >>> + param->rc.hevcAq = 0; >>> param->rc.qgSize = 32; >>> param->bEnableFastIntra = 1; >>> } >>> @@ -370,6 +371,7 @@ >>> param->limitReferences = 0; >>> param->rc.aqStrength = 0.0; >>> param->rc.aqMode = X265_AQ_NONE; >>> + param->rc.hevcAq = 0; >>> param->rc.qgSize = 32; >>> param->bEnableSAO = 0; >>> param->bEnableFastIntra = 1; >>> diff -r 8aebc58efe5c -r 9c28a4122495 source/encoder/encoder.cpp >>> --- a/source/encoder/encoder.cpp Wed Jan 02 14:15:53 2019 +0530 >>> +++ b/source/encoder/encoder.cpp Sun Dec 30 17:19:06 2018 +0530 >>> @@ -2677,6 +2677,7 @@ >>> { >>> p->rc.qp = zone->rc.qp; >>> p->rc.aqMode = X265_AQ_NONE; >>> + p->rc.hevcAq = 0; >>> } >>> p->radl = zone->radl; >>> >>> @@ -2811,6 +2812,7 @@ >>> if (p->rc.rateControlMode == X265_RC_CQP) >>> { >>> p->rc.aqMode = X265_AQ_NONE; >>> + p->rc.hevcAq = 0; >>> p->rc.bitrate = 0; >>> p->rc.cuTree = 0; >>> p->rc.aqStrength = 0; >>> @@ -2835,14 +2837,16 @@ >>> } >>> >>> if (p->rc.aqStrength == 0 && p->rc.cuTree == 0) >>> + { >>> p->rc.aqMode = X265_AQ_NONE; >>> + p->rc.hevcAq = 0; >>> + } >>> >>> if (p->rc.aqMode == X265_AQ_NONE && p->rc.cuTree == 0) >>> p->rc.aqStrength = 0; >>> >>> if (p->rc.hevcAq && p->rc.aqMode) >>> { >>> - p->rc.aqMode = X265_AQ_NONE; >>> >> >> Isn't this disabling required? What happens when we enable hevc-aq + >> aq-mode now? >> > No. The hierarchy for AQ modes works as aq-mode 0, hevc-aq, aq-mode 1 and > then aq-mode 2. When we enable hevc-aq and aq-mode (2 by default) it works > taking hevc-aq only. We can just leave the warning and should not disable > aq-mode. > Ok, thanks for the clarification. We still need the warning message which you've kept, so we're set here. > > >> >>> x265_log(p, X265_LOG_WARNING, "hevc-aq enabled, disabling other >>> aq-modes\n"); >>> } >>> >>> _______________________________________________ >>> x265-devel mailing list >>> [email protected] >>> https://mailman.videolan.org/listinfo/x265-devel >>> >> _______________________________________________ >> x265-devel mailing list >> [email protected] >> https://mailman.videolan.org/listinfo/x265-devel >> > _______________________________________________ > x265-devel mailing list > [email protected] > https://mailman.videolan.org/listinfo/x265-devel >
_______________________________________________ x265-devel mailing list [email protected] https://mailman.videolan.org/listinfo/x265-devel
