Clean up a bit subpicture region API.

[vlc] / modules / video_filter / mosaic.c

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 19cbdebc4bfaa4a977591cb6457b9f7f7a45499e..6bbdb4a0f62f1a9114f0e809a1405d24d4f22889 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -192,7 +192,7 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "align", 5, NULL,
                  ALIGN_TEXT, ALIGN_LONGTEXT, true);
-        change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
+        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );
 
     add_integer( CFG_PREFIX "xoffset", 0, NULL,
                  XOFFSET_TEXT, XOFFSET_LONGTEXT, true );
@@ -208,7 +208,7 @@ vlc_module_begin();
 
     add_integer( CFG_PREFIX "position", 0, NULL,
                  POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
     add_integer( CFG_PREFIX "rows", 2, NULL,
                  ROWS_TEXT, ROWS_LONGTEXT, false );
     add_integer( CFG_PREFIX "cols", 2, NULL,
@@ -448,11 +448,9 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     subpicture_region_t *p_region_prev = NULL;
 
     /* Allocate the subpicture internal data. */
-    p_spu = p_filter->pf_sub_buffer_new( p_filter );
+    p_spu = filter_NewSubpicture( p_filter );
     if( !p_spu )
-    {
         return NULL;
-    }
 
     /* Initialize subpicture */
     p_spu->i_channel = 0;
@@ -460,7 +458,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_spu->i_stop = 0;
     p_spu->b_ephemer = true;
     p_spu->i_alpha = p_sys->i_alpha;
-    p_spu->i_flags = p_sys->i_align;
     p_spu->b_absolute = false;
 
     vlc_mutex_lock( &p_sys->lock );
@@ -546,7 +543,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             if ( p_es->p_picture->p_next != NULL )
             {
                 picture_t *p_next = p_es->p_picture->p_next;
-                p_original_pic( p_es->p_picture );
+                picture_Release( p_es->p_picture );
                 p_es->p_picture = p_next;
             }
             else if ( p_es->p_picture->date + p_sys->i_delay + BLANK_DELAY <
@@ -599,7 +596,11 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             fmt_in.i_height = p_es->p_picture->format.i_height;
             fmt_in.i_width = p_es->p_picture->format.i_width;
 
-            fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
+            if( fmt_in.i_chroma == VLC_FOURCC('Y','U','V','A') ||
+                fmt_in.i_chroma == VLC_FOURCC('R','G','B','A') )
+                fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
+            else
+                fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
             fmt_out.i_width = col_inner_width;
             fmt_out.i_height = row_inner_height;
 
@@ -633,7 +634,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         else
         {
             p_converted = p_es->p_picture;
-            picture_Yield( p_converted );
             fmt_in.i_width = fmt_out.i_width = p_converted->format.i_width;
             fmt_in.i_height = fmt_out.i_height = p_converted->format.i_height;
             fmt_in.i_chroma = fmt_out.i_chroma = p_converted->format.i_chroma;
@@ -641,8 +641,13 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             fmt_out.i_visible_height = fmt_out.i_height;
         }
 
-        p_region = p_spu->pf_make_region( VLC_OBJECT(p_filter), &fmt_out,
-                                          p_converted );
+        p_region = subpicture_region_New( &fmt_out );
+        /* FIXME the copy is probably not needed anymore */
+        if( p_region )
+            picture_Copy( p_region->p_picture, p_converted );
+        if( !p_sys->b_keep )
+            picture_Release( p_converted );
+
         if( !p_region )
         {
             msg_Err( p_filter, "cannot allocate SPU region" );
@@ -652,20 +657,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             return p_spu;
         }
 
-        /* HACK ALERT: let's fix the pointers to avoid picture duplication.
-         * This is necessary because p_region->picture is not a pointer
-         * as it ought to be. */
-        if( !p_sys->b_keep )
-        {
-            free( p_converted );
-        }
-        else
-        {
-            /* Keep a pointer to the original picture (and its refcount...). */
-            p_region->picture.p_sys = (picture_sys_t *)p_converted;
-            p_region->picture.pf_release = MosaicReleasePicture;
-        }
-
         if( p_es->i_x >= 0 && p_es->i_y >= 0 )
         {
             p_region->i_x = p_es->i_x;