Changeset 3f92e9ad6a693a76a01affd41136c90f585a5aeb

Timestamp:

09/06/08 10:05:35 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212998735 +0200

git-parent:

[3e3d877613cb0d0fba70343464c96a6a10abf411]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212876939 +0200

Message:

Merge all swscale plugin related source files (except chroma.h).

Files:

• modules/codec/ffmpeg/Modules.am (modified) (1 diff)
• modules/codec/ffmpeg/scale.c (deleted)
• modules/codec/ffmpeg/swscale.c (modified) (3 diffs)
• modules/codec/ffmpeg/swscale.h (deleted)

modules/codec/ffmpeg/Modules.am

@@ -37 +37 @@
-SOURCES_swscale = \
-    swscale.c \
-    swscale.h \
-    scale.c \
-    chroma.h \
-    $(NULL)

modules/codec/ffmpeg/swscale.c

@@ -32 +32 @@
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
-
+
+
+
+
+
+
+
+
+
+
-
-/****************************************************************************
- * Local prototypes
- ****************************************************************************/
+static int  OpenScaler( vlc_object_t * );
+static void CloseScaler( vlc_object_t * );
+
+void *( *swscale_fast_memcpy )( void *, const void *, size_t );
+static picture_t *Filter( filter_t *, picture_t * );
+static int CheckInit( filter_t * );
+
+#define SCALEMODE_TEXT N_("Scaling mode")
+#define SCALEMODE_LONGTEXT N_("Scaling mode to use.")
+
-static const int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-const char *const ppsz_mode_descriptions[] =
@@ -44 +62 @@
-  N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
-  N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
+
-
-/*****************************************************************************
@@ -57 +76 @@
-        change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
-vlc_module_end();
+
+/* Version checking */
+#if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
+/*****************************************************************************
+ * filter_sys_t : filter descriptor
+ *****************************************************************************/
+struct filter_sys_t
+{
+    struct SwsContext *ctx;
+    SwsFilter *p_src_filter;
+    SwsFilter *p_dst_filter;
+    int i_cpu_mask, i_sws_flags;
+
+    es_format_t fmt_in;
+    es_format_t fmt_out;
+};
+
+/*****************************************************************************
+ * OpenScaler: probe the filter and return score
+ *****************************************************************************/
+static int OpenScaler( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t*)p_this;
+    filter_sys_t *p_sys;
+    vlc_value_t val;
+
+    int i_fmt_in, i_fmt_out;
+    unsigned int i_cpu;
+    int i_sws_mode;
+
+    float sws_lum_gblur = 0.0, sws_chr_gblur = 0.0;
+    int sws_chr_vshift = 0, sws_chr_hshift = 0;
+    float sws_chr_sharpen = 0.0, sws_lum_sharpen = 0.0;
+
+    /* Supported Input formats: YV12, I420/IYUV, YUY2, UYVY, BGR32, BGR24,
+     * BGR16, BGR15, RGB32, RGB24, Y8/Y800, YVU9/IF09 */
+    i_fmt_in = GetFfmpegChroma(p_filter->fmt_in.video.i_chroma);
+    /* Supported output formats: YV12, I420/IYUV, YUY2, UYVY,
+     * {BGR,RGB}{1,4,8,15,16,24,32}, Y8/Y800, YVU9/IF09 */
+    i_fmt_out = GetFfmpegChroma(p_filter->fmt_out.video.i_chroma);
+    if( ( i_fmt_in < 0 ) || ( i_fmt_out < 0 ) )
+    {
+        return VLC_EGENERIC;
+    }
+
+    /* Allocate the memory needed to store the decoder's structure */
+    if( ( p_filter->p_sys = p_sys =
+          (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
+    {
+        return VLC_ENOMEM;
+    }
+
+    swscale_fast_memcpy = vlc_memcpy;
+
+    /* Set CPU capabilities */
+    i_cpu = vlc_CPU();
+    p_sys->i_cpu_mask = 0;
+    if( i_cpu & CPU_CAPABILITY_MMX )
+    {
+        p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX;
+    }
+#if (LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0))
+    if( i_cpu & CPU_CAPABILITY_MMXEXT )
+    {
+        p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX2;
+    }
+#endif
+    if( i_cpu & CPU_CAPABILITY_3DNOW )
+    {
+        p_sys->i_cpu_mask |= SWS_CPU_CAPS_3DNOW;
+    }
+    if( i_cpu & CPU_CAPABILITY_ALTIVEC )
+    {
+        p_sys->i_cpu_mask |= SWS_CPU_CAPS_ALTIVEC;
+    }
+
+    var_Create( p_filter, "swscale-mode", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+    var_Get( p_filter, "swscale-mode", &val );
+    i_sws_mode = val.i_int;
+
+    switch( i_sws_mode )
+    {
+    case 0:  p_sys->i_sws_flags = SWS_FAST_BILINEAR; break;
+    case 1:  p_sys->i_sws_flags = SWS_BILINEAR; break;
+    case 2:  p_sys->i_sws_flags = SWS_BICUBIC; break;
+    case 3:  p_sys->i_sws_flags = SWS_X; break;
+    case 4:  p_sys->i_sws_flags = SWS_POINT; break;
+    case 5:  p_sys->i_sws_flags = SWS_AREA; break;
+    case 6:  p_sys->i_sws_flags = SWS_BICUBLIN; break;
+    case 7:  p_sys->i_sws_flags = SWS_GAUSS; break;
+    case 8:  p_sys->i_sws_flags = SWS_SINC; break;
+    case 9:  p_sys->i_sws_flags = SWS_LANCZOS; break;
+    case 10: p_sys->i_sws_flags = SWS_SPLINE; break;
+    default: p_sys->i_sws_flags = SWS_FAST_BILINEAR; i_sws_mode = 0; break;
+    }
+
+    p_sys->p_src_filter = NULL;
+    p_sys->p_dst_filter = NULL;
+    p_sys->p_src_filter =
+        sws_getDefaultFilter( sws_lum_gblur, sws_chr_gblur,
+                              sws_lum_sharpen, sws_chr_sharpen,
+                              sws_chr_hshift, sws_chr_vshift, 0 );
+
+    /* Misc init */
+    p_sys->ctx = NULL;
+    p_filter->pf_video_filter = Filter;
+    es_format_Init( &p_sys->fmt_in, 0, 0 );
+    es_format_Init( &p_sys->fmt_out, 0, 0 );
+
+    if( CheckInit( p_filter ) != VLC_SUCCESS )
+    {
+        if( p_sys->p_src_filter ) sws_freeFilter( p_sys->p_src_filter );
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
+
+    msg_Dbg( p_filter, "%ix%i chroma: %4.4s -> %ix%i chroma: %4.4s",
+             p_filter->fmt_in.video.i_width, p_filter->fmt_in.video.i_height,
+             (char *)&p_filter->fmt_in.video.i_chroma,
+             p_filter->fmt_out.video.i_width, p_filter->fmt_out.video.i_height,
+             (char *)&p_filter->fmt_out.video.i_chroma );
+
+    if( p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width ||
+        p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height )
+    {
+        msg_Dbg( p_filter, "scaling mode: %s",
+                 ppsz_mode_descriptions[i_sws_mode] );
+    }
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * CloseFilter: clean up the filter
+ *****************************************************************************/
+static void CloseScaler( vlc_object_t *p_this )
+{
+    filter_t *p_filter = (filter_t*)p_this;
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    if( p_sys->ctx ) sws_freeContext( p_sys->ctx );
+    if( p_sys->p_src_filter ) sws_freeFilter( p_sys->p_src_filter );
+    free( p_sys );
+}
+
+/*****************************************************************************
+ * CheckInit: Initialise filter when necessary
+ *****************************************************************************/
+static int CheckInit( filter_t *p_filter )
+{
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    if( ( p_filter->fmt_in.video.i_width != p_sys->fmt_in.video.i_width ) ||
+        ( p_filter->fmt_in.video.i_height != p_sys->fmt_in.video.i_height ) ||
+        ( p_filter->fmt_out.video.i_width != p_sys->fmt_out.video.i_width ) ||
+        ( p_filter->fmt_out.video.i_height != p_sys->fmt_out.video.i_height ) )
+    {
+        int i_fmt_in, i_fmt_out;
+
+        i_fmt_in = GetFfmpegChroma(p_filter->fmt_in.video.i_chroma);
+        i_fmt_out = GetFfmpegChroma(p_filter->fmt_out.video.i_chroma);
+        if( (i_fmt_in < 0) || (i_fmt_out < 0) )
+        {
+            msg_Err( p_filter, "format not supported" );
+            return VLC_EGENERIC;
+        }
+
+        if( p_sys->ctx ) sws_freeContext( p_sys->ctx );
+
+        p_sys->ctx =
+            sws_getContext( p_filter->fmt_in.video.i_width,
+                            p_filter->fmt_in.video.i_height, i_fmt_in,
+                            p_filter->fmt_out.video.i_width,
+                            p_filter->fmt_out.video.i_height, i_fmt_out,
+                            p_sys->i_sws_flags | p_sys->i_cpu_mask,
+                            p_sys->p_src_filter, p_sys->p_dst_filter, 0 );
+        if( !p_sys->ctx )
+        {
+            msg_Err( p_filter, "could not init SwScaler" );
+            return VLC_EGENERIC;
+        }
+
+        p_sys->fmt_in = p_filter->fmt_in;
+        p_sys->fmt_out = p_filter->fmt_out;
+    }
+
+    return VLC_SUCCESS;
+}
+
+/****************************************************************************
+ * Filter: the whole thing
+ ****************************************************************************
+ * This function is called just after the thread is launched.
+ ****************************************************************************/
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
+{
+    filter_sys_t *p_sys = p_filter->p_sys;
+    uint8_t *src[3]; int src_stride[3];
+    uint8_t *dst[3]; int dst_stride[3];
+    picture_t *p_pic_dst;
+    int i_plane;
+    int i_nb_planes = p_pic->i_planes;
+
+    /* Check if format properties changed */
+    if( CheckInit( p_filter ) != VLC_SUCCESS ) return NULL;
+
+    /* Request output picture */
+    p_pic_dst = p_filter->pf_vout_buffer_new( p_filter );
+    if( !p_pic_dst )
+    {
+        msg_Warn( p_filter, "can't get output picture" );
+        return NULL;
+    }
+
+    if( p_filter->fmt_out.video.i_chroma == VLC_FOURCC('Y','U','V','A') )
+    {
+        i_nb_planes = 3;
+        memset( p_pic_dst->p[3].p_pixels, 0xff, p_filter->fmt_out.video.i_height
+                                                 * p_pic_dst->p[3].i_pitch );
+    }
+
+    for( i_plane = 0; i_plane < __MIN(3, p_pic->i_planes); i_plane++ )
+    {
+        src[i_plane] = p_pic->p[i_plane].p_pixels;
+        src_stride[i_plane] = p_pic->p[i_plane].i_pitch;
+    }
+    for( i_plane = 0; i_plane < __MIN(3, i_nb_planes); i_plane++ )
+    {
+        dst[i_plane] = p_pic_dst->p[i_plane].p_pixels;
+        dst_stride[i_plane] = p_pic_dst->p[i_plane].i_pitch;
+    }
+
+#if LIBSWSCALE_VERSION_INT  >= ((0<<16)+(5<<8)+0)
+    sws_scale( p_sys->ctx, src, src_stride,
+               0, p_filter->fmt_in.video.i_height,
+               dst, dst_stride );
+#else
+    sws_scale_ordered( p_sys->ctx, src, src_stride,
+               0, p_filter->fmt_in.video.i_height,
+               dst, dst_stride );
+#endif
+
+    p_pic_dst->date = p_pic->date;
+    p_pic_dst->b_force = p_pic->b_force;
+    p_pic_dst->i_nb_fields = p_pic->i_nb_fields;
+    p_pic_dst->b_progressive = p_pic->b_progressive;
+    p_pic_dst->b_top_field_first = p_pic->b_top_field_first;
+
+    if( p_pic->pf_release )
+        p_pic->pf_release( p_pic );
+    return p_pic_dst;
+}
+
+#else /* LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) */
+
+int OpenScaler( vlc_object_t *p_this )
+{
+    return VLC_EGENERIC;
+}
+
+void CloseScaler( vlc_object_t *p_this )
+{
+}
+
+#endif /* LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) */