[x265-commits] [x265] cli: do not check recon bit depth if no recon file is req...

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/4a824497b3f4
branches:  
changeset: 4973:4a824497b3f4
user:      Steve Borho <steve at borho.org>
date:      Fri Nov 08 15:39:08 2013 -0600
description:
cli: do not check recon bit depth if no recon file is requested

For now, just enforce our current requirement that the output bitdepth must
match the input bit depth.  If the recon file writers ever support depth
conversions, these checks can be revisited

diffstat:

 source/x265.cpp |  19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diffs (36 lines):

diff -r 5b688170c506 -r 4a824497b3f4 source/x265.cpp
--- a/source/x265.cpp	Fri Nov 08 15:17:18 2013 -0600
+++ b/source/x265.cpp	Fri Nov 08 15:39:08 2013 -0600
@@ -499,20 +499,6 @@ bool CLIOptions::parse(int argc, char **
         this->input->setBitDepth(param->inputBitDepth);
     }
 
-    if (reconFileBitDepth > 0)
-    {
-        if (reconFileBitDepth != param->inputBitDepth)
-        {
-            x265_log(param, X265_LOG_ERROR, "Bit depth of the recon file should be the same as input bit depth\n");
-            /* TODO: Support recon files with bitdepth > input bit depth??*/
-            return true;
-        }
-    }
-    else
-    {
-        reconFileBitDepth = param->inputBitDepth;
-    }
-
     int guess = this->input->guessFrameCount();
     if (this->frameSkip)
     {
@@ -542,6 +528,11 @@ bool CLIOptions::parse(int argc, char **
 
     if (reconfn)
     {
+        if (reconFileBitDepth != param->inputBitDepth)
+        {
+            x265_log(param, X265_LOG_ERROR, "Bit depth of the recon file must be the same as input bit depth\n");
+            return true;
+        }
         this->recon = Output::open(reconfn, param->sourceWidth, param->sourceHeight, reconFileBitDepth, param->frameRate, param->sourceCsp);
         if (this->recon->isFail())
         {