<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Thu, Nov 8, 2018 at 6:33 PM Pooja Venkatesan <<a href="mailto:pooja@multicorewareinc.com">pooja@multicorewareinc.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div dir="ltr"><div class="m_-769443080108241296gmail-gs" style="margin:0px;padding:0px 0px 20px;width:1212px"><div class="m_-769443080108241296gmail-"><div id="m_-769443080108241296gmail-:cxz" class="m_-769443080108241296gmail-ii m_-769443080108241296gmail-gt" style="direction:ltr;margin:8px 0px 0px;padding:0px"><div id="m_-769443080108241296gmail-:cxy" class="m_-769443080108241296gmail-a3s m_-769443080108241296gmail-aXjCH" style="overflow:hidden;font-variant-numeric:normal;font-variant-east-asian:normal;font-stretch:normal;line-height:1.5;outline:none"><div dir="ltr"><div dir="ltr"><div dir="ltr"># HG changeset patch</div><div dir="ltr"># User Pooja Venkatesan <<a href="mailto:pooja@multicorewareinc.com" target="_blank">pooja@multicorewareinc.com</a>></div><div dir="ltr"># Date 1541396041 -19800</div><div dir="ltr"># Mon Nov 05 11:04:01 2018 +0530</div><div dir="ltr"># Branch stable</div><div dir="ltr"># Node ID daf2785a189391ce6964f673858dc8234c641807</div><div dir="ltr"># Parent 471726d3a0462739ff8e3518eb1a1e8a01de4e8d</div><div dir="ltr">Fix issue #441 build error in VMAF lib</div><div dir="ltr"><br></div><div dir="ltr">diff -r 471726d3a046 -r daf2785a1893 source/encoder/api.cpp</div><div dir="ltr">--- a/source/encoder/api.cpp<span style="white-space:pre-wrap"> </span>Wed Oct 31 16:35:48 2018 +0530</div><div dir="ltr">+++ b/source/encoder/api.cpp<span style="white-space:pre-wrap"> </span>Mon Nov 05 11:04:01 2018 +0530</div><div dir="ltr">@@ -1501,7 +1501,7 @@</div><div dir="ltr"> else</div><div dir="ltr"> x265_log(NULL, X265_LOG_ERROR, "Invalid format\n");</div><div dir="ltr"> </div><div dir="ltr">- compute_vmaf(&score, vcd->format, data->width, data->height, read_frame, data, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool); </div><div dir="ltr">+ compute_vmaf(&score, vcd->format, data->width, data->height, read_frame, data, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval); </div><div dir="ltr"> </div><div dir="ltr"> return score;</div><div dir="ltr"> }</div><div dir="ltr">@@ -1603,7 +1603,7 @@</div><div dir="ltr"> read_frame = read_frame_8bit;</div><div dir="ltr"> else</div><div dir="ltr"> read_frame = read_frame_10bit;</div><div dir="ltr">- compute_vmaf(&score, vcd->format, vmafframedata->width, vmafframedata->height, read_frame, vmafframedata, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool);</div><div dir="ltr">+ compute_vmaf(&score, vcd->format, vmafframedata->width, vmafframedata->height, read_frame, vmafframedata, vcd->model_path, vcd->log_path, vcd->log_fmt, vcd->disable_clip, vcd->disable_avx, vcd->enable_transform, vcd->phone_model, vcd->psnr, vcd->ssim, vcd->ms_ssim, vcd->pool, vcd->thread, vcd->subsample, vcd->enable_conf_interval);</div><div dir="ltr"> </div><div dir="ltr"> return score;</div><div dir="ltr"> }</div><div dir="ltr">diff -r 471726d3a046 -r daf2785a1893 source/x265.h</div><div dir="ltr">--- a/source/x265.h<span style="white-space:pre-wrap"> </span>Wed Oct 31 16:35:48 2018 +0530</div><div dir="ltr">+++ b/source/x265.h<span style="white-space:pre-wrap"> </span>Mon Nov 05 11:04:01 2018 +0530</div><div dir="ltr">@@ -688,9 +688,12 @@</div><div dir="ltr"> int ssim;</div><div dir="ltr"> int ms_ssim;</div><div dir="ltr"> char *pool;</div><div dir="ltr">+ int thread;</div><div dir="ltr">+ int subsample;</div><div dir="ltr">+ int enable_conf_interval;</div><div dir="ltr"> }x265_vmaf_commondata;</div><div dir="ltr"> </div><div dir="ltr">-static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL } };</div><div dir="ltr">+static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } };</div><div dir="ltr"> </div><div dir="ltr"> /* x265 input parameters</div><div dir="ltr"> *</div><div style="font-family:Arial,Helvetica,sans-serif;font-size:small"><br></div></div></div></div></div></div></div></div></div>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">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></blockquote><div><br></div><div>Pushed. </div></div></div>