From 42f12018a7d127e3461b3c2788a101e9048ae5f5 Mon Sep 17 00:00:00 2001
From: "yuzhuohuang@qq.com" <yuzhuohuang@qq.com>
Date: Mon, 5 Nov 2012 21:00:03 +0800
Subject: [PATCH] Bugfix: PGS YVU => YUV

---
 src/subtitles/CompositionObject.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/subtitles/CompositionObject.cpp b/src/subtitles/CompositionObject.cpp
index a96f34b..4e3a487 100644
--- a/src/subtitles/CompositionObject.cpp
+++ b/src/subtitles/CompositionObject.cpp
@@ -46,7 +46,7 @@ void CompositionObject::SetPalette(int nNbEntry, HDMV_PALETTE* pPalette, bool bI
 
     m_Palette.SetCount(nNbEntry>0?nNbEntry:0);
     if(nNbEntry>0)
-    {        
+    {
         memcpy(m_Palette.GetData(), pPalette, nNbEntry*sizeof(pPalette[0]));
     }
 }
@@ -72,14 +72,14 @@ void CompositionObject::InitColor(const SubPicDesc& spd)
                 {
                     for (int i=0;i<paletteNumber;i++)
                     {
-                        m_Colors[m_Palette[i].entry_id] = COMBINE_AYUV(m_Palette[i].T, m_Palette[i].Y, m_Palette[i].Cr, m_Palette[i].Cb);
+                        m_Colors[m_Palette[i].entry_id] = COMBINE_AYUV(m_Palette[i].T, m_Palette[i].Y, m_Palette[i].Cb, m_Palette[i].Cr);
                     }
                 }
                 else if (m_OriginalColorType==YUV_Rec709)
                 {
                     for (int i=0;i<paletteNumber;i++)
                     {
-                        DWORD argb = ColorConvTable::A8Y8U8V8_To_ARGB_TV_BT709(m_Palette[i].T, m_Palette[i].Y, m_Palette[i].Cr, m_Palette[i].Cb);
+                        DWORD argb = YCrCbToRGB_Rec709(m_Palette[i].T, m_Palette[i].Y, m_Palette[i].Cr, m_Palette[i].Cb);
                         m_Colors[m_Palette[i].entry_id] = ColorConvTable::Argb2Ayuv(argb);
                     }
                 }
@@ -87,7 +87,7 @@ void CompositionObject::InitColor(const SubPicDesc& spd)
                 {
                     for (int i=0;i<paletteNumber;i++)
                     {
-                        DWORD argb = ColorConvTable::A8Y8U8V8_To_ARGB_TV_BT601(m_Palette[i].T, m_Palette[i].Y, m_Palette[i].Cr, m_Palette[i].Cb);
+                        DWORD argb = YCrCbToRGB_Rec601(m_Palette[i].T, m_Palette[i].Y, m_Palette[i].Cr, m_Palette[i].Cb);
                         m_Colors[m_Palette[i].entry_id] = ColorConvTable::Argb2Ayuv(argb);
                     }
                 }
@@ -102,7 +102,7 @@ void CompositionObject::InitColor(const SubPicDesc& spd)
                 {
                     for (int i=0;i<paletteNumber;i++)
                     {
-                        m_Colors[m_Palette[i].entry_id] = COMBINE_AYUV(m_Palette[i].T, m_Palette[i].Cr, m_Palette[i].Y, m_Palette[i].Cb);
+                        m_Colors[m_Palette[i].entry_id] = COMBINE_AYUV(m_Palette[i].T, m_Palette[i].Cb, m_Palette[i].Y, m_Palette[i].Cr);
                     }
                 }
                 else if (m_OriginalColorType==YUV_Rec709)
-- 
2.11.4.GIT