From ba5e09f4d79d866181f04e1408b2279ba5347fad Mon Sep 17 00:00:00 2001 From: Lawrence Rust Date: Mon, 18 Jul 2011 20:17:45 +0200 Subject: [PATCH 2/9] freemheg: Support bitmaps with included content Signed-off-by: Lawrence Rust --- mythtv/libs/libmythfreemheg/Bitmap.cpp | 20 ++++++++++++-------- mythtv/libs/libmythfreemheg/Bitmap.h | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/mythtv/libs/libmythfreemheg/Bitmap.cpp b/mythtv/libs/libmythfreemheg/Bitmap.cpp index 42c9df1..6e6bbc4 100644 --- a/mythtv/libs/libmythfreemheg/Bitmap.cpp +++ b/mythtv/libs/libmythfreemheg/Bitmap.cpp @@ -127,10 +127,8 @@ void MHBitmap::ContentPreparation(MHEngine *engine) MHERROR("Bitmap must contain a content"); } - if (m_ContentType == IN_IncludedContent) // We can't handle included content at the moment. - { - MHERROR("Included content in bitmap is not implemented"); - } + if (m_ContentType == IN_IncludedContent) + CreateContent(m_IncludedContent.Bytes(), m_IncludedContent.Size(), engine); } // Decode the content. @@ -143,6 +141,15 @@ void MHBitmap::ContentArrived(const unsigned char *data, int length, MHEngine *e return; // Shouldn't happen. } + CreateContent(data, length, engine); + // Now signal that the content is available. + engine->EventTriggered(this, EventContentAvailable); +} + +void MHBitmap::CreateContent(const unsigned char *data, int length, MHEngine *engine) +{ + QRegion updateArea = GetVisibleArea(); // If there's any content already we have to redraw it. + int nCHook = m_nContentHook; if (nCHook == 0) @@ -165,18 +172,15 @@ void MHBitmap::ContentArrived(const unsigned char *data, int length, MHEngine *e else { + // 1,3,5,8 are reserved. 7= H.264 Intra Frame MHERROR(QString("Unknown bitmap content hook %1").arg(nCHook)); } updateArea += GetVisibleArea(); // Redraw this bitmap. engine->Redraw(updateArea); // Mark for redrawing - - // Now signal that the content is available. - engine->EventTriggered(this, EventContentAvailable); } - // Set the transparency. void MHBitmap::SetTransparency(int nTransPerCent, MHEngine *) { diff --git a/mythtv/libs/libmythfreemheg/Bitmap.h b/mythtv/libs/libmythfreemheg/Bitmap.h index 06d5f0b..e37c67d 100644 --- a/mythtv/libs/libmythfreemheg/Bitmap.h +++ b/mythtv/libs/libmythfreemheg/Bitmap.h @@ -69,6 +69,8 @@ class MHBitmap : public MHVisible int m_nXDecodeOffset, m_nYDecodeOffset; MHBitmapDisplay *m_pContent; // Pointer to current image if any. + + void CreateContent(const unsigned char *p, int s, MHEngine *engine); }; // Actions. -- 1.7.4.1