Changeset 3f6f97f1326fe9d502171012699986dd404c17c4

Timestamp:

03/05/05 17:49:15 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1110041355 +0000

git-parent:

[286a9420a21325a49fdd3b56d721ca3d8e90cde8]

git-author:

Gildas Bazin <gbazin@videolan.org> 1110041355 +0000

Message:

* include/video_output.h, ALL: changed api for vout_Request()/vout_Create() to be more flexible.

Files:

• include/video_output.h (modified) (2 diffs)
• modules/codec/ffmpeg/video.c (modified) (1 diff)
• modules/video_filter/adjust.c (modified) (2 diffs)
• modules/video_filter/clone.c (modified) (4 diffs)
• modules/video_filter/crop.c (modified) (4 diffs)
• modules/video_filter/deinterlace.c (modified) (4 diffs)
• modules/video_filter/distort.c (modified) (2 diffs)
• modules/video_filter/invert.c (modified) (2 diffs)
• modules/video_filter/logo.c (modified) (3 diffs)
• modules/video_filter/motionblur.c (modified) (3 diffs)
• modules/video_filter/motiondetect.c (modified) (2 diffs)
• modules/video_filter/transform.c (modified) (3 diffs)
• modules/video_filter/wall.c (modified) (3 diffs)
• modules/visualization/goom.c (modified) (3 diffs)
• modules/visualization/visual/visual.c (modified) (3 diffs)
• src/input/decoder.c (modified) (2 diffs)
• src/video_output/video_output.c (modified) (8 diffs)
• src/video_output/vout_pictures.c (modified) (9 diffs)

include/video_output.h

