include/vlc_subpicture.h

@@ -72,9 +72,10 @@ struct subpicture_region_t
     picture_t       *p_picture;          /**< picture comprising this region */
 
     bool            b_absolute;       /**< position is absolute in the movie */
+    bool            b_in_window;          /**< position the region in window */
     int             i_x;      /**< position of region, relative to alignment */
     int             i_y;      /**< position of region, relative to alignment */
-    int             i_align;                  /**< alignment flags of region */
+    int             i_align;       /**< alignment flags SUBPICTURE_ALIGN_xxx */
     int             i_alpha;                               /**< transparency */
 
     /* Parameters for text regions (p_picture to be rendered) */
@@ -174,10 +175,14 @@ struct vlc_spu_updater_configuration
     const video_format_t *video_src;
     // scaled video format of the video under the SPU
     const video_format_t *video_dst;
+    unsigned  display_width;
+    unsigned  display_height;
+
     // source video format of the previous vlc_spu_updater_ops.update call
     const video_format_t *prev_src;
     // scaled video format of the previous vlc_spu_updater_ops.update call
     const video_format_t *prev_dst;
+
     // timestamp when the SPU will be displayed, between i_start and i_stop
     // for subtitles
     vlc_tick_t           pts;
@@ -311,7 +316,8 @@ VLC_API subpicture_t * subpicture_NewFromPicture( vlc_object_t *, picture_t *, v
  * This function will update the content of a subpicture created with
  * a non NULL subpicture_updater_t.
  */
-VLC_API void subpicture_Update( subpicture_t *, const video_format_t *src, const video_format_t *, vlc_tick_t );
+VLC_API void subpicture_Update( subpicture_t *, const video_format_t *src, const video_format_t *,
+    unsigned display_width, unsigned display_height, vlc_tick_t );
 
 /**
  * This function will blend a given subpicture onto a picture.

modules/access/bluray.c

@@ -1615,7 +1615,7 @@ static void subpictureUpdaterUpdate(subpicture_t *p_subpic,
         if (p_dst == NULL)
             break;
 
-        p_dst->b_absolute = p_src->b_absolute;
+        p_dst->b_absolute = true; p_dst->b_in_window = false;
         p_dst->i_x      = p_src->i_x;
         p_dst->i_y      = p_src->i_y;
         // fields not modified on the source
@@ -1872,7 +1872,6 @@ static void blurayDrawOverlay(demux_t *p_demux, const BD_OVERLAY* const eventov)
 
         p_reg = subpicture_region_New(&fmt);
         if (p_reg) {
-            p_reg->b_absolute = true;
             p_reg->i_x = eventov->x;
             p_reg->i_y = eventov->y;
             /* Append it to our list. */
@@ -1993,7 +1992,6 @@ static void blurayDrawArgbOverlay(demux_t *p_demux, const BD_ARGB_OVERLAY* const
             vlc_mutex_unlock(&ov->lock);
             return;
         }
-        p_reg->b_absolute = true;
         p_reg->i_x = 0;
         p_reg->i_y = 0;
         vlc_spu_regions_push(&ov->regions, p_reg);

modules/codec/arib/libaribcaption.c

@@ -178,7 +178,7 @@ static void SubpictureUpdate(subpicture_t *p_subpic,
         if (!region)
             break;
 
-        region->b_absolute = true;
+        region->b_absolute = true; region->b_in_window = false;
         region->i_x = image->dst_x;
         region->i_y = image->dst_y;
         region->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;

modules/codec/arib/substext.h

@@ -73,7 +73,7 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
         r->fmt.i_sar_den = 1;
 
         r->p_text = text_segment_New( p_region->psz_text );
-        r->b_absolute = true;
+        r->b_absolute = true; r->b_in_window = false;
         r->i_align  = SUBPICTURE_ALIGN_LEFT | SUBPICTURE_ALIGN_TOP;
 
         if (p_region->i_planewidth > 0 && p_region->i_planeheight > 0)

modules/codec/avcodec/subtitle.c

@@ -285,7 +285,7 @@ static subpicture_region_t *ConvertRegionRGBA(AVSubtitleRect *ffregion)
     if (!region)
         return NULL;
 
-    region->b_absolute = true; /* We have offset and size for subtitle */
+    region->b_absolute = true; region->b_in_window = false; /* We have offset and size for subtitle */
     region->i_x = ffregion->x;
     region->i_y = ffregion->y;
     region->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;

modules/codec/cc.c

@@ -511,7 +511,7 @@ static subpicture_t *Subtitle( decoder_t *p_dec, eia608_t *h, vlc_tick_t i_pts )
     /* Set first region defaults */
     /* The "leavetext" alignment is a special mode where the subpicture
        region itself gets aligned, but the text inside it does not */
-    p_spu_sys->region.b_absolute = false;
+    p_spu_sys->region.b_absolute = false; p_spu_sys->region.b_in_window = false;
     p_spu_sys->region.align = SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_LEFT;
     p_spu_sys->region.inner_align = SUBPICTURE_ALIGN_BOTTOM|SUBPICTURE_ALIGN_LEFT;
     p_spu_sys->region.flags = UPDT_REGION_IGNORE_BACKGROUND | UPDT_REGION_USES_GRID_COORDINATES;

modules/codec/cea708.c

@@ -1050,7 +1050,7 @@ static void CEA708SpuConvert( const cea708_window_t *p_w,
                              (CEA708_SCREEN_ROWS * CEA708_FONT_TO_LINE_HEIGHT_RATIO);
     }
     p_region->flags |= UPDT_REGION_ORIGIN_X_IS_RATIO|UPDT_REGION_ORIGIN_Y_IS_RATIO;
-    p_region->b_absolute = false;
+    p_region->b_absolute = false; p_region->b_in_window = false;
 
     if( p_w->i_firstrow <= p_w->i_lastrow )
     {

modules/codec/cvdsub.c

@@ -542,7 +542,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data )
     }
 
     vlc_spu_regions_push(&p_spu->regions, p_region);
-    p_region->b_absolute = true;
+    p_region->b_absolute = true; p_region->b_in_window = false;
     p_region->i_x = p_sys->i_x_start;
     p_region->i_x = p_region->i_x * 3 / 4; /* FIXME: use aspect ratio for x? */
     p_region->i_y = p_sys->i_y_start;

modules/codec/dvbsub.c

@@ -1611,7 +1611,7 @@ static subpicture_t *render( decoder_t *p_dec )
             msg_Err( p_dec, "cannot allocate SPU region" );
             continue;
         }
