<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 12, 2017 at 3:11 PM, Divya Manivannan <span dir="ltr"><<a href="mailto:divya@multicorewareinc.com" target="_blank">divya@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Divya Manivannan <<a href="mailto:divya@multicorewareinc.com">divya@multicorewareinc.com</a>><br>
# Date 1496727799 -19800<br>
#      Tue Jun 06 11:13:19 2017 +0530<br>
# Node ID b19bc0c7b4eccfe336ecd381df2520<wbr>3ee6f57d05<br>
# Parent  cad77d34fec19c4622d42e30285f4a<wbr>919f45dde9<br>
Fix slicetype mismatch between analysis save and load modes<br></blockquote><div><br></div><div>Pushed to default</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r cad77d34fec1 -r b19bc0c7b4ec source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp        Fri Jun 09 14:55:05 2017 +0530<br>
+++ b/source/encoder/encoder.cpp        Tue Jun 06 11:13:19 2017 +0530<br>
@@ -850,20 +850,7 @@<br>
<br>
                 pic_out->pts = outFrame->m_pts;<br>
                 pic_out->dts = outFrame->m_dts;<br>
-<br>
-                switch (slice->m_sliceType)<br>
-                {<br>
-                case I_SLICE:<br>
-                    pic_out->sliceType = outFrame->m_lowres.bKeyframe ? X265_TYPE_IDR : X265_TYPE_I;<br>
-                    break;<br>
-                case P_SLICE:<br>
-                    pic_out->sliceType = X265_TYPE_P;<br>
-                    break;<br>
-                case B_SLICE:<br>
-                    pic_out->sliceType = X265_TYPE_B;<br>
-                    break;<br>
-                }<br>
-<br>
+                pic_out->sliceType = outFrame->m_lowres.sliceType;<br>
                 pic_out->planes[0] = recpic->m_picOrg[0];<br>
                 pic_out->stride[0] = (int)(recpic->m_stride * sizeof(pixel));<br>
                 if (m_param->internalCsp != X265_CSP_I400)<br>
@@ -2904,7 +2891,6 @@<br>
<br>
     if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)<br>
     {<br>
-        analysis->sliceType = X265_TYPE_I;<br>
         if (m_param->analysisRefineLevel < 2)<br>
             return;<br>
<br>
<br>______________________________<wbr>_________________<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/<wbr>listinfo/x265-devel</a><br>
<br></blockquote></div><br></div></div>