Merge branch 'devel' into develPaintWindows

tools/CommandLineHandle.cpp

@@ -70,6 +70,7 @@ Int CommandLineHandle::parseToolsArgs( Int argc, Char *argv[] )
   ( "output,o", m_strOutput, "output file" ) /**/
   ( "size,s", m_strResolution, "size (WxH)" ) /**/
   ( "pel_fmt", m_strPelFmt, "pixel format" ) /**/
+  ( "bits_pel", m_uiBitsPerPixel, "bits per pixel" ) /**/
   ( "frames,f", m_iFrames, "number of frames to parse" );
 
   Opts().addOptions()/**/

tools/CommandLineHandle.h

@@ -78,6 +78,7 @@ private:
   std::string m_strOutput;
   std::string m_strResolution;
   std::string m_strPelFmt;
+  UInt m_uiBitsPerPixel;
   Bool m_bListPelFmts;
   Int m_iFrames;
 

tools/PlaYUVerTools.cpp

@@ -70,6 +70,11 @@ Int PlaYUVerTools::openInputs()
     {
       fmtString = m_cCmdLineHandler.m_strPelFmt;
     }
+    UInt uiBitPerPixel = 8;
+    if( m_cCmdLineHandler.Opts()["bits_pel"]->count() )
+    {
+      uiBitPerPixel = m_cCmdLineHandler.m_uiBitsPerPixel;
+    }
 
     std::vector<std::string> inputFileNames = m_cCmdLineHandler.m_apcInputs;
 
@@ -79,7 +84,7 @@ Int PlaYUVerTools::openInputs()
       pcStream = new PlaYUVerStream;
       try
       {
-        if( !pcStream->open( inputFileNames[i], resolutionString, fmtString, 8, 1 ) )
+        if( !pcStream->open( inputFileNames[i], resolutionString, fmtString, uiBitPerPixel, 1 ) )
         {
           m_cCmdLineHandler.log( LOG_ERROR, "Cannot open input stream %s! ", inputFileNames[i].c_str() );
           return 2;