[x265] [PATCH] rc: don't read slicetypes from qpfile in 2nd pass

2014-08-25 Thread aarthi
# HG changeset patch
# User Aarthi Thirumalai
# Date 1408948191 -19800
#  Mon Aug 25 11:59:51 2014 +0530
# Node ID 7d9c4d6ca117eebaa838756a0b3562b4e3630e18
# Parent  c71cf2abe789b7bb7696201c9cff99c438109a0a
rc: don't read slicetypes from qpfile in 2nd pass.

slicetype has to be taken from the stats file from prev pass.

diff -r c71cf2abe789 -r 7d9c4d6ca117 source/x265.cpp
--- a/source/x265.cpp   Mon Aug 25 11:28:27 2014 +0530
+++ b/source/x265.cpp   Mon Aug 25 11:59:51 2014 +0530
@@ -833,7 +833,7 @@
 while (pic_in  !b_ctrl_c)
 {
 pic_orig.poc = inFrameCount;
-if (cliopt.qpfile)
+if (cliopt.qpfile  !param-rc.bStatRead)
 {
 if (!cliopt.parseQPFile(pic_orig))
 {
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel


Re: [x265] [PATCH] rc: don't read slicetypes from qpfile in 2nd pass

2014-08-25 Thread Steve Borho
On 08/25, aar...@multicorewareinc.com wrote:
 # HG changeset patch
 # User Aarthi Thirumalai
 # Date 1408948191 -19800
 #  Mon Aug 25 11:59:51 2014 +0530
 # Node ID 7d9c4d6ca117eebaa838756a0b3562b4e3630e18
 # Parent  c71cf2abe789b7bb7696201c9cff99c438109a0a
 rc: don't read slicetypes from qpfile in 2nd pass.
 
 slicetype has to be taken from the stats file from prev pass.

This is essentially disabling the QP file entirely on the second pass,
which might be a perfectly reasonable thing to do, but if it is we
should probably issue some kind of warning saying the QP file is being
ignored.

 diff -r c71cf2abe789 -r 7d9c4d6ca117 source/x265.cpp
 --- a/source/x265.cpp Mon Aug 25 11:28:27 2014 +0530
 +++ b/source/x265.cpp Mon Aug 25 11:59:51 2014 +0530
 @@ -833,7 +833,7 @@
  while (pic_in  !b_ctrl_c)
  {
  pic_orig.poc = inFrameCount;
 -if (cliopt.qpfile)
 +if (cliopt.qpfile  !param-rc.bStatRead)
  {
  if (!cliopt.parseQPFile(pic_orig))
  {
 ___
 x265-devel mailing list
 x265-devel@videolan.org
 https://mailman.videolan.org/listinfo/x265-devel

-- 
Steve Borho
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel