<div dir="ltr">Thanks - this version is technically correct, can you send another patch without the callback functions?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Aug 7, 2015 at 11:50 PM, Steve Borho <span dir="ltr"><<a href="mailto:steve@borho.org" target="_blank">steve@borho.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 08/07, <a href="mailto:santhoshini@multicorewareinc.com">santhoshini@multicorewareinc.com</a> wrote:<br>
> # HG changeset patch<br>
> # User Santhoshini Sekar<<a href="mailto:santhoshini@multicorewareinc.com">santhoshini@multicorewareinc.com</a>><br>
> # Date 1438839704 -19800<br>
> # Thu Aug 06 11:11:44 2015 +0530<br>
> # Node ID 450055cd2ef7e85ba8fff2d163161c0d0428b5fe<br>
> # Parent 9982ac741d1850d2b2451985feef5e0de0790794<br>
> add API and implementation for Region of Interest(ROI)<br>
<br>
</span>this version looks ok<br>
<div class="HOEnZb"><div class="h5"><br>
> diff -r 9982ac741d18 -r 450055cd2ef7 source/CMakeLists.txt<br>
> --- a/source/CMakeLists.txt Thu Aug 06 10:29:06 2015 +0530<br>
> +++ b/source/CMakeLists.txt Thu Aug 06 11:11:44 2015 +0530<br>
> @@ -30,7 +30,7 @@<br>
> mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)<br>
><br>
> # X265_BUILD must be incremented each time the public API is changed<br>
> -set(X265_BUILD 68)<br>
> +set(X265_BUILD 69)<br>
> configure_file("${PROJECT_SOURCE_DIR}/<a href="http://x265.def.in" rel="noreferrer" target="_blank">x265.def.in</a>"<br>
> "${PROJECT_BINARY_DIR}/x265.def")<br>
> configure_file("${PROJECT_SOURCE_DIR}/<a href="http://x265_config.h.in" rel="noreferrer" target="_blank">x265_config.h.in</a>"<br>
> diff -r 9982ac741d18 -r 450055cd2ef7 source/common/frame.h<br>
> --- a/source/common/frame.h Thu Aug 06 10:29:06 2015 +0530<br>
> +++ b/source/common/frame.h Thu Aug 06 11:11:44 2015 +0530<br>
> @@ -59,6 +59,8 @@<br>
> bool m_lowresInit; // lowres init complete (pre-analysis)<br>
> bool m_bChromaExtended; // orig chroma planes motion extended for weight analysis<br>
><br>
> + float* m_quantOffsets; // points to quantOffsets in x265_picture<br>
> +<br>
> /* Frame Parallelism - notification between FrameEncoders of available motion reference rows */<br>
> ThreadSafeInteger m_reconRowCount; // count of CTU rows completely reconstructed and extended for motion reference<br>
> volatile uint32_t m_countRefEncoders; // count of FrameEncoder threads monitoring m_reconRowCount<br>
> @@ -73,6 +75,7 @@<br>
> bool allocEncodeData(x265_param *param, const SPS& sps);<br>
> void reinit(const SPS& sps);<br>
> void destroy();<br>
> + void (*quantOffsetsFree)(void*);<br>
> };<br>
> }<br>
><br>
> diff -r 9982ac741d18 -r 450055cd2ef7 source/encoder/encoder.cpp<br>
> --- a/source/encoder/encoder.cpp Thu Aug 06 10:29:06 2015 +0530<br>
> +++ b/source/encoder/encoder.cpp Thu Aug 06 11:11:44 2015 +0530<br>
> @@ -465,6 +465,8 @@<br>
> inFrame->m_pts = pic_in->pts;<br>
> inFrame->m_forceqp = pic_in->forceqp;<br>
> inFrame->m_param = m_reconfigured ? m_latestParam : m_param;<br>
> + inFrame->m_quantOffsets = pic_in->quantOffsets;<br>
> + inFrame->quantOffsetsFree = pic_in->quantOffsets_free;<br>
><br>
> if (m_pocLast == 0)<br>
> m_firstPts = inFrame->m_pts;<br>
> @@ -632,6 +634,9 @@<br>
> frameEnc = m_lookahead->getDecidedPicture();<br>
> if (frameEnc && !pass)<br>
> {<br>
> + if (frameEnc->quantOffsetsFree)<br>
> + frameEnc->quantOffsetsFree(frameEnc->m_quantOffsets);<br>
> +<br>
> /* give this frame a FrameData instance before encoding */<br>
> if (m_dpb->m_picSymFreeList)<br>
> {<br>
> diff -r 9982ac741d18 -r 450055cd2ef7 source/encoder/slicetype.cpp<br>
> --- a/source/encoder/slicetype.cpp Thu Aug 06 10:29:06 2015 +0530<br>
> +++ b/source/encoder/slicetype.cpp Thu Aug 06 11:11:44 2015 +0530<br>
> @@ -96,6 +96,7 @@<br>
> int maxRow = curFrame->m_fencPic->m_picHeight;<br>
> int blockCount = curFrame->m_lowres.maxBlocksInRow * curFrame->m_lowres.maxBlocksInCol;<br>
><br>
> + float* quantOffsets = curFrame->m_quantOffsets;<br>
> for (int y = 0; y < 3; y++)<br>
> {<br>
> curFrame->m_lowres.wp_ssd[y] = 0;<br>
> @@ -113,10 +114,21 @@<br>
><br>
> if (param->rc.aqMode && param->rc.aqStrength == 0)<br>
> {<br>
> - memset(curFrame->m_lowres.qpCuTreeOffset, 0, cuCount * sizeof(double));<br>
> - memset(curFrame->m_lowres.qpAqOffset, 0, cuCount * sizeof(double));<br>
> - for (int cuxy = 0; cuxy < cuCount; cuxy++)<br>
> - curFrame->m_lowres.invQscaleFactor[cuxy] = 256;<br>
> + if (quantOffsets)<br>
> + {<br>
> + for (int cuxy = 0; cuxy < cuCount; cuxy++)<br>
> + {<br>
> + curFrame->m_lowres.qpCuTreeOffset[cuxy] = curFrame->m_lowres.qpAqOffset[cuxy] = quantOffsets[cuxy];<br>
> + curFrame->m_lowres.invQscaleFactor[cuxy] = x265_exp2fix8(curFrame->m_lowres.qpCuTreeOffset[cuxy]);<br>
> + }<br>
> + }<br>
> + else<br>
> + {<br>
> + memset(curFrame->m_lowres.qpCuTreeOffset, 0, cuCount * sizeof(double));<br>
> + memset(curFrame->m_lowres.qpAqOffset, 0, cuCount * sizeof(double));<br>
> + for (int cuxy = 0; cuxy < cuCount; cuxy++)<br>
> + curFrame->m_lowres.invQscaleFactor[cuxy] = 256;<br>
> + }<br>
> }<br>
><br>
> /* Need variance data for weighted prediction */<br>
> @@ -177,6 +189,8 @@<br>
> uint32_t energy = acEnergyCu(curFrame, blockX, blockY, param->internalCsp);<br>
> qp_adj = strength * (X265_LOG2(X265_MAX(energy, 1)) - (14.427f + 2 * (X265_DEPTH - 8)));<br>
> }<br>
> + if (quantOffsets)<br>
> + qp_adj += quantOffsets[blockXY];<br>
> curFrame->m_lowres.qpAqOffset[blockXY] = qp_adj;<br>
> curFrame->m_lowres.qpCuTreeOffset[blockXY] = qp_adj;<br>
> curFrame->m_lowres.invQscaleFactor[blockXY] = x265_exp2fix8(qp_adj);<br>
> diff -r 9982ac741d18 -r 450055cd2ef7 source/x265.h<br>
> --- a/source/x265.h Thu Aug 06 10:29:06 2015 +0530<br>
> +++ b/source/x265.h Thu Aug 06 11:11:44 2015 +0530<br>
> @@ -205,6 +205,17 @@<br>
> * this data structure */<br>
> x265_analysis_data analysisData;<br>
><br>
> + /* An array of quantizer offsets to be applied to this image during encoding.<br>
> + * These are added on top of the decisions made by rateControl.<br>
> + * Adaptive quantization must be enabled to use this feature. These quantizer<br>
> + * offsets should be given for each 16x16 block. Behavior if quant<br>
> + * offsets differ between encoding passes is undefined. */<br>
> + float *quantOffsets;<br>
> +<br>
> + /* optional callback to free quant_offsets when used.<br>
> + * Useful if one wants to use a different quant_offset array for each frame. */<br>
> + void (*quantOffsets_free)(void*);<br>
> +<br>
> /* Frame level statistics */<br>
> x265_frame_stats frameData;<br>
><br>
> _______________________________________________<br>
> x265-devel mailing list<br>
> <a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
> <a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Steve Borho<br>
</font></span><div class="HOEnZb"><div class="h5">_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</div></div></blockquote></div><br></div>