-        p_spu_region->b_absolute = true;
+        p_spu_region->b_absolute = true; p_spu_region->b_in_window = false;
         p_spu_region->i_x = i_base_x + p_regiondef->i_x;
         p_spu_region->i_y = i_base_y + p_regiondef->i_y;
         p_spu_region->i_align = p_sys->i_spu_position;
@@ -1652,7 +1652,7 @@ static subpicture_t *render( decoder_t *p_dec )
             p_spu_region->fmt.i_height = p_spu_region->fmt.i_visible_height = p_region->i_height;
 
             p_spu_region->p_text = text_segment_New( p_object_def->psz_text );
-            p_spu_region->b_absolute = true;
+            p_spu_region->b_absolute = true; p_spu_region->b_in_window = false;
             p_spu_region->i_x = i_base_x + p_regiondef->i_x + p_object_def->i_x;
             p_spu_region->i_y = i_base_y + p_regiondef->i_y + p_object_def->i_y;
             p_spu_region->i_align = p_sys->i_spu_position;

modules/codec/kate.c

@@ -1153,10 +1153,12 @@ static subpicture_t *SetupSimpleKateSPU( decoder_t *p_dec, subpicture_t *p_spu,
     SetupText( p_dec, p_region, ev );
 
     /* default positioning */
-    p_region->b_absolute = false;
+    p_region->b_absolute = false; p_region->b_in_window = false;
 #ifdef HAVE_TIGER
     if( p_sys->b_use_tiger)
-        p_region->b_absolute = true;
+    {
+        p_region->b_absolute = true; p_region->b_in_window = false;
+    }
 #endif
     p_region->i_align = SUBPICTURE_ALIGN_BOTTOM;
     if (p_bitmap_region)
@@ -1173,7 +1175,7 @@ static subpicture_t *SetupSimpleKateSPU( decoder_t *p_dec, subpicture_t *p_spu,
     {
         if (kin.has.region)
         {
-            p_region->b_absolute = true;
+            p_region->b_absolute = true; p_region->b_in_window = false;
             p_region->i_x = kin.region_x;
             p_region->i_y = kin.region_y;
             if (p_bitmap_region)
@@ -1190,6 +1192,7 @@ static subpicture_t *SetupSimpleKateSPU( decoder_t *p_dec, subpicture_t *p_spu,
     if (p_bitmap_region)
     {
         p_bitmap_region->b_absolute = p_region->b_absolute;
+        p_bitmap_region->b_in_window = p_region->b_in_window;
         vlc_spu_regions_push(&p_spu->regions, p_bitmap_region);
     }
     vlc_spu_regions_push(&p_spu->regions, p_region);

modules/codec/libass.c

@@ -495,7 +495,7 @@ static void SubpictureUpdate( subpicture_t *p_subpic,
         r = subpicture_region_New( &fmt_region );
         if( !r )
             break;
-        r->b_absolute = true;
+        r->b_absolute = true; r->b_in_window = false;
         r->i_x = region[i].x0;
         r->i_y = region[i].y0;
         r->i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT;

modules/codec/scte18.c

@@ -195,7 +195,7 @@ static int Decode( decoder_t *p_dec, block_t *p_block )
 
             p_spu->b_ephemer  = true;
 
-            p_spu_sys->region.b_absolute = false;
+            p_spu_sys->region.b_absolute = false; p_spu_sys->region.b_in_window = false;
             p_spu_sys->region.inner_align = SUBPICTURE_ALIGN_TOP;
             p_spu_sys->p_default_style->i_style_flags = STYLE_BOLD | STYLE_BACKGROUND;
             p_spu_sys->p_default_style->i_features |= STYLE_HAS_FLAGS;

modules/codec/scte27.c

@@ -389,7 +389,7 @@ static subpicture_t *DecodeSubtitleMessage(decoder_t *dec,
         frame_duration = VLC_TICK_FROM_MS(40);
         break;
     }
-    region->b_absolute = true;
+    region->b_absolute = true; region->b_in_window = false;
     if (!pre_clear_display)
         msg_Warn(dec, "SCTE-27 subtitles without pre_clear_display flag are not well supported");
     sub->b_ephemer = true;

modules/codec/spudec/parse.c

@@ -886,7 +886,7 @@ static int Render( decoder_t *p_dec, subpicture_t *p_spu,
     }
     vlc_spu_regions_push(&p_spu->regions, p_region);
 
-    p_region->b_absolute = true;
+    p_region->b_absolute = true; p_region->b_in_window = false;
     p_region->i_x = p_spu_properties->i_x;
     p_region->i_y = p_spu_properties->i_y + p_spu_data->i_y_top_offset;
     p_p = p_region->p_picture->p->p_pixels;

modules/codec/stl.c

@@ -344,6 +344,7 @@ static void FillSubpictureUpdater(stl_sg_t *p_group, subtext_updater_sys_t *p_sp
     }
 
     p_spu_sys->region.b_absolute = false;
+    p_spu_sys->region.b_in_window = false;
     p_spu_sys->region.align = SUBPICTURE_ALIGN_BOTTOM;
     if(p_group->i_justify == 0x01)
         p_spu_sys->region.inner_align = SUBPICTURE_ALIGN_LEFT;

modules/codec/subsdec.c

@@ -462,6 +462,7 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
     p_spu_sys->region.p_segments = ParseSubtitles( &i_inline_align, psz_subtitle );
     free( psz_subtitle );
     p_spu_sys->region.b_absolute = false;
+    p_spu_sys->region.b_in_window = true;
     if( p_sys->i_align >= 0 ) /* bottom ; left, right or centered */
     {
         p_spu_sys->region.align = SUBPICTURE_ALIGN_BOTTOM | p_sys->i_align;

modules/codec/substext.h

@@ -48,7 +48,8 @@ struct substext_updater_region_t
     /* store above percentile meanings as modifier flags */
     int flags; /* subpicture_updater_sys_region_flags_e */
     int align; /* alignment of the region itself */
-    bool b_absolute; /* position absolute to the video coordinates */
+    bool b_absolute;  /**< position is absolute in the movie */
+    bool b_in_window; /**< position the region in whole window */
     int inner_align; /* alignment of content inside the region */
     text_style_t *p_region_style;
     text_segment_t *p_segments;
@@ -77,7 +78,9 @@ static inline void SubpictureUpdaterSysRegionInit(substext_updater_region_t *p_u
 {
     memset(p_updtregion, 0, sizeof(*p_updtregion));
     p_updtregion->align = SUBPICTURE_ALIGN_BOTTOM;
-    p_updtregion->inner_align = 0;
+    p_updtregion->b_absolute = false;
+    p_updtregion->b_in_window = false;
+    p_updtregion->inner_align = 0 ; // centered
 }
 
 static inline substext_updater_region_t *SubpictureUpdaterSysRegionNew( void )
@@ -142,6 +145,20 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
     {
         sar.num = 4;
         sar.den = 3;
+    }
+    else
+    {
+        sar.num = 1;
+        sar.den = 1;
+    }
+
+    if ( p_updtregion->b_in_window )
+    {
+        subpic->i_original_picture_width  = cfg->display_width;
+        subpic->i_original_picture_height = cfg->display_height;
+    }
+    else if( sys->region.flags & UPDT_REGION_USES_GRID_COORDINATES )
+    {
         subpic->i_original_picture_width  = fmt_dst->i_visible_height * sar.num / sar.den;
         subpic->i_original_picture_height = fmt_dst->i_visible_height;
     }
@@ -149,12 +166,18 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
     {
         subpic->i_original_picture_width  = fmt_dst->i_width * fmt_dst->i_sar_num / fmt_dst->i_sar_den;
         subpic->i_original_picture_height = fmt_dst->i_height;
-        sar.num = 1;
-        sar.den = 1;
     }
 
     bool b_schedule_blink_update = false;
 
+    video_format_t render_fmt = *fmt_dst;
+    if (p_updtregion->b_in_window)
+    {
+        render_fmt.i_x_offset = render_fmt.i_y_offset = 0;
+        render_fmt.i_width  = render_fmt.i_visible_width  = cfg->display_width;
+        render_fmt.i_height = render_fmt.i_visible_height = cfg->display_height;
+    }
+
     for( substext_updater_region_t *update_region = &sys->region;
                                     update_region; update_region = update_region->p_next )
     {
@@ -167,6 +190,7 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
 
         r->p_text = text_segment_Copy( update_region->p_segments );
         r->b_absolute = update_region->b_absolute;
+        r->b_in_window = update_region->b_in_window;
         r->i_align = update_region->align;
         r->text_flags |= update_region->inner_align & SUBPICTURE_ALIGN_MASK;
         if (update_region->flags & UPDT_REGION_IGNORE_BACKGROUND)
@@ -179,25 +203,25 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
         {
             const float margin_ratio = sys->margin_ratio;
             const int   margin_h     = margin_ratio * ( b_gridmode ? subpic->i_original_picture_width
-                                                                   : fmt_dst->i_visible_width );
-            const int   margin_v     = margin_ratio * fmt_dst->i_visible_height;
+                                                                   : render_fmt.i_visible_width );
+            const int   margin_v     = margin_ratio * render_fmt.i_visible_height;
 
             /* subpic invisible margins sizes */
-            const int outerright_h = fmt_dst->i_width - (fmt_dst->i_visible_width + fmt_dst->i_x_offset);
-            const int outerbottom_v = fmt_dst->i_height - (fmt_dst->i_visible_height + fmt_dst->i_y_offset);
+            const int outerright_h = render_fmt.i_width - (render_fmt.i_visible_width + render_fmt.i_x_offset);
+            const int outerbottom_v = render_fmt.i_height - (render_fmt.i_visible_height + render_fmt.i_y_offset);
             /* regions usable */
-            const int inner_w = fmt_dst->i_visible_width - margin_h * 2;
-            const int inner_h = fmt_dst->i_visible_height - margin_v * 2;
+            const int inner_w = render_fmt.i_visible_width - margin_h * 2;
+            const int inner_h = render_fmt.i_visible_height - margin_v * 2;
 
             if (r->i_align & SUBPICTURE_ALIGN_LEFT)
-                r->i_x = margin_h + fmt_dst->i_x_offset;
+                r->i_x = margin_h + render_fmt.i_x_offset;
             else if (r->i_align & SUBPICTURE_ALIGN_RIGHT)
                 r->i_x = margin_h + outerright_h;
             else
                 r->i_x = 0;
 
             if (r->i_align & SUBPICTURE_ALIGN_TOP )
-                r->i_y = margin_v + fmt_dst->i_y_offset;
+                r->i_y = margin_v + render_fmt.i_y_offset;
             else if (r->i_align & SUBPICTURE_ALIGN_BOTTOM )
                 r->i_y = margin_v + outerbottom_v;
             else
@@ -225,8 +249,8 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
 
         } else {
             /* FIXME it doesn't adapt on crop settings changes */
-            r->i_x = update_region->origin.x * fmt_dst->i_width  / update_region->extent.x;
-            r->i_y = update_region->origin.y * fmt_dst->i_height / update_region->extent.y;
+            r->i_x = update_region->origin.x * render_fmt.i_width  / update_region->extent.x;
+            r->i_y = update_region->origin.y * render_fmt.i_height / update_region->extent.y;
         }
 
         /* Add missing default style, if any, to all segments */
@@ -318,7 +342,7 @@ static inline subpicture_t *decoder_NewSubpictureText(decoder_t *decoder)
         text_style_Delete(sys->p_default_style);
         free(sys);
     }
-    sys->region.b_absolute = true;
+    sys->region.b_absolute = true; sys->region.b_in_window = false;
     sys->i_next_update = VLC_TICK_INVALID;
     return subpic;
 }

modules/codec/substx3g.c

@@ -415,7 +415,7 @@ static int Decode( decoder_t *p_dec, block_t *p_block )
     p_spu->i_stop     = p_block->i_pts + p_block->i_length;
     p_spu->b_ephemer  = (p_block->i_length == 0);
 
-    p_spu_sys->region.b_absolute = false;
+    p_spu_sys->region.b_absolute = false; p_spu_sys->region.b_in_window = false;
     p_spu_sys->region.align = SUBPICTURE_ALIGN_BOTTOM;
 
     text_style_Merge( p_spu_sys->p_default_style, p_root_style, true );

modules/codec/subsusf.c

@@ -65,6 +65,7 @@ enum
     ATTRIBUTE_X_PERCENT = (1 << 2),
     ATTRIBUTE_Y         = (1 << 3),
     ATTRIBUTE_Y_PERCENT = (1 << 4),
+    ATTRIBUTE_REL_WINDOW = (1 << 5),
 };
 
 typedef struct
@@ -325,8 +326,8 @@ static int ParsePositionAttributeList( char *psz_subtitle, int *i_align,
     char *psz_align    = GrabAttributeValue( "alignment", psz_subtitle );
     char *psz_margin_x = GrabAttributeValue( "horizontal-margin", psz_subtitle );
     char *psz_margin_y = GrabAttributeValue( "vertical-margin", psz_subtitle );
-    /* -- UNSUPPORTED
     char *psz_relative = GrabAttributeValue( "relative-to", psz_subtitle );
+    /* -- UNSUPPORTED
     char *psz_rotate_x = GrabAttributeValue( "rotate-x", psz_subtitle );
     char *psz_rotate_y = GrabAttributeValue( "rotate-y", psz_subtitle );
     char *psz_rotate_z = GrabAttributeValue( "rotate-z", psz_subtitle );
@@ -380,6 +381,13 @@ static int ParsePositionAttributeList( char *psz_subtitle, int *i_align,
 
         free( psz_margin_y );
     }
+    if( psz_relative )
+    {
+        if( !strcasecmp( "Window", psz_relative ) )
+            i_mask |= ATTRIBUTE_REL_WINDOW;
+
+        free( psz_relative );
+    }
     return i_mask;
 }
 
@@ -392,6 +400,10 @@ static void SetupPositions( subpicture_region_t *p_region, char *psz_subtitle )
     i_mask = ParsePositionAttributeList( psz_subtitle, &i_align, &i_x, &i_y );
 
     p_region->b_absolute = false;
+    if( i_mask & ATTRIBUTE_REL_WINDOW )
+        p_region->b_in_window = true;
+    else
+        p_region->b_in_window = false;
     if( i_mask & ATTRIBUTE_ALIGNMENT )
         p_region->i_align = i_align;
 

modules/codec/svcdsub.c

@@ -493,7 +493,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data )
     }
 
     vlc_spu_regions_push(&p_spu->regions, p_region);
-    p_region->b_absolute = true;
+    p_region->b_absolute = true; p_region->b_in_window = false;
     p_region->i_x = p_sys->i_x_start;
     p_region->i_y = p_sys->i_y_start;