Changeset 14237d89c45640c29c3ee14f2d52bd40ff2fb92d

Timestamp:

12/03/08 23:51:39 (9 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1205362299 +0100

git-parent:

[d84cd8bb95d1cf575dd271f1250a17b29f459d62]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1205362121 +0100

Message:

Refactor video_filters in modules/stream_out/transcode.c by abstracting common code into 2 new functiosn transcode_video_filter_new() and transcode_video_filter_close().

Files:

• modules/stream_out/transcode.c (modified) (7 diffs)

modules/stream_out/transcode.c

@@ -2 +2 @@
- * transcode.c: transcoding stream output module
- *****************************************************************************
-4
+8
- * $Id$
- *
@@ -1644 +1644 @@
- * video
- */
+
+static filter_t *transcode_video_filter_new( sout_stream_t *p_stream,
+                                             es_format_t *p_fmt_in,
+                                             es_format_t *p_fmt_out,
+                                             config_chain_t  *p_cfg,
+                                             const char *psz_name )
+{
+    sout_stream_sys_t *p_sys = p_stream->p_sys;
+    filter_t *p_filter;
+    int i;
+
+    if( !p_stream || !p_fmt_in || !p_fmt_out ) return NULL;
+
+    p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+    vlc_object_attach( p_filter, p_stream );
+
+    p_filter->pf_vout_buffer_new = video_new_buffer_filter;
+    p_filter->pf_vout_buffer_del = video_del_buffer_filter;
+
+    es_format_Copy( &p_filter->fmt_in,  p_fmt_in );
+    es_format_Copy( &p_filter->fmt_out, p_fmt_out );
+    p_filter->p_cfg = p_cfg;
+
+    p_filter->p_module = module_Need( p_filter, "video filter2",
+                                      psz_name, VLC_TRUE );
+    if( !p_filter->p_module )
+    {
+        msg_Dbg( p_stream, "no video filter found" );
+        vlc_object_detach( p_filter );
+        vlc_object_release( p_filter );
+        return NULL;
+    }
+
+    p_filter->p_owner = malloc( sizeof(filter_owner_sys_t) );
+    if( !p_filter->p_owner )
+    {
+        module_Unneed( p_filter,p_filter->p_module );
+        vlc_object_detach( p_filter );
+        vlc_object_release( p_filter );
+        return NULL;
+    }
+
+    for( i = 0; i < PICTURE_RING_SIZE; i++ )
+        p_filter->p_owner->pp_pics[i] = 0;
+    p_filter->p_owner->p_sys = p_sys;
+
+    return p_filter;
+}
+
+static void transcode_video_filter_close( sout_stream_t *p_stream,
+                                          filter_t *p_filter )
+{
+    int j;
+
+    if( !p_stream || !p_filter ) return;
+
+    vlc_object_detach( p_filter );
+    if( p_filter->p_module )
+        module_Unneed( p_filter, p_filter->p_module );
+
+    /* Clean-up pictures ring buffer */
+    for( j = 0; j < PICTURE_RING_SIZE; j++ )
+    {
+        if( p_filter->p_owner->pp_pics[j] )
+            video_del_buffer( VLC_OBJECT(p_filter),
+                              p_filter->p_owner->pp_pics[j] );
+    }
+    free( p_filter->p_owner );
+    vlc_object_release( p_filter );
+    p_filter = NULL;
+}
+
-static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
-{
@@ -2049 +2121 @@
-                                   sout_stream_id_t *id )
-{
-, j
+
-
-    if( p_stream->p_sys->i_threads >= 1 )
@@ -2085 +2157 @@
-    for( i = 0; i < id->i_filter; i++ )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        id->pp_filter[i] = NULL;
-    }
+    id->i_filter = 0;
-
-    for( i = 0; i < id->i_ufilter; i++ )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        id->pp_ufilter[i] = NULL;
-    }
+    id->i_ufilter = 0;
-}
-
@@ -2200 +2250 @@
-            {
-                id->pp_filter[id->i_filter] =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                    id->i_filter++;
-                }
-                else
-                {
-                    msg_Dbg( p_stream, "no video filter found" );
-                    vlc_object_detach( id->pp_filter[id->i_filter] );
-                    vlc_object_release( id->pp_filter[id->i_filter] );
-                }
-            }
-
+
+
-            /* Check if we need a filter for chroma conversion or resizing */
-            if( id->p_decoder->fmt_out.video.i_chroma !=
@@ -2246 +2336 @@
-            {
-                id->pp_filter[id->i_filter] =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                {
-                    id->pp_filter[id->i_filter]->p_owner =
-                        malloc( sizeof(filter_owner_sys_t) );
-                    for( i = 0; i < PICTURE_RING_SIZE; i++ )
-                        id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
-                    id->pp_filter[id->i_filter]->p_owner->p_sys = p_sys;
-
-                    id->i_filter++;
-                }
-                else
-                {
-                    msg_Dbg( p_stream, "no video filter found" );
-                    vlc_object_detach( id->pp_filter[id->i_filter] );
-                    vlc_object_release( id->pp_filter[id->i_filter] );
-
-                    p_pic->pf_release( p_pic );
-                    transcode_video_close( p_stream, id );
@@ -2296 +2346 @@
-                    return VLC_EGENERIC;
-                }
+
+                /* Set crop and padding information */ 
+                id->pp_filter[id->i_filter]->fmt_in.video.i_x_offset = p_sys->i_src_x_offset;
+                id->pp_filter[id->i_filter]->fmt_in.video.i_y_offset = p_sys->i_src_y_offset;
+                id->pp_filter[id->i_filter]->fmt_in.video.i_visible_width = p_sys->i_crop_width;
+                id->pp_filter[id->i_filter]->fmt_in.video.i_visible_height = p_sys->i_crop_height;
+
+                id->pp_filter[id->i_filter]->fmt_out.video.i_x_offset = p_sys->i_dst_x_offset;
+                id->pp_filter[id->i_filter]->fmt_out.video.i_y_offset = p_sys->i_dst_y_offset;
+                id->pp_filter[id->i_filter]->fmt_out.video.i_visible_width = p_sys->i_nopadd_width;
+                id->pp_filter[id->i_filter]->fmt_out.video.i_visible_height = p_sys->i_nopadd_height;
+
+                id->i_filter++;
-            }
-
+
-            for( i = 0; (i < p_sys->i_vfilters) && (id->i_ufilter < TRANSCODE_FILTERS); i++ )
-            {
-                id->pp_ufilter[id->i_ufilter] =
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                    id->i_ufilter++;
-                }
-                else
-                {
-                    msg_Dbg( p_stream, "no video filter found" );
-                    vlc_object_detach( id->pp_ufilter[id->i_ufilter] );
-                    vlc_object_release( id->pp_ufilter[id->i_ufilter] );
-                    id->pp_ufilter[id->i_ufilter] = NULL;
-                }
-            }
-        }