Re: [x265] [PATCH 1 of 2] hdr-opt: Replace --hdr-opt with --hdr10-opt
On Tue, Jan 7, 2020 at 1:14 PM Aruna Matheswaran
wrote:
>
> # HG changeset patch
> # User Aruna Matheswaran
> # Date 1578287653 -19800
> # Mon Jan 06 10:44:13 2020 +0530
> # Node ID 542653f9c733c0b41d33e204497bed1126455d17
> # Parent b82891180e7e9e13545791f739837d977d472d43
> hdr-opt: Replace --hdr-opt with --hdr10-opt
>
> This patch deprecates the existing option '--hdr-opt' as the name sounds
> generic
> even though the feature does QP optimizations only for HDR10 content and
> introduces '--hdr10-opt' as an alternate.
>
> This patch also fixes nits in a warning message.
>
> Note: '--hdr-opt' will be removed in the upcoming major release of x265.
>
> diff -r b82891180e7e -r 542653f9c733 doc/reST/cli.rst
> --- a/doc/reST/cli.rst Mon Jan 06 23:08:36 2020 +0530
> +++ b/doc/reST/cli.rst Mon Jan 06 10:44:13 2020 +0530
> @@ -2259,11 +2259,13 @@
> specified. Useful when there is a desire to signal 0 values for
> max-cll
> and max-fall. Default disabled.
>
> -.. option:: --hdr-opt, --no-hdr-opt
> -
> - Add luma and chroma offsets for HDR/WCG content.
> - Input video should be 10 bit 4:2:0. Applicable for HDR content. It is
> recommended
> - that AQ-mode be enabled along with this feature. Default disabled.
> +.. option:: --hdr10-opt, --no-hdr10-opt
> +
> + Enable block-level luma and chroma QP optimization for HDR10 content
> + as suggested in ITU-T H-series Recommendations – Supplement 15.
> + Source video should have HDR10 characteristics such as 10-bit depth
> 4:2:0
> + with Bt.2020 color primaries and SMPTE ST.2084 transfer
> characteristics.
> + It is recommended that AQ-mode be enabled along with this feature.
> Default disabled.
>
> .. option:: --dhdr10-info
>
> diff -r b82891180e7e -r 542653f9c733 source/CMakeLists.txt
> --- a/source/CMakeLists.txt Mon Jan 06 23:08:36 2020 +0530
> +++ b/source/CMakeLists.txt Mon Jan 06 10:44:13 2020 +0530
> @@ -29,7 +29,7 @@
> option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
> mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
> # X265_BUILD must be incremented each time the public API is changed
> -set(X265_BUILD 186)
> +set(X265_BUILD 187)
> configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
> "${PROJECT_BINARY_DIR}/x265.def")
> configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
> diff -r b82891180e7e -r 542653f9c733 source/common/param.cpp
> --- a/source/common/param.cpp Mon Jan 06 23:08:36 2020 +0530
> +++ b/source/common/param.cpp Mon Jan 06 10:44:13 2020 +0530
> @@ -322,7 +322,8 @@
> param->bOptRefListLengthPPS = 0;
> param->bOptCUDeltaQP= 0;
> param->bAQMotion = 0;
> -param->bHDROpt = 0;
> +param->bHDROpt = 0; /*DEPRECATED*/
> +param->bHDR10Opt = 0;
> param->analysisReuseLevel = 0; /*DEPRECATED*/
> param->analysisSaveReuseLevel = 0;
> param->analysisLoadReuseLevel = 0;
> @@ -1244,7 +1245,8 @@
> }
> }
> OPT("hdr") p->bEmitHDRSEI = atobool(value);
> -OPT("hdr-opt") p->bHDROpt = atobool(value);
> +OPT("hdr-opt") p->bHDR10Opt = atobool(value); /*DEPRECATED*/
> +OPT("hdr10-opt") p->bHDR10Opt = atobool(value);
> OPT("limit-sao") p->bLimitSAO = atobool(value);
> OPT("dhdr10-info") p->toneMapFile = strdup(value);
> OPT("dhdr10-opt") p->bDhdr10opt = atobool(value);
> @@ -2169,7 +2171,7 @@
> BOOL(p->bOptCUDeltaQP, "opt-cu-delta-qp");
> BOOL(p->bAQMotion, "aq-motion");
> BOOL(p->bEmitHDRSEI, "hdr");
> -BOOL(p->bHDROpt, "hdr-opt");
> +BOOL(p->bHDR10Opt, "hdr10-opt");
> BOOL(p->bDhdr10opt, "dhdr10-opt");
> BOOL(p->bEmitIDRRecoverySEI, "idr-recovery-sei");
> if (p->analysisSave)
> @@ -2495,7 +2497,8 @@
> dst->dynamicRd = src->dynamicRd;
> dst->bEmitHDRSEI = src->bEmitHDRSEI;
> dst->bEmitHRDSEI = src->bEmitHRDSEI;
> -dst->bHDROpt = src->bHDROpt;
> +dst->bHDROpt = src->bHDROpt; /*DEPRECATED*/
> +dst->bHDR10Opt = src->bHDR10Opt;
> dst->analysisReuseLevel = src->analysisReuseLevel;
> dst->analysisSaveReuseLevel = src->analysisSaveReuseLevel;
> dst->analysisLoadReuseLevel = src->analysisLoadReuseLevel;
> diff -r b82891180e7e -r 542653f9c733 source/encoder/encoder.cpp
> --- a/source/encoder/encoder.cppMon Jan 06 23:08:36 2020 +0530
> +++ b/source/encoder/encoder.cppMon Jan 06 10:44:13 2020 +0530
> @@ -3281,7 +3281,7 @@
>
> pps->chromaQpOffset[0] = m_param->cbQpOffset;
> pps->chromaQpOffset[1] = m_param->crQpOffset;
> -pps->pps_slice_chroma_qp_offsets_present_flag = m_param->bHDROpt;
> +pps->pps_slice_chroma_qp_offsets_present_flag = m_param->bHDR10Opt;
>
> pps->bConstrainedIntraPred = m_param->bEnableConstrainedIntra;
> pps->bUseWeightPred = m_param->bEnableWeightedPred;
> @@ -3747,7 +3747,7 @@
>
> if (!p->rc.bStatWrite && !p->rc.bStatRead && (p->analysisMultiPassRefine
>
Re: [x265] [PATCH] doc: Fix incorrect parameter settings in preset.rst
Pushed to default. On Wed, Jan 8, 2020 at 5:40 PM Aruna Matheswaran wrote: > # HG changeset patch > # User Aruna Matheswaran > # Date 1578420649 -19800 > # Tue Jan 07 23:40:49 2020 +0530 > # Node ID c5ff72937e9cd7fbecdbf6b54de26841f6926494 > # Parent 3780f75447944285395c4b86686072e89954cbc0 > doc: Fix incorrect parameter settings in preset.rst > > diff -r 3780f7544794 -r c5ff72937e9c doc/reST/presets.rst > --- a/doc/reST/presets.rst Tue Jan 07 15:07:31 2020 +0530 > +++ b/doc/reST/presets.rst Tue Jan 07 23:40:49 2020 +0530 > @@ -67,9 +67,9 @@ > > > +-+-+-+-+-+-+-+--+--+--+--+ > | max-merge | 2 | 2 | 2 | 2 | 2 | 2 | 3 | 4 | > 5 | 5 | > > > +-+-+-+-+-+-+-+--+--+--+--+ > -| early-skip | 1 | 1 | 1 | 1 | 0 | 0 | 0 | 0 | > 0 | 0 | > +| early-skip | 1 | 1 | 1 | 1 | 0 | 1 | 0 | 0 | > 0 | 0 | > > > +-+-+-+-+-+-+-+--+--+--+--+ > -| recursion-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | > 0 | 0 | > +| recursion-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | > 1 | 0 | > > > +-+-+-+-+-+-+-+--+--+--+--+ > | fast-intra | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 0 | > 0 | 0 | > > > +-+-+-+-+-+-+-+--+--+--+--+ > -- Regards, *Aruna Matheswaran,* Video Codec Engineer, Media & AI analytics BU, ___ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel
[x265] [PATCH] doc: Fix incorrect parameter settings in preset.rst
# HG changeset patch # User Aruna Matheswaran # Date 1578420649 -19800 # Tue Jan 07 23:40:49 2020 +0530 # Node ID c5ff72937e9cd7fbecdbf6b54de26841f6926494 # Parent 3780f75447944285395c4b86686072e89954cbc0 doc: Fix incorrect parameter settings in preset.rst diff -r 3780f7544794 -r c5ff72937e9c doc/reST/presets.rst --- a/doc/reST/presets.rst Tue Jan 07 15:07:31 2020 +0530 +++ b/doc/reST/presets.rst Tue Jan 07 23:40:49 2020 +0530 @@ -67,9 +67,9 @@ +-+-+-+-+-+-+-+--+--+--+--+ | max-merge | 2 | 2 | 2 | 2 | 2 | 2 | 3 | 4 | 5 | 5 | +-+-+-+-+-+-+-+--+--+--+--+ -| early-skip | 1 | 1 | 1 | 1 | 0 | 0 | 0 | 0 | 0 | 0 | +| early-skip | 1 | 1 | 1 | 1 | 0 | 1 | 0 | 0 | 0 | 0 | +-+-+-+-+-+-+-+--+--+--+--+ -| recursion-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 0 | +| recursion-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | +-+-+-+-+-+-+-+--+--+--+--+ | fast-intra | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 0 | 0 | 0 | +-+-+-+-+-+-+-+--+--+--+--+ # HG changeset patch # User Aruna Matheswaran # Date 1578420649 -19800 # Tue Jan 07 23:40:49 2020 +0530 # Node ID c5ff72937e9cd7fbecdbf6b54de26841f6926494 # Parent 3780f75447944285395c4b86686072e89954cbc0 doc: Fix incorrect parameter settings in preset.rst diff -r 3780f7544794 -r c5ff72937e9c doc/reST/presets.rst --- a/doc/reST/presets.rst Tue Jan 07 15:07:31 2020 +0530 +++ b/doc/reST/presets.rst Tue Jan 07 23:40:49 2020 +0530 @@ -67,9 +67,9 @@ +-+-+-+-+-+-+-+--+--+--+--+ | max-merge | 2 | 2 | 2 | 2 | 2 | 2 | 3 | 4 | 5 | 5 | +-+-+-+-+-+-+-+--+--+--+--+ -| early-skip | 1 | 1 | 1 | 1 | 0 | 0 | 0 | 0 | 0 | 0 | +| early-skip | 1 | 1 | 1 | 1 | 0 | 1 | 0 | 0 | 0 | 0 | +-+-+-+-+-+-+-+--+--+--+--+ -| recursion-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 0 | +| recursion-skip | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | +-+-+-+-+-+-+-+--+--+--+--+ | fast-intra | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 0 | 0 | 0 | +-+-+-+-+-+-+-+--+--+--+--+ ___ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH 2 of 2] hdr: Replace --hdr with --hdr10
Pushed to default.
On Tue, Jan 7, 2020 at 5:44 PM Aruna Matheswaran
wrote:
> # HG changeset patch
> # User Aruna Matheswaran
> # Date 1578389851 -19800
> # Tue Jan 07 15:07:31 2020 +0530
> # Node ID 2d8cff8781baa983a56aa5bc72219241122fffc7
> # Parent 542653f9c733c0b41d33e204497bed1126455d17
> hdr: Replace --hdr with --hdr10
>
> This patch deprecates the existing option '--hdr' and replaces it with
> '--hdr10'
> as the feature signals SEI specific to HDR10.
>
> Note: '--hdr' will be removed in the upcoming major release of x265.
>
> diff -r 542653f9c733 -r 2d8cff8781ba doc/reST/cli.rst
> --- a/doc/reST/cli.rst Mon Jan 06 10:44:13 2020 +0530
> +++ b/doc/reST/cli.rst Tue Jan 07 15:07:31 2020 +0530
> @@ -2252,9 +2252,9 @@
> is specified. When enabled, signals max-cll and max-fall as 0 if
> :option:`max-cll` is unspecified.
> Default enabled.
>
> -.. option:: --hdr, --no-hdr
> -
> - Force signalling of HDR parameters in SEI packets. Enabled
> +.. option:: --hdr10, --no-hdr10
> +
> + Force signaling of HDR10 parameters in SEI packets. Enabled
> automatically when :option:`--master-display` or
> :option:`--max-cll` is
> specified. Useful when there is a desire to signal 0 values for
> max-cll
> and max-fall. Default disabled.
> diff -r 542653f9c733 -r 2d8cff8781ba source/CMakeLists.txt
> --- a/source/CMakeLists.txt Mon Jan 06 10:44:13 2020 +0530
> +++ b/source/CMakeLists.txt Tue Jan 07 15:07:31 2020 +0530
> @@ -29,7 +29,7 @@
> option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
> mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
> # X265_BUILD must be incremented each time the public API is changed
> -set(X265_BUILD 187)
> +set(X265_BUILD 188)
> configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
> "${PROJECT_BINARY_DIR}/x265.def")
> configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
> diff -r 542653f9c733 -r 2d8cff8781ba source/common/param.cpp
> --- a/source/common/param.cpp Mon Jan 06 10:44:13 2020 +0530
> +++ b/source/common/param.cpp Tue Jan 07 15:07:31 2020 +0530
> @@ -147,7 +147,8 @@
> param->bEnableAccessUnitDelimiters = 0;
> param->bEmitHRDSEI = 0;
> param->bEmitInfoSEI = 1;
> -param->bEmitHDRSEI = 0;
> +param->bEmitHDRSEI = 0; /*Deprecated*/
> +param->bEmitHDR10SEI = 0;
> param->bEmitIDRRecoverySEI = 0;
>
> /* CU definitions */
> @@ -1244,7 +1245,8 @@
> p->bSsimRd = atobool(value);
> }
> }
> -OPT("hdr") p->bEmitHDRSEI = atobool(value);
> +OPT("hdr") p->bEmitHDR10SEI = atobool(value); /*DEPRECATED*/
> +OPT("hdr10") p->bEmitHDR10SEI = atobool(value);
> OPT("hdr-opt") p->bHDR10Opt = atobool(value); /*DEPRECATED*/
> OPT("hdr10-opt") p->bHDR10Opt = atobool(value);
> OPT("limit-sao") p->bLimitSAO = atobool(value);
> @@ -1768,12 +1770,12 @@
> #endif
>
> if (param->masteringDisplayColorVolume || param->maxFALL ||
> param->maxCLL)
> -param->bEmitHDRSEI = 1;
> +param->bEmitHDR10SEI = 1;
>
> bool isSingleSEI = (param->bRepeatHeaders
> || param->bEmitHRDSEI
> || param->bEmitInfoSEI
> - || param->bEmitHDRSEI
> + || param->bEmitHDR10SEI
> || param->bEmitIDRRecoverySEI
> || !!param->interlaceMode
> || param->preferredTransferCharacteristics > 1
> @@ -2170,7 +2172,7 @@
> s += sprintf(s, " hist-threshold=%.2f", p->edgeTransitionThreshold);
> BOOL(p->bOptCUDeltaQP, "opt-cu-delta-qp");
> BOOL(p->bAQMotion, "aq-motion");
> -BOOL(p->bEmitHDRSEI, "hdr");
> +BOOL(p->bEmitHDR10SEI, "hdr10");
> BOOL(p->bHDR10Opt, "hdr10-opt");
> BOOL(p->bDhdr10opt, "dhdr10-opt");
> BOOL(p->bEmitIDRRecoverySEI, "idr-recovery-sei");
> @@ -2495,7 +2497,7 @@
> dst->bAQMotion = src->bAQMotion;
> dst->bSsimRd = src->bSsimRd;
> dst->dynamicRd = src->dynamicRd;
> -dst->bEmitHDRSEI = src->bEmitHDRSEI;
> +dst->bEmitHDR10SEI = src->bEmitHDR10SEI;
> dst->bEmitHRDSEI = src->bEmitHRDSEI;
> dst->bHDROpt = src->bHDROpt; /*DEPRECATED*/
> dst->bHDR10Opt = src->bHDR10Opt;
> diff -r 542653f9c733 -r 2d8cff8781ba source/encoder/encoder.cpp
> --- a/source/encoder/encoder.cppMon Jan 06 10:44:13 2020 +0530
> +++ b/source/encoder/encoder.cppTue Jan 07 15:07:31 2020 +0530
> @@ -3113,7 +3113,7 @@
> if (m_param->bSingleSeiNal)
> bs.resetBits();
>
> -if (m_param->bEmitHDRSEI)
> +if (m_param->bEmitHDR10SEI)
> {
> if (m_param->bEmitCLL)
> {
> @@ -3370,7 +3370,7 @@
> p->vui.matrixCoeffs = dovi[doviProfile].matrixCoeffs;
>
> if (dovi[doviProfile].doviProfileId == 81)
> -p->bEmitHDRSEI = p->bEmitCLL = 1;
> +p->bEmitHDR10SEI = p->bEmitCLL = 1;
>
> if (dovi[doviProfile].doviProfileId == 50)
Re: [x265] [PATCH 1 of 2] hdr-opt: Replace --hdr-opt with --hdr10-opt
Pushed to default.
On Tue, Jan 7, 2020 at 5:44 PM Aruna Matheswaran
wrote:
> # HG changeset patch
> # User Aruna Matheswaran
> # Date 1578287653 -19800
> # Mon Jan 06 10:44:13 2020 +0530
> # Node ID 542653f9c733c0b41d33e204497bed1126455d17
> # Parent b82891180e7e9e13545791f739837d977d472d43
> hdr-opt: Replace --hdr-opt with --hdr10-opt
>
> This patch deprecates the existing option '--hdr-opt' as the name sounds
> generic
> even though the feature does QP optimizations only for HDR10 content and
> introduces '--hdr10-opt' as an alternate.
>
> This patch also fixes nits in a warning message.
>
> Note: '--hdr-opt' will be removed in the upcoming major release of x265.
>
> diff -r b82891180e7e -r 542653f9c733 doc/reST/cli.rst
> --- a/doc/reST/cli.rst Mon Jan 06 23:08:36 2020 +0530
> +++ b/doc/reST/cli.rst Mon Jan 06 10:44:13 2020 +0530
> @@ -2259,11 +2259,13 @@
> specified. Useful when there is a desire to signal 0 values for
> max-cll
> and max-fall. Default disabled.
>
> -.. option:: --hdr-opt, --no-hdr-opt
> -
> - Add luma and chroma offsets for HDR/WCG content.
> - Input video should be 10 bit 4:2:0. Applicable for HDR content. It
> is recommended
> - that AQ-mode be enabled along with this feature. Default disabled.
> +.. option:: --hdr10-opt, --no-hdr10-opt
> +
> + Enable block-level luma and chroma QP optimization for HDR10
> content
> + as suggested in ITU-T H-series Recommendations – Supplement 15.
> + Source video should have HDR10 characteristics such as 10-bit
> depth 4:2:0
> + with Bt.2020 color primaries and SMPTE ST.2084 transfer
> characteristics.
> + It is recommended that AQ-mode be enabled along with this feature.
> Default disabled.
>
> .. option:: --dhdr10-info
>
> diff -r b82891180e7e -r 542653f9c733 source/CMakeLists.txt
> --- a/source/CMakeLists.txt Mon Jan 06 23:08:36 2020 +0530
> +++ b/source/CMakeLists.txt Mon Jan 06 10:44:13 2020 +0530
> @@ -29,7 +29,7 @@
> option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
> mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
> # X265_BUILD must be incremented each time the public API is changed
> -set(X265_BUILD 186)
> +set(X265_BUILD 187)
> configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
> "${PROJECT_BINARY_DIR}/x265.def")
> configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
> diff -r b82891180e7e -r 542653f9c733 source/common/param.cpp
> --- a/source/common/param.cpp Mon Jan 06 23:08:36 2020 +0530
> +++ b/source/common/param.cpp Mon Jan 06 10:44:13 2020 +0530
> @@ -322,7 +322,8 @@
> param->bOptRefListLengthPPS = 0;
> param->bOptCUDeltaQP= 0;
> param->bAQMotion = 0;
> -param->bHDROpt = 0;
> +param->bHDROpt = 0; /*DEPRECATED*/
> +param->bHDR10Opt = 0;
> param->analysisReuseLevel = 0; /*DEPRECATED*/
> param->analysisSaveReuseLevel = 0;
> param->analysisLoadReuseLevel = 0;
> @@ -1244,7 +1245,8 @@
> }
> }
> OPT("hdr") p->bEmitHDRSEI = atobool(value);
> -OPT("hdr-opt") p->bHDROpt = atobool(value);
> +OPT("hdr-opt") p->bHDR10Opt = atobool(value); /*DEPRECATED*/
> +OPT("hdr10-opt") p->bHDR10Opt = atobool(value);
> OPT("limit-sao") p->bLimitSAO = atobool(value);
> OPT("dhdr10-info") p->toneMapFile = strdup(value);
> OPT("dhdr10-opt") p->bDhdr10opt = atobool(value);
> @@ -2169,7 +2171,7 @@
> BOOL(p->bOptCUDeltaQP, "opt-cu-delta-qp");
> BOOL(p->bAQMotion, "aq-motion");
> BOOL(p->bEmitHDRSEI, "hdr");
> -BOOL(p->bHDROpt, "hdr-opt");
> +BOOL(p->bHDR10Opt, "hdr10-opt");
> BOOL(p->bDhdr10opt, "dhdr10-opt");
> BOOL(p->bEmitIDRRecoverySEI, "idr-recovery-sei");
> if (p->analysisSave)
> @@ -2495,7 +2497,8 @@
> dst->dynamicRd = src->dynamicRd;
> dst->bEmitHDRSEI = src->bEmitHDRSEI;
> dst->bEmitHRDSEI = src->bEmitHRDSEI;
> -dst->bHDROpt = src->bHDROpt;
> +dst->bHDROpt = src->bHDROpt; /*DEPRECATED*/
> +dst->bHDR10Opt = src->bHDR10Opt;
> dst->analysisReuseLevel = src->analysisReuseLevel;
> dst->analysisSaveReuseLevel = src->analysisSaveReuseLevel;
> dst->analysisLoadReuseLevel = src->analysisLoadReuseLevel;
> diff -r b82891180e7e -r 542653f9c733 source/encoder/encoder.cpp
> --- a/source/encoder/encoder.cppMon Jan 06 23:08:36 2020 +0530
> +++ b/source/encoder/encoder.cppMon Jan 06 10:44:13 2020 +0530
> @@ -3281,7 +3281,7 @@
>
> pps->chromaQpOffset[0] = m_param->cbQpOffset;
> pps->chromaQpOffset[1] = m_param->crQpOffset;
> -pps->pps_slice_chroma_qp_offsets_present_flag = m_param->bHDROpt;
> +pps->pps_slice_chroma_qp_offsets_present_flag = m_param->bHDR10Opt;
>
> pps->bConstrainedIntraPred = m_param->bEnableConstrainedIntra;
> pps->bUseWeightPred = m_param->bEnableWeightedPred;
> @@ -3747,7 +3747,7 @@
>
> if (!p->rc.bStatWrite && !p->rc.bStatRead &&
> (p->analysisM
Re: [x265] [PATCH] Fix segmentation fault with svt enabled build and modify library install path
Pushed into Release_3.1, Release_3.2 and default.
On Tue, Jan 7, 2020 at 7:14 PM Snehaa Giridharan <
sne...@multicorewareinc.com> wrote:
> # HG changeset patch
> # User Snehaa Giridharan
> # Date 1578404459 -19800
> # Tue Jan 07 19:10:59 2020 +0530
> # Node ID ba3a32397472b2240e45cb3b6e7824a25ce4
> # Parent 2b8ee235997fabcad221069ecf8a80d0d50c9133
> Fix segmentation fault with svt enabled build and modify library install
> path
>
> This commit
> 1. Fixes segmentation fault on running x265 encodes via svt integrated
> build.
> 2. Modifies library install path of SVT from bin to library folder.
>
> diff -r 2b8ee235997f -r ba3a32397111 source/CMakeLists.txt
> --- a/source/CMakeLists.txt Wed Dec 11 16:11:24 2019 +0530
> +++ b/source/CMakeLists.txt Tue Jan 07 19:10:59 2020 +0530
> @@ -573,7 +573,7 @@
> if(SVTHEVC_FOUND)
> install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbApi.h" DESTINATION include)
> install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbErrorCodes.h" DESTINATION
> include)
> -install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${BIN_INSTALL_DIR})
> +install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${LIB_INSTALL_DIR})
> endif()
>
> install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION
> include)
> diff -r 2b8ee235997f -r ba3a32397111 source/encoder/api.cpp
> --- a/source/encoder/api.cpp Wed Dec 11 16:11:24 2019 +0530
> +++ b/source/encoder/api.cpp Tue Jan 07 19:10:59 2020 +0530
> @@ -415,12 +415,12 @@
>
> #ifdef SVT_HEVC
> EB_ERRORTYPE return_error;
> -static unsigned char picSendDone = 0;
> -numEncoded = 0;
> -static int codedNal = 0, eofReached = 0;
> - EB_H265_ENC_CONFIGURATION* svtParam =
> (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
> if (encoder->m_param->bEnableSvtHevc)
> {
> +static unsigned char picSendDone = 0;
> +numEncoded = 0;
> +static int codedNal = 0, eofReached = 0;
> +EB_H265_ENC_CONFIGURATION* svtParam =
> (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
> if (pic_in)
> {
> if (pic_in->colorSpace == X265_CSP_I420) // SVT-HEVC supports
> only yuv420p color space
>
> --
> *Thanks and Regards,*
> *Snehaa.G*
> ___
> x265-devel mailing list
> x265-devel@videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
--
Regards,
*Aruna Matheswaran,*
Video Codec Engineer,
Media & AI analytics BU,
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH] Fix x265 SVT integration
Pushed into Release_3.1, Release_3.2 and default. On Wed, Jan 8, 2020 at 4:36 PM Snehaa Giridharan < sne...@multicorewareinc.com> wrote: > # HG changeset patch > # User sne...@multicorewareinc.com > # Date 1576060884 -19800 > # Wed Dec 11 16:11:24 2019 +0530 > # Node ID e65e139861f7d379cc270591709ef602ec1ab42e > # Parent 2e84224f404a55b13866997597beff924f4ce808 > Fix x265 SVT integration > > This patch does the following. > - Fix error for newly added param variables and other default variables > - Remove EbTime.h file as its no longer present in include directory of SVT > - Set SVT-HEVC lib version required to 1.4.1 > - Modify doc page > > diff -r 2e84224f404a -r e65e139861f7 doc/reST/cli.rst > --- a/doc/reST/cli.rst Mon Jan 06 09:38:05 2020 +0530 > +++ b/doc/reST/cli.rst Wed Dec 11 16:11:24 2019 +0530 > @@ -2541,12 +2541,12 @@ > > .. option:: --svt-preset-tuner > > -SVT-HEVC exposes 13 presets. Presets [3-12] of SVT-HEVC is mapped to > x265's > -presets [placebo-ultrafast]. Ultrafast is mapped to preset(12) of > SVT-HEVC, > -superfast to preset(11), placebo to preset(3) and so on. > svt-preset-tuner works > -only on top of placebo preset and maps to presets (0-2) of SVT-HEVC. > - > -Values: [0-2] > +SVT-HEVC exposes 12 presets. Presets [2-11] of SVT-HEVC is mapped to > x265's > +presets [placebo-ultrafast]. Ultrafast is mapped to preset(11) of > SVT-HEVC, > +superfast to preset(10), placebo to preset(2) and so on. > svt-preset-tuner works > +only on top of placebo preset and maps to presets (0-1) of SVT-HEVC. > + > +Values: [0-1] > > **CLI_ONLY** > > diff -r 2e84224f404a -r e65e139861f7 doc/reST/svthevc.rst > --- a/doc/reST/svthevc.rst Mon Jan 06 09:38:05 2020 +0530 > +++ b/doc/reST/svthevc.rst Wed Dec 11 16:11:24 2019 +0530 > @@ -12,6 +12,10 @@ > wont't be mapped to SVT-HEVC. This document describes the steps needed to > compile x265 > with SVT-HEVC and CLI options mapping between x265 and SVT-HEVC. > > +Supported Version > += > +Version - 1.4.1 > + > Build Steps > === > This section describes the build steps to be followed to link SVT-HEVC > with x265. > @@ -109,7 +113,15 @@ > > > +---+--+--+ > | :option:`--nalu-file` | NaluFile > | Any String | > > > +---+--+--+ > -| :option:`--tune` zerolatency | LatencyMode > | | > +| :option:`--hrd` | hrdFlag > | [0, 1] | > > ++---+--+--+ > +| :option:`--vbv-maxrate` | vbvMaxrate > | Any Positive Integer | > > ++---+--+--+ > +| :option:`--vbv-bufsize` | vbvBufsize > | Any Positive Integer | > > ++---+--+--+ > +| :option:`--vbv-init` | VbvBufInit > | [0 - 100]| > > ++---+--+--+ > +| :option:`--frame-threads` | ThreadCount > | Any Number | > > > +---+--+--+ > | :option:`--svt-search-width` | SearchAreaWidth > | [1 - 256]| > > > +---+--+--+ > @@ -139,64 +151,37 @@ > fecilitate access to the features of SVT-HEVC which couldn't be mapped to > the existing x265 CLI's. > So these options will have effect only if SVT-HEVC is enabled and would > be ignored with default x265 encode. > > -Preset & Tune Options Mapping > +Preset Option Mapping > = > -x265 has 10 presets from ultrafast to placebo whereas SVT-HEVC has 13 > presets. Use :option:`--svt-preset-tuner` > -with Placebo preset to access the additional 3 presets of SVT-HEVC. Note > that :option:`--svt-preset-tuner` should be > +x265 has 10 presets from ultrafast to placebo whereas SVT-HEVC has 12 > presets. Use :option:`--svt-preset-tuner` > +with Placebo preset to access the additional 2 presets of SVT-HEVC. Note > that :option:`--svt-preset-tuner` should be > used only if SVT-HEVC is enabled and only with Placebo preset, would be > ignored otherwise. > Below table shows the actual mapping of presets, > > ++--+ > | x265 Preset| SVT-HEVC Preset
Re: [x265] [PATCH] Fix x265 SVT integration
Please ignore this email. I will resend the final one immediately. -- *Thanks and Regards,* *Snehaa.G* ___ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH] Fix x265 SVT integration
# HG changeset patch # User sne...@multicorewareinc.com # Date 1576060884 -19800 # Wed Dec 11 16:11:24 2019 +0530 # Node ID e65e139861f7d379cc270591709ef602ec1ab42e # Parent 2e84224f404a55b13866997597beff924f4ce808 Fix x265 SVT integration This patch does the following. - Fix error for newly added param variables and other default variables - Remove EbTime.h file as its no longer present in include directory of SVT - Set SVT-HEVC lib version required to 1.4.1 - Modify doc page diff -r 2e84224f404a -r e65e139861f7 doc/reST/cli.rst --- a/doc/reST/cli.rst Mon Jan 06 09:38:05 2020 +0530 +++ b/doc/reST/cli.rst Wed Dec 11 16:11:24 2019 +0530 @@ -2541,12 +2541,12 @@ .. option:: --svt-preset-tuner -SVT-HEVC exposes 13 presets. Presets [3-12] of SVT-HEVC is mapped to x265's -presets [placebo-ultrafast]. Ultrafast is mapped to preset(12) of SVT-HEVC, -superfast to preset(11), placebo to preset(3) and so on. svt-preset-tuner works -only on top of placebo preset and maps to presets (0-2) of SVT-HEVC. - -Values: [0-2] +SVT-HEVC exposes 12 presets. Presets [2-11] of SVT-HEVC is mapped to x265's +presets [placebo-ultrafast]. Ultrafast is mapped to preset(11) of SVT-HEVC, +superfast to preset(10), placebo to preset(2) and so on. svt-preset-tuner works +only on top of placebo preset and maps to presets (0-1) of SVT-HEVC. + +Values: [0-1] **CLI_ONLY** diff -r 2e84224f404a -r e65e139861f7 doc/reST/svthevc.rst --- a/doc/reST/svthevc.rst Mon Jan 06 09:38:05 2020 +0530 +++ b/doc/reST/svthevc.rst Wed Dec 11 16:11:24 2019 +0530 @@ -12,6 +12,10 @@ wont't be mapped to SVT-HEVC. This document describes the steps needed to compile x265 with SVT-HEVC and CLI options mapping between x265 and SVT-HEVC. +Supported Version += +Version - 1.4.1 + Build Steps === This section describes the build steps to be followed to link SVT-HEVC with x265. @@ -109,7 +113,15 @@ +---+--+--+ | :option:`--nalu-file` | NaluFile | Any String | +---+--+--+ -| :option:`--tune` zerolatency | LatencyMode | | +| :option:`--hrd` | hrdFlag | [0, 1] | ++---+--+--+ +| :option:`--vbv-maxrate` | vbvMaxrate | Any Positive Integer | ++---+--+--+ +| :option:`--vbv-bufsize` | vbvBufsize | Any Positive Integer | ++---+--+--+ +| :option:`--vbv-init` | VbvBufInit | [0 - 100]| ++---+--+--+ +| :option:`--frame-threads` | ThreadCount | Any Number | +---+--+--+ | :option:`--svt-search-width` | SearchAreaWidth | [1 - 256]| +---+--+--+ @@ -139,64 +151,37 @@ fecilitate access to the features of SVT-HEVC which couldn't be mapped to the existing x265 CLI's. So these options will have effect only if SVT-HEVC is enabled and would be ignored with default x265 encode. -Preset & Tune Options Mapping +Preset Option Mapping = -x265 has 10 presets from ultrafast to placebo whereas SVT-HEVC has 13 presets. Use :option:`--svt-preset-tuner` -with Placebo preset to access the additional 3 presets of SVT-HEVC. Note that :option:`--svt-preset-tuner` should be +x265 has 10 presets from ultrafast to placebo whereas SVT-HEVC has 12 presets. Use :option:`--svt-preset-tuner` +with Placebo preset to access the additional 2 presets of SVT-HEVC. Note that :option:`--svt-preset-tuner` should be used only if SVT-HEVC is enabled and only with Placebo preset, would be ignored otherwise. Below table shows the actual mapping of presets, ++--+ | x265 Preset| SVT-HEVC Preset | ++==+ -| Ultrafast | 12 | +| Ultrafast | 11 | ++--+ -| Superfast | 11