@@ -122 +122 @@
-    vlc_bool_t          b_direct;            /**< rendered are like direct ? */
-    vout_chroma_t       chroma;                      /**< translation tables */
+
+    video_format_t      fmt_render;      /* render format (from the decoder) */
+    video_format_t      fmt_in;            /* input (modified render) format */
+    video_format_t      fmt_out;     /* output format (for the video output) */
-    /**@}*/
-
@@ -195 +199 @@
- * Prototypes
- *****************************************************************************/
-,d,e,f) __vout_Request(VLC_OBJECT(a),b,c,d,e,f
-  ( vlc_object_t *, vout_thread_t *, unsigned int, unsigned int, uint32_t, unsigned int
-,c,d,e) __vout_Create(VLC_OBJECT(a),b,c,d,e
-unsigned int, unsigned int, uint32_t, unsigned int
+) __vout_Request(VLC_OBJECT(a),b,c
+( vlc_object_t *, vout_thread_t *, video_format_t *
+) __vout_Create(VLC_OBJECT(a),b
+video_format_t *
-VLC_EXPORT( void,            vout_Destroy,        ( vout_thread_t * ) );
-VLC_EXPORT( int, vout_VarCallback, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );

modules/codec/ffmpeg/video.c

@@ -170 +170 @@
-            VOUT_ASPECT_FACTOR * ( av_q2d(p_context->sample_aspect_ratio) *
-                p_context->width / p_context->height );
+    p_dec->fmt_out.video.i_sar_num = p_context->sample_aspect_ratio.num;
+    p_dec->fmt_out.video.i_sar_den = p_context->sample_aspect_ratio.den;
-#else
-        p_dec->fmt_out.video.i_aspect =

modules/video_filter/adjust.c

@@ -151 +151 @@
-    int i_index;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -160 +161 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-
-
-
+
-
-    /* Everything failed */

modules/video_filter/clone.c

@@ -206 +206 @@
-    picture_t *p_pic;
-    char *psz_default_vout;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -215 +216 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video outputs" );
@@ -228 +237 @@
-        {
-            p_vout->p_sys->pp_vout[i_vout] =
-
-
-
+
-        }
-        else
@@ -238 +245 @@
-                           p_vout->p_sys->ppsz_vout_list[i_vout] );
-            p_vout->p_sys->pp_vout[i_vout] =
-
-
-
+
-
-            /* Reset the default value */

modules/video_filter/crop.c

@@ -135 +135 @@
-    char *psz_var;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -248 +249 @@
-                            * p_vout->p_sys->i_width / p_vout->output.i_width;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->p_sys->i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->p_sys->i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->p_sys->i_aspect;
+    fmt.i_sar_num = p_vout->p_sys->i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-
-
-
+
-    if( p_vout->p_sys->p_vout == NULL )
-    {
@@ -311 +318 @@
-static int Manage( vout_thread_t *p_vout )
-{
+    video_format_t fmt = {0};
+
-    if( !p_vout->p_sys->b_changed )
-    {
@@ -318 +327 @@
-    vout_Destroy( p_vout->p_sys->p_vout );
-
-
-
-
+
+
+
+
+
+
+
+
+
-    if( p_vout->p_sys->p_vout == NULL )
-    {

modules/video_filter/deinterlace.c

@@ -321 +321 @@
-{
-    vout_thread_t *p_real_vout = NULL;
+    video_format_t fmt = {0};
-
-    msg_Dbg( p_vout, "spawning the real video output" );
+
+    fmt.i_width = fmt.i_visible_width = p_vout->output.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->output.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->output.i_chroma;
+    fmt.i_aspect = p_vout->output.i_aspect;
+    fmt.i_sar_num = p_vout->output.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
-
-    switch( p_vout->render.i_chroma )
@@ -333 +342 @@
-        case DEINTERLACE_MEAN:
-        case DEINTERLACE_DISCARD:
-
-
-
-
+
+
-            break;
-
@@ -342 +349 @@
-        case DEINTERLACE_BLEND:
-        case DEINTERLACE_LINEAR:
-
-
-
-
+
-            break;
-        }
@@ -351 +355 @@
-
-    case VLC_FOURCC('I','4','2','2'):
-
-
-
-
+
+
-        break;
-

modules/video_filter/distort.c

@@ -166 +166 @@
-    int i_index;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -175 +176 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-
-
-
+
-
-    /* Everything failed */

modules/video_filter/invert.c

@@ -112 +112 @@
-    int i_index;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -121 +122 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-
-
-
+
-
-    /* Everything failed */

modules/video_filter/logo.c

@@ -212 +212 @@
-    picture_t *p_pic;
-    int i_index;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -220 +221 @@
-    p_vout->output.i_height = p_vout->render.i_height;
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
+
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
-
-    /* Load the video blending filter */
@@ -281 +290 @@
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-
-
-
+
-
-    /* Everything failed */

modules/video_filter/motionblur.c

@@ -130 +130 @@
-    int i_index;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -154 +155 @@
-    msg_Dbg( p_vout, "spawning the real video output" );
-
+    fmt.i_width = fmt.i_visible_width = p_vout->output.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->output.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->output.i_chroma;
+    fmt.i_aspect = p_vout->output.i_aspect;
+    fmt.i_sar_num = p_vout->output.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    switch( p_vout->render.i_chroma )
-    {
@@ -159 +168 @@
-    case VLC_FOURCC('I','Y','U','V'):
-    case VLC_FOURCC('Y','V','1','2'):
-
-
-
+
-        break;
-    default:

modules/video_filter/motiondetect.c

@@ -212 +212 @@
-    int i_index;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -221 +222 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-
-
-
+
-
-    /* Everything failed */

modules/video_filter/transform.c

@@ -181 +181 @@
-    int i_index;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
@@ -190 +191 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
@@ -195 +204 @@
-    if( p_vout->p_sys->b_rotation )
-    {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    else
-    {
-
-
-
+
-    }
-

modules/video_filter/wall.c

@@ -230 +230 @@
-    unsigned int i_target_width,i_target_height;
-    picture_t *p_pic;
+    video_format_t fmt = {0};
-    int i_aspect = 4*VOUT_ASPECT_FACTOR/3;
-    int i_align = 0;
@@ -269 +270 @@
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-    var_Create( p_vout, "align", VLC_VAR_INTEGER );
+
+    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->render.i_chroma;
+    fmt.i_aspect = p_vout->render.i_aspect;
+    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
-
-    w1 = p_vout->output.i_width / p_vout->p_sys->i_col;
@@ -395 +404 @@
-            var_SetInteger( p_vout, "video-y", i_top + i_ypos );
-
+            fmt.i_width = fmt.i_visible_width = i_width;
+            fmt.i_height = fmt.i_visible_height = i_height;
+            fmt.i_aspect = i_aspect * i_target_height / i_height *
+                i_width / i_target_width;
+
-            p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout =
-
-
-
-
-
+
+
-            {
-                msg_Err( p_vout, "failed to get %ix%i vout threads",

modules/visualization/goom.c

@@ -132 +132 @@
-    goom_thread_t     *p_thread;
-    vlc_value_t       width, height;
+    video_format_t    fmt = {0};
-
-    if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' )
@@ -161 +162 @@
-    var_Get( p_thread, "goom-height", &height );
-
-
-
-
-
+
+
+
+
+
+
+
-    if( p_thread->p_vout == NULL )
-    {
@@ -387 +391 @@
-
-    /* Free data */
-, 0, 0, 0
+
-    vlc_mutex_destroy( &p_sys->p_thread->lock );
-    vlc_cond_destroy( &p_sys->p_thread->wait );

modules/visualization/visual/visual.c

@@ -133 +133 @@
-
-    char *psz_effects, *psz_parser;
+    video_format_t fmt = {0};
-
-    if( ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2') &&
@@ -247 +248 @@
-
-    /* Open the video output */
-
-
-
-
-
-
+
+
+
+
+
+
+
-    if( p_sys->p_vout == NULL )
-    {
@@ -330 +332 @@
-    if( p_filter->p_sys->p_vout )
-    {
-, 0, 0, 0
+
-    }
-

src/input/decoder.c

@@ -780 +780 @@
-
-        /* We are about to die. Reattach video output to p_vlc. */
-, 0, 0, 0
+
-    }
-
@@ -886 +886 @@
-        }
-
+        if( !p_dec->fmt_out.video.i_sar_num ||
+            !p_dec->fmt_out.video.i_sar_den )
+        {
+            p_dec->fmt_out.video.i_sar_num =
+              p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height;
+
+            p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
+              p_dec->fmt_out.video.i_width;
+        }
+
+        vlc_reduce( &p_dec->fmt_out.video.i_sar_num,
+                    &p_dec->fmt_out.video.i_sar_den,
+            p_dec->fmt_out.video.i_sar_num,
+            p_dec->fmt_out.video.i_sar_den, 0 );
+
+    if( !p_dec->fmt_out.video.i_visible_width ||
+        !p_dec->fmt_out.video.i_visible_height )
+    {
+        p_dec->fmt_out.video.i_visible_width =
+            p_dec->fmt_out.video.i_width;
+        p_dec->fmt_out.video.i_visible_height =
+            p_dec->fmt_out.video.i_height;
+    }
+
-        p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
-        p_sys->video = p_dec->fmt_out.video;
-
-        p_sys->p_vout = vout_Request( p_dec, p_sys->p_vout,
-
-
-
-
-
+
-        if( p_sys->p_vout == NULL )
-        {

src/video_output/video_output.c

@@ -10 +10 @@
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *          Gildas Bazin <gbazin@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -75 +76 @@
- * properties. If not found, it spawns a new one.
- *****************************************************************************/
-
-
-
-
-
+
+
+
+
-    {
-        /* Reattach video output to input before bailing out */
@@ -169 +169 @@
-        }
-
-render.i_width != 
-render.i_height != 
-render.i_chroma != 
-render.i_aspect != 
+fmt_render.i_width != p_fmt->
+fmt_render.i_height != p_fmt->
+fmt_render.i_chroma != p_fmt->
+fmt_render.i_aspect != p_fmt->
-                    && !p_vout->b_override_aspect ) ||
-            p_vout->b_filter_change )
@@ -196 +196 @@
-        msg_Dbg( p_this, "no usable vout present, spawning one" );
-
-i_width, i_height, i_chroma, i_aspec
+p_fm
-    }
-
@@ -208 +208 @@
- * to its description. On error, it returns NULL.
- *****************************************************************************/
-
-
-
+
-{
-    vout_thread_t  * p_vout;                            /* thread descriptor */
@@ -218 +216 @@
-    vlc_value_t      val, text;
-
+    unsigned int i_width = p_fmt->i_width;
+    unsigned int i_height = p_fmt->i_height;
+    vlc_fourcc_t i_chroma = p_fmt->i_chroma;
+    unsigned int i_aspect = p_fmt->i_aspect;
+
-    /* Allocate descriptor */
-    p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
@@ -242 +245 @@
-    /* Initialize the rendering heap */
-    I_RENDERPICTURES = 0;
+    p_vout->fmt_render        = *p_fmt;   /* FIXME palette */
+    p_vout->fmt_in            = *p_fmt;   /* FIXME palette */
-    p_vout->render.i_width    = i_width;
-    p_vout->render.i_height   = i_height;
@@ -559 +564 @@
-    msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-             p_vout->output.i_width, p_vout->output.i_height,
-
-
+
+
+
-
-    /* Calculate shifts from system-updated masks */

src/video_output/vout_pictures.c

@@ -287 +287 @@
-                                                       subpicture_t *p_subpic )
-{
-    video_format_t fmt;
-    int i_scale_width, i_scale_height;
-
@@ -293 +292 @@
-    {
-        /* XXX: subtitles */
-
-        return NULL;
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    if( p_pic->i_type == DIRECT_PICTURE )
@@ -321 +315 @@
-                vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic );
-
-fm
+p_vout->fmt_ou
-                                       PP_OUTPUTPICTURE[0], p_pic, p_subpic,
-                                       i_scale_width, i_scale_height );
@@ -337 +331 @@
-         * decoder. We can safely render subtitles on it and
-         * display it. */
-fmt, p_pic, p_pic, p_sub
-
+p_vout->fmt_out, p_pic, p_
+p_subpic, 
-
-        return p_pic;
@@ -356 +350 @@
-
-        vout_CopyPicture( p_vout, PP_OUTPUTPICTURE[0], p_pic );
-
-
+
+
+
-
-        if( PP_OUTPUTPICTURE[0]->pf_unlock )
@@ -379 +374 @@
-        {
-            vout_AllocatePicture( VLC_OBJECT(p_vout),
-outp
-outp
-outp
-outp
+fmt_o
+fmt_o
+fmt_o
+fmt_o
-            p_tmp_pic->i_type = MEMORY_PICTURE;
-            p_tmp_pic->i_status = RESERVED_PICTURE;
@@ -391 +386 @@
-
-        /* Render subpictures on the first direct buffer */
-fm
+p_vout->fmt_ou
-                               p_tmp_pic, p_subpic,
-                               i_scale_width, i_scale_height );
@@ -411 +406 @@
-
-        /* Render subpictures on the first direct buffer */
-fmt, &p_vout->p_picture[0]
-p_subpic
-
+p_vout->fmt_out
+&p_vout->p_picture[0]
+p_subpic, 
-    }
-
@@ -436 +431 @@
-    {
-        *pi_width = *pi_height = *pi_x = *pi_y = 0;