Ticket #10019: 0005-freemheg-Support-JPEG-bitmaps.patch

mythtv/libs/libmythfreemheg/Bitmap.cpp

@@ -169 +169 @@
     {
         m_pContent->CreateFromMPEG(data, length);
     }
-
+    else if (nCHook == 6) // JPEG ISO/IEC 10918-1, JFIF file
+    {
+        m_pContent->CreateFromJPEG(data, length);
+    }
     else
     {
         // 1,3,5,8 are reserved. 7= H.264 Intra Frame

mythtv/libs/libmythfreemheg/freemheg.h

@@ -191 +191 @@
     // Creation functions
     virtual void CreateFromPNG(const unsigned char *data, int length) = 0;
     virtual void CreateFromMPEG(const unsigned char *data, int length) = 0;
+    virtual void CreateFromJPEG(const unsigned char *data, int length) = 0;
     // Scale the bitmap.  Only used for image derived from MPEG I-frames.
     virtual void ScaleImage(int newWidth, int newHeight) = 0;
     // Information about the image.

mythtv/libs/libmythtv/mhi.cpp

@@ -1493 +1493 @@
     m_opaque = ! m_image.hasAlphaChannel();
 }
 
+// Create a bitmap from JPEG.
+//virtual
+void MHIBitmap::CreateFromJPEG(const unsigned char *data, int length)
+{
+    m_image = QImage();
+
+    if (!m_image.loadFromData(data, length, "JPG"))
+    {
+        m_image = QImage();
+        return;
+    }
+
+    // Assume that if it has an alpha buffer then it's partly transparent.
+    m_opaque = ! m_image.hasAlphaChannel();
+}
+
 // Convert an MPEG I-frame into a bitmap.  This is used as the way of
 // sending still pictures.  We convert the image to a QImage even
 // though that actually means converting it from YUV and eventually

mythtv/libs/libmythtv/mhi.h

@@ -231 +231 @@
     /// Create bitmap from single I frame MPEG
     virtual void CreateFromMPEG(const unsigned char *data, int length);
 
+    /// Create bitmap from JPEG
+    virtual void CreateFromJPEG(const unsigned char *data, int length);
+
     /** \fn MHIBitmap::Draw(int,int,QRect,bool)
      *  \brief Draw the completed drawing onto the display.
      *