Add support for new LayoutResX/Y subtitle header that is being added to ASS spec.

clsid2 · clsid2 · commit b3b5c2649e65 · 2022-11-29T20:20:35.000+01:00
Rewrite code related to script PlayRes and video StorageRes.
diff --git a/src/Subtitles/RTS.cpp b/src/Subtitles/RTS.cpp
diff --git a/src/Subtitles/RTS.h b/src/Subtitles/RTS.h
@@ -412,7 +412,9 @@ class CSubtitle : public CAtlList<CLine*>
     int m_topborder, m_bottomborder;
     bool m_clipInverse;
 
-    double m_scalex, m_scaley;
+    double m_target_scale_x, m_target_scale_y;
+    double m_script_scale_x, m_script_scale_y;
+    double m_total_scale_x,  m_total_scale_y;
 
 public:
     CSubtitle(RenderingCaches& renderingCaches);
diff --git a/src/Subtitles/STS.cpp b/src/Subtitles/STS.cpp
@@ -670,8 +670,7 @@ static void WebVTT2SSA(CStringW& str) {
 }
 
 static bool OpenVTT(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) {
-    CStringW buff, start, end, cueTags;
-
+    CStringW buff;
     file->ReadString(buff);
     if (buff.Left(6).Compare(L"WEBVTT") != 0) {
         return false;
@@ -711,6 +710,8 @@ static bool OpenVTT(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet) {
         {L".bg_black", WebVTTcolorData({L"", L"000000"})},
     };
 
+    CStringW start, end, cueTags;
+
     auto parseStyle = [&file,&cueColors](CStringW& buff) {
         CStringW styleStr = L"";
         while (file->ReadString(buff)) {
@@ -1901,29 +1902,43 @@ static bool OpenSubStationAlpha(CTextFile* file, CSimpleTextSubtitle& ret, int C
             fRet = true;
         } else if (entry == L"playresx") {
             try {
-                ret.m_dstScreenSize.cx = GetInt(pszBuff, nBuffLength);
+                ret.m_playRes.cx = GetInt(pszBuff, nBuffLength);
             } catch (...) {
-                ret.m_dstScreenSize = CSize(0, 0);
+                ret.m_playRes = CSize(0, 0);
                 return false;
             }
 
-            if (ret.m_dstScreenSize.cy <= 0) {
-                ret.m_dstScreenSize.cy = (ret.m_dstScreenSize.cx == 1280)
+            if (ret.m_playRes.cy <= 0) {
+                ret.m_playRes.cy = (ret.m_playRes.cx == 1280)
                                          ? 1024
-                                         : ret.m_dstScreenSize.cx * 3 / 4;
+                                         : ret.m_playRes.cx * 3 / 4;
             }
         } else if (entry == L"playresy") {
             try {
-                ret.m_dstScreenSize.cy = GetInt(pszBuff, nBuffLength);
+                ret.m_playRes.cy = GetInt(pszBuff, nBuffLength);
             } catch (...) {
-                ret.m_dstScreenSize = CSize(0, 0);
+                ret.m_playRes = CSize(0, 0);
                 return false;
             }
 
-            if (ret.m_dstScreenSize.cx <= 0) {
-                ret.m_dstScreenSize.cx = (ret.m_dstScreenSize.cy == 1024)
+            if (ret.m_playRes.cx <= 0) {
+                ret.m_playRes.cx = (ret.m_playRes.cy == 1024)
                                          ? 1280
-                                         : ret.m_dstScreenSize.cy * 4 / 3;
+                                         : ret.m_playRes.cy * 4 / 3;
+            }
+        } else if (entry == L"layoutresx") {
+            try {
+                ret.m_layoutRes.cx = GetInt(pszBuff, nBuffLength);
+            } catch (...) {
+                ret.m_layoutRes = CSize(0, 0);
+                return false;
+            }
+        } else if (entry == L"layoutresy") {
+            try {
+                ret.m_layoutRes.cy = GetInt(pszBuff, nBuffLength);
+            } catch (...) {
+                ret.m_layoutRes = CSize(0, 0);
+                return false;
             }
         } else if (entry == L"wrapstyle") {
             try {
@@ -2010,29 +2025,29 @@ static bool OpenXombieSub(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet
         } else*/
         if (entry == L"screenhorizontal") {
             try {
-                ret.m_dstScreenSize.cx = GetInt(pszBuff, nBuffLength);
+                ret.m_storageRes.cx = GetInt(pszBuff, nBuffLength);
             } catch (...) {
-                ret.m_dstScreenSize = CSize(0, 0);
+                ret.m_storageRes = CSize(0, 0);
                 return false;
             }
 
-            if (ret.m_dstScreenSize.cy <= 0) {
-                ret.m_dstScreenSize.cy = (ret.m_dstScreenSize.cx == 1280)
+            if (ret.m_storageRes.cy <= 0) {
+                ret.m_storageRes.cy = (ret.m_storageRes.cx == 1280)
                                          ? 1024
-                                         : ret.m_dstScreenSize.cx * 3 / 4;
+                                         : ret.m_storageRes.cx * 3 / 4;
             }
         } else if (entry == L"screenvertical") {
             try {
-                ret.m_dstScreenSize.cy = GetInt(pszBuff, nBuffLength);
+                ret.m_storageRes.cy = GetInt(pszBuff, nBuffLength);
             } catch (...) {
-                ret.m_dstScreenSize = CSize(0, 0);
+                ret.m_storageRes = CSize(0, 0);
                 return false;
             }
 
-            if (ret.m_dstScreenSize.cx <= 0) {
-                ret.m_dstScreenSize.cx = (ret.m_dstScreenSize.cy == 1024)
+            if (ret.m_storageRes.cx <= 0) {
+                ret.m_storageRes.cx = (ret.m_storageRes.cy == 1024)
                                          ? 1280
-                                         : ret.m_dstScreenSize.cy * 4 / 3;
+                                         : ret.m_storageRes.cy * 4 / 3;
             }
         } else if (entry == L"style") {
             STSStyle* style = DEBUG_NEW STSStyle;
@@ -2261,7 +2276,9 @@ CSimpleTextSubtitle::CSimpleTextSubtitle()
     , m_encoding(CTextFile::DEFAULT_ENCODING)
     , m_provider(_T("Local"))
     , m_eHearingImpaired(Subtitle::HI_UNKNOWN)
-    , m_dstScreenSize(CSize(0, 0))
+    , m_storageRes(CSize(0, 0))
+    , m_playRes(CSize(0, 0))
+    , m_layoutRes(CSize(0, 0))
     , m_defaultWrapStyle(0)
     , m_collisions(0)
     , m_fScaledBAS(false)
@@ -2313,7 +2330,9 @@ void CSimpleTextSubtitle::Copy(CSimpleTextSubtitle& sts)
         m_mode = sts.m_mode;
         m_path = sts.m_path;
         m_subtitleType = sts.m_subtitleType;
-        m_dstScreenSize = sts.m_dstScreenSize;
+        m_storageRes = sts.m_storageRes;
+        m_playRes = sts.m_playRes;
+        m_layoutRes = sts.m_layoutRes;
         m_defaultWrapStyle = sts.m_defaultWrapStyle;
         m_collisions = sts.m_collisions;
         m_fScaledBAS = sts.m_fScaledBAS;
@@ -2399,7 +2418,9 @@ bool CSimpleTextSubtitle::CopyStyles(const CSTSStyleMap& styles, bool fAppend)
 
 void CSimpleTextSubtitle::Empty()
 {
-    m_dstScreenSize = CSize(0, 0);
+    m_storageRes = CSize(0, 0);
+    m_playRes = CSize(0, 0);
+    m_layoutRes = CSize(0, 0);
     m_styles.Free();
     m_segments.RemoveAll();
     RemoveAll();
@@ -3187,8 +3208,17 @@ bool CSimpleTextSubtitle::Open(CTextFile* f, int CharSet, CString name) {
 
             ChangeUnknownStylesToDefault();
 
-            if (m_dstScreenSize == CSize(0, 0)) {
-                m_dstScreenSize = CSize(384, 288);
+            if (m_storageRes.cx <= 0 || m_storageRes.cy <= 0) {
+                if (m_layoutRes.cx > 0 && m_layoutRes.cy > 0) {
+                    m_storageRes = m_layoutRes;
+                } else if (m_playRes.cx > 0 && m_playRes.cy > 0) {
+                    m_storageRes = m_playRes;
+                } else {
+                    m_storageRes = CSize(384, 288);
+                }
+            }
+            if (m_playRes.cx <= 0 || m_playRes.cy <= 0) {
+                m_playRes = m_storageRes;
             }
             return true;
         }
@@ -3233,8 +3263,17 @@ bool CSimpleTextSubtitle::Open(CTextFile* f, int CharSet, CString name) {
 
         ChangeUnknownStylesToDefault();
 
-        if (m_dstScreenSize == CSize(0, 0)) {
-            m_dstScreenSize = CSize(384, 288);
+        if (m_storageRes.cx <= 0 || m_storageRes.cy <= 0) {
+            if (m_layoutRes.cx > 0 && m_layoutRes.cy > 0) {
+                m_storageRes = m_layoutRes;
+            } else if (m_playRes.cx > 0 && m_playRes.cy > 0) {
+                m_storageRes = m_playRes;
+            } else {
+                m_storageRes = CSize(384, 288);
+            }
+        }
+        if (m_playRes.cx <= 0 || m_playRes.cy <= 0) {
+            m_playRes = m_storageRes;
         }
 
         return true;
@@ -3286,13 +3325,13 @@ bool CSimpleTextSubtitle::LoadASSFile(Subtitle::SubType subType) {
     GetDefaultStyle(defStyle);
     if (subType == Subtitle::SRT) {
         m_track = decltype(m_track)(srt_read_file(m_ass.get(), const_cast<char*>((const char*)(CStringA)m_path), defStyle.charSet, defStyle, subRendererSettings));
-        if (m_dstScreenSize == CSize(0, 0)) {
-            m_dstScreenSize = CSize(defStyle.SrtResX, defStyle.SrtResY);
+        if (m_storageRes == CSize(0, 0)) {
+            m_storageRes = CSize(defStyle.SrtResX, defStyle.SrtResY);
         }
     } else { //subType == Subtitle::SSA/ASS
         m_track = decltype(m_track)(ass_read_file(m_ass.get(), const_cast<char*>((const char*)(CStringA)m_path), "UTF-8"));
-        if (m_dstScreenSize == CSize(0, 0)) {
-            m_dstScreenSize = CSize(defStyle.SrtResX, defStyle.SrtResY);
+        if (m_storageRes == CSize(0, 0)) {
+            m_storageRes = CSize(defStyle.SrtResX, defStyle.SrtResY);
         }
     }
 
@@ -3517,8 +3556,12 @@ bool CSimpleTextSubtitle::SaveAs(CString fn, Subtitle::SubType type,
         } else {
             str += _T("YCbCr Matrix: ") + m_sYCbCrMatrix + _T("\n");
         }
-        str.AppendFormat(_T("PlayResX: %d\n"), m_dstScreenSize.cx);
-        str.AppendFormat(_T("PlayResY: %d\n"), m_dstScreenSize.cy);
+        str.AppendFormat(_T("PlayResX: %d\n"), m_playRes.cx);
+        str.AppendFormat(_T("PlayResY: %d\n"), m_playRes.cy);
+        if (m_layoutRes.cx > 0 && m_layoutRes.cy > 0) {
+            str.AppendFormat(_T("LayoutResX: %d\n"), m_layoutRes.cx);
+            str.AppendFormat(_T("LayoutResY: %d\n"), m_layoutRes.cy);
+        }
         str += _T("Timer: 100.0000\n");
         str += _T("\n");
         str += (type == Subtitle::SSA)
@@ -3677,7 +3720,7 @@ bool CSimpleTextSubtitle::SaveAs(CString fn, Subtitle::SubType type,
         str += _T("PlayResY: %d\n");
         str += _T("\n");
         str += _T("[V4+ Styles]\nFormat: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding\n");
-        str2.Format(str, m_dstScreenSize.cx, m_dstScreenSize.cy);
+        str2.Format(str, m_storageRes.cx, m_storageRes.cy);
         file.WriteString(str2);
 
         str  = _T("Style: Default,%s,%d,&H%08x,&H%08x,&H%08x,&H%08x,%d,%d,%d,%d,%.2f,%.2f,%.2f,%.2f,%d,%.2f,%.2f,%d,%d,%d,%d,%d\n");
diff --git a/src/Subtitles/STS.h b/src/Subtitles/STS.h
@@ -160,7 +160,10 @@ class CSimpleTextSubtitle : public CAtlArray<STSEntry>
 
     Subtitle::HearingImpairedType m_eHearingImpaired;
 
-    CSize m_dstScreenSize;
+    CSize m_storageRes;
+    CSize m_playRes;
+    CSize m_layoutRes;
+
     int m_defaultWrapStyle;
     int m_collisions;
     bool m_fScaledBAS;
diff --git a/src/Subtitles/SubtitleInputPin.cpp b/src/Subtitles/SubtitleInputPin.cpp
@@ -89,8 +89,7 @@ HRESULT CSubtitleInputPin::CompleteConnect(IPin* pReceivePin)
             return E_FAIL;
         }
         CRenderedTextSubtitle* pRTS = (CRenderedTextSubtitle*)(ISubStream*)m_pSubStream;
-        pRTS->m_name = CString(GetPinName(pReceivePin)) + _T(" (embeded)");
-        pRTS->m_dstScreenSize = CSize(384, 288);
+        pRTS->m_name = CString(GetPinName(pReceivePin)) + _T(" (embedded)");
         pRTS->CreateDefaultStyle(DEFAULT_CHARSET);
     } else if (m_mt.majortype == MEDIATYPE_Subtitle) {
         SUBTITLEINFO* psi = (SUBTITLEINFO*)m_mt.pbFormat;
@@ -147,7 +146,7 @@ HRESULT CSubtitleInputPin::CompleteConnect(IPin* pReceivePin)
             if (lcid > 0) {
                 pRTS->m_langname = ISOLang::LCIDToLanguage(lcid);
             }
-            pRTS->m_dstScreenSize = CSize(384, 288);
+            pRTS->m_playRes = CSize(384, 288);
             pRTS->CreateDefaultStyle(DEFAULT_CHARSET);
 
             if (m_mt.subtype == MEDIASUBTYPE_WEBVTT) {
diff --git a/src/Subtitles/USFSubtitles.cpp b/src/Subtitles/USFSubtitles.cpp
@@ -301,7 +301,7 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts)
 {
     sts.m_name = metadata.language.text;
     sts.m_encoding = CTextFile::UTF8;
-    sts.m_dstScreenSize = CSize(640, 480);
+    sts.m_playRes = CSize(640, 480);
     sts.m_fScaledBAS = false;
     sts.m_defaultWrapStyle = 1;
 
@@ -325,10 +325,10 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts)
         }
 
         if (!s->pal.horizontal_margin.IsEmpty()) {
-            stss->marginRect.left = stss->marginRect.right = TranslateMargin(s->pal.horizontal_margin, sts.m_dstScreenSize.cx);
+            stss->marginRect.left = stss->marginRect.right = TranslateMargin(s->pal.horizontal_margin, sts.m_playRes.cx);
         }
         if (!s->pal.vertical_margin.IsEmpty()) {
-            stss->marginRect.top = stss->marginRect.bottom = TranslateMargin(s->pal.vertical_margin, sts.m_dstScreenSize.cy);
+            stss->marginRect.top = stss->marginRect.bottom = TranslateMargin(s->pal.vertical_margin, sts.m_playRes.cy);
         }
 
         stss->scrAlignment = TranslateAlignment(s->pal.alignment);
@@ -406,10 +406,10 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts)
         marginRect.SetRectEmpty();
 
         if (!t->pal.horizontal_margin.IsEmpty()) {
-            marginRect.left = marginRect.right = TranslateMargin(t->pal.horizontal_margin, sts.m_dstScreenSize.cx);
+            marginRect.left = marginRect.right = TranslateMargin(t->pal.horizontal_margin, sts.m_storageRes.cx);
         }
         if (!t->pal.vertical_margin.IsEmpty()) {
-            marginRect.top = marginRect.bottom = TranslateMargin(t->pal.vertical_margin, sts.m_dstScreenSize.cy);
+            marginRect.top = marginRect.bottom = TranslateMargin(t->pal.vertical_margin, sts.m_storageRes.cy);
         }
 
         WCHAR rtags[3][8] = {L"{\\rz%d}", L"{\\rx%d}", L"{\\ry%d}"};
diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp
@@ -1720,7 +1720,7 @@ HRESULT CVobSubSettings::Render(SubPicDesc& spd, RECT& bbox)
     /*
         CRenderedTextSubtitle rts(nullptr);
         rts.CreateDefaultStyle(DEFAULT_CHARSET);
-        rts.m_dstScreenSize.SetSize(m_size.cx, m_size.cy);
+        rts.m_storageRes.SetSize(m_size.cx, m_size.cy);
         CStringW assstr;
         m_img.Polygonize(assstr, false);
         REFERENCE_TIME rtStart = 10000i64*m_img.start, rtStop = 10000i64*(m_img.start+m_img.delay);
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts)`
`301`	`301`	`{`
`302`	`302`	`sts.m_name = metadata.language.text;`
`303`	`303`	`sts.m_encoding = CTextFile::UTF8;`
`304`		`- sts.m_dstScreenSize = CSize(640, 480);`
	`304`	`+ sts.m_playRes = CSize(640, 480);`
`305`	`305`	`sts.m_fScaledBAS = false;`
`306`	`306`	`sts.m_defaultWrapStyle = 1;`
`307`	`307`
`@@ -325,10 +325,10 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`if (!s->pal.horizontal_margin.IsEmpty()) {`
`328`		`- stss->marginRect.left = stss->marginRect.right = TranslateMargin(s->pal.horizontal_margin, sts.m_dstScreenSize.cx);`
	`328`	`+ stss->marginRect.left = stss->marginRect.right = TranslateMargin(s->pal.horizontal_margin, sts.m_playRes.cx);`
`329`	`329`	`}`
`330`	`330`	`if (!s->pal.vertical_margin.IsEmpty()) {`
`331`		`- stss->marginRect.top = stss->marginRect.bottom = TranslateMargin(s->pal.vertical_margin, sts.m_dstScreenSize.cy);`
	`331`	`+ stss->marginRect.top = stss->marginRect.bottom = TranslateMargin(s->pal.vertical_margin, sts.m_playRes.cy);`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`stss->scrAlignment = TranslateAlignment(s->pal.alignment);`
`@@ -406,10 +406,10 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts)`
`406`	`406`	`marginRect.SetRectEmpty();`
`407`	`407`
`408`	`408`	`if (!t->pal.horizontal_margin.IsEmpty()) {`
`409`		`- marginRect.left = marginRect.right = TranslateMargin(t->pal.horizontal_margin, sts.m_dstScreenSize.cx);`
	`409`	`+ marginRect.left = marginRect.right = TranslateMargin(t->pal.horizontal_margin, sts.m_storageRes.cx);`
`410`	`410`	`}`
`411`	`411`	`if (!t->pal.vertical_margin.IsEmpty()) {`
`412`		`- marginRect.top = marginRect.bottom = TranslateMargin(t->pal.vertical_margin, sts.m_dstScreenSize.cy);`
	`412`	`+ marginRect.top = marginRect.bottom = TranslateMargin(t->pal.vertical_margin, sts.m_storageRes.cy);`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`WCHAR rtags[3][8] = {L"{\\rz%d}", L"{\\rx%d}", L"{\\ry%d}"};`