From 26b5a01d5592f488af3f6d056c546032bd016ebd Mon Sep 17 00:00:00 2001 From: Lawrence Rust Date: Mon, 18 Jul 2011 20:32:19 +0200 Subject: [PATCH 5/9] freemheg: Support JPEG bitmaps Signed-off-by: Lawrence Rust --- mythtv/libs/libmythfreemheg/Bitmap.cpp | 5 ++++- mythtv/libs/libmythfreemheg/freemheg.h | 1 + mythtv/libs/libmythtv/mhi.cpp | 16 ++++++++++++++++ mythtv/libs/libmythtv/mhi.h | 3 +++ 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/mythtv/libs/libmythfreemheg/Bitmap.cpp b/mythtv/libs/libmythfreemheg/Bitmap.cpp index 6e6bbc4..522175d 100644 --- a/mythtv/libs/libmythfreemheg/Bitmap.cpp +++ b/mythtv/libs/libmythfreemheg/Bitmap.cpp @@ -169,7 +169,10 @@ void MHBitmap::CreateContent(const unsigned char *data, int length, MHEngine *en { 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 diff --git a/mythtv/libs/libmythfreemheg/freemheg.h b/mythtv/libs/libmythfreemheg/freemheg.h index 0b61f65..327818a 100644 --- a/mythtv/libs/libmythfreemheg/freemheg.h +++ b/mythtv/libs/libmythfreemheg/freemheg.h @@ -191,6 +191,7 @@ class MHBitmapDisplay // 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. diff --git a/mythtv/libs/libmythtv/mhi.cpp b/mythtv/libs/libmythtv/mhi.cpp index 1631495..d268fb4 100644 --- a/mythtv/libs/libmythtv/mhi.cpp +++ b/mythtv/libs/libmythtv/mhi.cpp @@ -1493,6 +1493,22 @@ void MHIBitmap::CreateFromPNG(const unsigned char *data, int length) 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 diff --git a/mythtv/libs/libmythtv/mhi.h b/mythtv/libs/libmythtv/mhi.h index 2b10c8b..5174cc7 100644 --- a/mythtv/libs/libmythtv/mhi.h +++ b/mythtv/libs/libmythtv/mhi.h @@ -231,6 +231,9 @@ class MHIBitmap : public MHBitmapDisplay /// 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. * -- 1.7.4.1