[x265] [PATCH] Fix slicetype mismatch between analysis save and load modes

[Divya Manivannan]

# HG changeset patch
# User Divya Manivannan <di...@multicorewareinc.com>
# Date 1496727799 -19800
#      Tue Jun 06 11:13:19 2017 +0530
# Node ID b19bc0c7b4eccfe336ecd381df25203ee6f57d05
# Parent  cad77d34fec19c4622d42e30285f4a919f45dde9
Fix slicetype mismatch between analysis save and load modes

diff -r cad77d34fec1 -r b19bc0c7b4ec source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp        Fri Jun 09 14:55:05 2017 +0530
+++ b/source/encoder/encoder.cpp        Tue Jun 06 11:13:19 2017 +0530
@@ -850,20 +850,7 @@
 
                 pic_out->pts = outFrame->m_pts;
                 pic_out->dts = outFrame->m_dts;
-
-                switch (slice->m_sliceType)
-                {
-                case I_SLICE:
-                    pic_out->sliceType = outFrame->m_lowres.bKeyframe ? 
X265_TYPE_IDR : X265_TYPE_I;
-                    break;
-                case P_SLICE:
-                    pic_out->sliceType = X265_TYPE_P;
-                    break;
-                case B_SLICE:
-                    pic_out->sliceType = X265_TYPE_B;
-                    break;
-                }
-
+                pic_out->sliceType = outFrame->m_lowres.sliceType;
                 pic_out->planes[0] = recpic->m_picOrg[0];
                 pic_out->stride[0] = (int)(recpic->m_stride * sizeof(pixel));
                 if (m_param->internalCsp != X265_CSP_I400)
@@ -2904,7 +2891,6 @@
 
     if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == 
X265_TYPE_I)
     {
-        analysis->sliceType = X265_TYPE_I;
         if (m_param->analysisRefineLevel < 2)
             return;
 

# HG changeset patch
# User Divya Manivannan <di...@multicorewareinc.com>
# Date 1496727799 -19800
#      Tue Jun 06 11:13:19 2017 +0530
# Node ID b19bc0c7b4eccfe336ecd381df25203ee6f57d05
# Parent  cad77d34fec19c4622d42e30285f4a919f45dde9
Fix slicetype mismatch between analysis save and load modes

diff -r cad77d34fec1 -r b19bc0c7b4ec source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Fri Jun 09 14:55:05 2017 +0530
+++ b/source/encoder/encoder.cpp	Tue Jun 06 11:13:19 2017 +0530
@@ -850,20 +850,7 @@
 
                 pic_out->pts = outFrame->m_pts;
                 pic_out->dts = outFrame->m_dts;
-
-                switch (slice->m_sliceType)
-                {
-                case I_SLICE:
-                    pic_out->sliceType = outFrame->m_lowres.bKeyframe ? X265_TYPE_IDR : X265_TYPE_I;
-                    break;
-                case P_SLICE:
-                    pic_out->sliceType = X265_TYPE_P;
-                    break;
-                case B_SLICE:
-                    pic_out->sliceType = X265_TYPE_B;
-                    break;
-                }
-
+                pic_out->sliceType = outFrame->m_lowres.sliceType;
                 pic_out->planes[0] = recpic->m_picOrg[0];
                 pic_out->stride[0] = (int)(recpic->m_stride * sizeof(pixel));
                 if (m_param->internalCsp != X265_CSP_I400)
@@ -2904,7 +2891,6 @@
 
     if (analysis->sliceType == X265_TYPE_IDR || analysis->sliceType == X265_TYPE_I)
     {
-        analysis->sliceType = X265_TYPE_I;
         if (m_param->analysisRefineLevel < 2)
             return;
 

_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel