Changeset a83a3579b82d4e219f5f7be58d9036d42f7cbb85

Timestamp:

10/10/07 05:41:17 (1 year ago)

Author:

Bernie Purcell <bitmap@videolan.org>

git-committer:

Bernie Purcell <bitmap@videolan.org> 1191987677 +0000

git-parent:

[8418d9e545cfc04cc9f07dad7e18826939bdd249]

git-author:

Bernie Purcell <bitmap@videolan.org> 1191987677 +0000

Message:

Attempt to stop subtitles going off screen in some formats, when
width and height are specified in the subtitles stream. This may
result in chunkier text in some instances, but it should get it
back on screen at least. Will look into smoothing it out next.

Files:

• src/video_output/vout_subpictures.c (modified) (4 diffs)

src/video_output/vout_subpictures.c

@@ -525 +525 @@
-        int k;
-
+        /* If the source video and subtitles stream agree on the size of
+         * the video then disregard all further references to the subtitle
+         * stream.
+         */
+        if( ( i_source_video_height == p_subpic->i_original_picture_height ) &&
+            ( i_source_video_width  == p_subpic->i_original_picture_width ) )
+        {
+            p_subpic->i_original_picture_height = 0;
+            p_subpic->i_original_picture_width = 0;
+        }
+
-        for( k = 0; k < SCALE_SIZE ; k++ )
-            pi_subpic_x[ k ] = p_subpic->i_x;
@@ -600 +611 @@
-                ( ( p_text_region->i_align & SUBPICTURE_RENDERED ) == 0 ) )
-            {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -619 +643 @@
-                                          p_spu->p_text->fmt_out.video.i_height;
-        }
+        /* If we have an explicit size plane to render to, then turn off
+         * the fontsize rescaling.
+         */
+        if( (p_subpic->i_original_picture_height > 0) &&
+            (p_subpic->i_original_picture_width  > 0) )
+        {
+            i_scale_width_orig  = 1000;
+            i_scale_height_orig = 1000;
+        }
-
-        for( k = 0; k < SCALE_SIZE ; k++ )
-        {
+            /* Case of both width and height being specified has been dealt with
+             * above by instead rendering to an output pane of the explicit
+             * dimensions specified - we don't need to scale it.
+             */
-            if( (p_subpic->i_original_picture_height > 0) &&
-
-
-
-
-
-
-
-
+
-            {
-                pi_scale_height[ k ] = pi_scale_height[ k ] * i_source_video_height /
@@ -638 +668 @@
-            }
-        }
+
-
-        /* Set default subpicture aspect ratio */