Ticket #466: mplayer.rollup.patch

libmpdemux/demux_ty_osd.c

@@ -46 +46 @@
 #define TY_CCPAINTON  (  1 )
 
 #define TY_CC_MAX_X   ( 45 )
+#define TY_CC_MAX_Y   (  4 )
 
 static int      TY_CC_CUR_X;
 static int      TY_CC_CUR_Y;
@@ -114 +115 @@
            cy = SUB_MAX_TEXT - TY_CC_Y_Offset - 1;
    }
 
-        // printf( "Calling ty_DrawChar() x:%d y:%d %c fg:%d bg:%d\n",
-        //      cx, cy, disChar, fgColor, bgColor );
+        // printf( "Calling ty_DrawChar() x:%d y:%d '%c' fg:%d bg:%d\n",
+        //      cx, cy, disChar, fgColor, bgColor );
 
    ty_OSD2.text[ TY_CC_Y_Offset + cy ][ cx ] = disChar;
    memset( &( ty_OSD2.text[ TY_CC_Y_Offset + cy ][ cx + 1 ] ), ' ',
@@ -150 +151 @@
 
         for ( index = 0 ; index < numLines ; index++ )
         {
-                strcpy( ty_OSD1.text[ TY_CC_Y_Offset + dest ],
-                        ty_OSD1.text[ TY_CC_Y_Offset + source ] );
+                strcpy( ty_OSD2.text[ TY_CC_Y_Offset + dest ],
+                        ty_OSD2.text[ TY_CC_Y_Offset + source ] );
            dest++;
                 source++;
         }
-        memset( ty_OSD1.text[ TY_CC_Y_Offset + source - 1 ], ' ', TY_CC_MAX_X - 1 );
-        ty_OSD1.text[ TY_CC_Y_Offset + source - 1 ][ TY_CC_MAX_X - 1 ] = 0;
+        memset( ty_OSD2.text[ TY_CC_Y_Offset + source - 1 ], ' ', TY_CC_MAX_X - 1 );
+        ty_OSD2.text[ TY_CC_Y_Offset + source - 1 ][ TY_CC_MAX_X - 1 ] = 0;
 }
 
 static void ty_drawchar( char c )
@@ -252 +253 @@
          TY_CC_CUR_Y = CC_row[ ( ( b1 << 1 ) & 14 ) | ( ( b2 >> 5 ) & 1 ) ];
 
                         // Offset into MPlayer's Buffer
-                        if ( ( TY_CC_CUR_Y >= 1 ) && ( TY_CC_CUR_Y <= 4 ) )
+                        if ( TY_CC_stat > TY_CCPAINTON ) {
+                                TY_CC_CUR_Y = TY_CC_MAX_Y;
+                                TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 1;
+                        }
+                        else if ( ( TY_CC_CUR_Y >= 1 ) && ( TY_CC_CUR_Y <= 4 ) )
                         {
                                 TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 1;
                         }
-                        if ( ( TY_CC_CUR_Y >= 5 ) && ( TY_CC_CUR_Y <= 10 ) )
+                        else if ( ( TY_CC_CUR_Y >= 5 ) && ( TY_CC_CUR_Y <= 10 ) )
                         {
                                 TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 5;
                         }
-                        if ( ( TY_CC_CUR_Y >= 12 ) && ( TY_CC_CUR_Y <= 15 ) )
+                        else if ( ( TY_CC_CUR_Y >= 12 ) && ( TY_CC_CUR_Y <= 15 ) )
                         {
                                 TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 12;
                         }
@@ -384 +389 @@
                   {
                      if ( TY_CC_stat == TY_CCPOPUP ) ty_ClearOSD( 1, 2 );
                      TY_CC_stat = b2 - 0x23;
-                     if ( TY_CC_CUR_Y < TY_CC_stat ) TY_CC_CUR_Y = TY_CC_stat;
+                     TY_CC_CUR_Y = TY_CC_MAX_Y;
+                     TY_CC_Y_Offset = SUB_MAX_TEXT - 5 - 1;
                      break;
                   }