[Opalvoip-svn] SF.net SVN: opalvoip:[34638] ptlib/trunk/src/ptlib/common/vconvert.cxx

[<rjo...@us...>]

Revision: 34638
          http://sourceforge.net/p/opalvoip/code/34638
Author:   rjongbloed
Date:     2016-02-19 12:20:17 +0000 (Fri, 19 Feb 2016)
Log Message:
-----------
Allow PJPEGConverter::Load() to resize output, if YUV420P

Modified Paths:
--------------
    ptlib/trunk/src/ptlib/common/vconvert.cxx

Modified: ptlib/trunk/src/ptlib/common/vconvert.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/vconvert.cxx	2016-02-19 10:37:47 UTC (rev 34637)
+++ ptlib/trunk/src/ptlib/common/vconvert.cxx	2016-02-19 12:20:17 UTC (rev 34638)
@@ -3205,7 +3205,7 @@
   }
 
 
-  bool Load(PFile & file, PBYTEArray & frameBuffer, unsigned & width, unsigned & height)
+  bool Load(PFile & file, PBYTEArray & frameBuffer, unsigned & width, unsigned & height, PVideoFrameInfo::ResizeMode resizeMode)
   {
     PBYTEArray jpegData;
     if (!PAssert(jpegData.SetSize(file.GetLength()),POutOfMemory))
@@ -3216,8 +3216,23 @@
       return false;
     }
 
-    return Start(jpegData, jpegData.GetSize(), width, height) &&
-           Finish(frameBuffer.GetPointer(GetBufferSizeForColour(width, height)), width, height);
+    unsigned nativeWidth = 0, nativeHeight = 0;
+    if (!Start(jpegData, jpegData.GetSize(), nativeWidth, nativeHeight))
+        return false;
+
+    if (m_colourSpace != MY_JPEG_YUV420P || width == 0 || width == 0 || (width == nativeWidth && height == nativeHeight)) {
+      width = nativeWidth;
+      height = nativeHeight;
+      return Finish(frameBuffer.GetPointer(GetBufferSizeForColour(width, height)), width, height);
+    }
+
+    PBYTEArray temporaryBuffer;
+    if (!Finish(frameBuffer.GetPointer(GetBufferSizeForColour(nativeWidth, nativeHeight)), nativeWidth, nativeHeight))
+      return false;
+
+    return CopyYUV420P(0, 0, nativeWidth, nativeHeight, nativeWidth, nativeHeight, m_temporaryBuffer,
+                       0, 0, width, height, width, height, frameBuffer.GetPointer(GetBufferSizeForColour(width, height)),
+                       resizeMode);
   }
 };
 
@@ -3285,7 +3300,7 @@
   if (!m_context->SetColourSpace(m_dstColourFormat))
     return false;
 
-  return m_context->Load(file, dstFrameBuffer, m_dstFrameWidth, m_dstFrameHeight);
+  return m_context->Load(file, dstFrameBuffer, m_dstFrameWidth, m_dstFrameHeight, m_resizeMode);
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.