Changeset 05f98788679813a111a48589f12699043e461313

Timestamp:

01/01/04 16:56:56 (5 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

Rocky Bernstein <rocky@videolan.org> 1072972616 +0000

git-parent:

[7d705ffcb6bb575f483569b75885b1b4fe263467]

git-author:

Rocky Bernstein <rocky@videolan.org> 1072972616 +0000

Message:

RenderRV16 handles scaling. But seems to slow to render subtitles.

Files:

• modules/codec/ogt/render.c (modified) (7 diffs)

modules/codec/ogt/render.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003 VideoLAN
-6 2004/01/01 13:51:38
+7 2004/01/01 15:56:56
- *
- * Author: Rocky Bernstein 
@@ -315 +315 @@
-    /* Common variables */
-    uint8_t *p_pixel_base;
-
+
+
-
-    int i_x, i_y;
@@ -324 +325 @@
-    /* Crop-specific */
-    int i_x_start, i_y_start, i_x_end, i_y_end;
+
+    struct subpicture_sys_t *p_sys = p_spu->p_sys;
+
+    dbg_print( (DECODE_DBG_CALL|DECODE_DBG_RENDER), 
+           "spu width: %d, height %d, scaled (%d, %d)", 
+           p_spu->i_width,  p_spu->i_height, 
+           p_vout->output.i_width, p_vout->output.i_height );
-
-    i_xscale = ( p_vout->output.i_width << 6 ) / p_vout->render.i_width;
@@ -344 +352 @@
-    for( i_y = 0 ; i_y < i_height ; )
-    {
+        int i_y_src = (i_y / i_yscale) * p_spu->i_width;
-        i_ytmp = i_y >> 6;
-        i_y += i_yscale;
+
-
-        /* Check whether we need to draw one line or more than one */
-        if( i_ytmp + 1 >= ( i_y >> 6 ) )
-        {
+
-            /* Just one line : we precalculate i_y >> 6 */
-            i_yreal = p_pic->p->i_pitch * i_ytmp;
-
-            /* Draw until we reach the end of the line */
-, p_source++
+
-            {
+          ogt_yuvt_t *p_source;
+
-          if( b_crop
-          && ( i_x < i_x_start || i_x > i_x_end
@@ -362 +375 @@
-          continue;
-                }
+
+          p_source = &p_src_start[i_y_src + ((i_width - i_x) / i_xscale)];
+
+          if (p_source >= p_src_end) {
+        msg_Err( p_vout, "Trying to access beyond subtitle %d x %d %d",
+             (i_width - i_x) / i_xscale, i_y / i_yscale, i_height);
+        return;
+          }
-          
-          switch( p_source->s.t )
@@ -405 +426 @@
-
-            /* Draw until we reach the end of the line */
-, p_source++
+
-            {
+          ogt_yuvt_t *p_source;
+
-          if( b_crop
-          && ( i_x < i_x_start || i_x > i_x_end
@@ -413 +436 @@
-          continue;
-                }
+          
+          p_source = &p_src_start[i_y_src + ((i_width - i_x) / i_xscale)];
+
+          if (p_source >= p_src_end) {
+        msg_Err( p_vout, "Trying to access beyond subtitle %d x %d %d",
+             (i_width - i_x) / i_xscale, i_y / i_yscale, i_height);
+        return;
+          }
-          
-          switch( p_source->s.t )