Changeset 496977e364ae28fdb497fd370b1b42f988cbb076

Timestamp:

28/07/08 00:03:52 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1217196232 +0200

git-parent:

[84387c930d3fb4eca3d4e319809fb511da9b18ef]

git-author:

Laurent Aimar <fenrir@videolan.org> 1217196164 +0200

Message:

Workaround a limitation of swscaler that does not like too small width.
(It begins to have a lots of "workarounds" :(

Files:

• modules/video_filter/swscale.c (modified) (14 diffs)

modules/video_filter/swscale.c

@@ -94 +94 @@
-    picture_t *p_src_a;
-    picture_t *p_dst_a;
+    int i_extend_factor;
+    picture_t *p_src_e;
+    picture_t *p_dst_e;
-};
-
@@ -107 +110 @@
-static int GetSwsCpuMask(void);
-
-FFmpeg
+SwScaler
- * (change it to true to try) */
-#define ALLOW_YUVP (false)
+/* SwScaler does not like too small picture */
+#define MINIMUM_WIDTH (16)
-
-/*****************************************************************************
@@ -173 +178 @@
-    p_sys->p_src_a = NULL;
-    p_sys->p_dst_a = NULL;
+    p_sys->p_src_e = NULL;
+    p_sys->p_dst_e = NULL;
-    memset( &p_sys->fmt_in,  0, sizeof(p_sys->fmt_in) );
-    memset( &p_sys->fmt_out, 0, sizeof(p_sys->fmt_out) );
@@ -311 +318 @@
-        return VLC_EGENERIC;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    for( int n = 0; n < (b_has_a ? 2 : 1); n++ )
-    {
@@ -318 +337 @@
-        struct SwsContext *ctx;
-
-p_fmti->
-p_fmto->i
+i_fmt
+i_fmto
-                              i_sws_flags | p_sys->i_cpu_mask,
-                              p_sys->p_src_filter, p_sys->p_dst_filter, 0 );
@@ -329 +348 @@
-    if( p_sys->ctxA )
-    {
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-    if( !p_sys->ctx ||
-
+
+
-    {
-        msg_Err( p_filter, "could not init SwScaler and/or allocate memory" );
@@ -344 +372 @@
-    p_sys->fmt_out = *p_fmto;
-
-
+
+
-             p_fmti->i_width, p_fmti->i_height, (char *)&p_fmti->i_chroma,
- );
-
-
+,
+
+
-    return VLC_SUCCESS;
-}
@@ -354 +383 @@
-{
-    filter_sys_t *p_sys = p_filter->p_sys;
+
+    if( p_sys->p_src_e )
+        picture_Release( p_sys->p_src_e );
+    if( p_sys->p_dst_e )
+        picture_Release( p_sys->p_dst_e );
-
-    if( p_sys->p_src_a )
@@ -359 +393 @@
-    if( p_sys->p_dst_a )
-        picture_Release( p_sys->p_dst_a );
+
-    if( p_sys->ctxA )
-        sws_freeContext( p_sys->ctxA );
@@ -370 +405 @@
-    p_sys->p_src_a = NULL;
-    p_sys->p_dst_a = NULL;
+    p_sys->p_src_e = NULL;
+    p_sys->p_dst_e = NULL;
-}
-
@@ -376 +413 @@
-                       int i_plane_start, int i_plane_count )
-{
-
+
+
-    {
-        pp_pixel[n] = p_picture->p[i_plane_start+n].p_pixels;
-        pi_pitch[n] = p_picture->p[i_plane_start+n].i_pitch;
-    }
+    for( ; n < 3; n++ )
+    {
+        pp_pixel[n] = NULL;
+        pi_pitch[n] = 0;
+    }
-}
-
-/* XXX is it always 3 even for BIG_ENDIAN (blend.c seems to think so) ? */
-#define OFFSET_A (3)
-const video_format_t *p_fm
+unsigned i_width, unsigned i_heigh
-{
-    plane_t *d = &p_dst->p[0];
-    const plane_t *s = &p_src->p[0];
-    
-p_fmt->
-p_fmt->
+
+
-            d->p_pixels[y*d->i_pitch+x] = s->p_pixels[y*s->i_pitch+4*x+OFFSET_A];
-}
-const video_format_t *p_fm
+unsigned i_width, unsigned i_heigh
-{
-    plane_t *d = &p_dst->p[0];
-    const plane_t *s = &p_src->p[0];
-    
-p_fmt->
-p_fmt->
+
+
-            d->p_pixels[y*d->i_pitch+4*x+OFFSET_A] = s->p_pixels[y*s->i_pitch+x];
-}
-#undef OFFSET_A
-
+static void CopyPad( picture_t *p_dst, const picture_t *p_src )
+{
+    picture_Copy( p_dst, p_src );
+    for( int n = 0; n < p_dst->i_planes; n++ )
+    {
+        const plane_t *s = &p_src->p[n];
+        plane_t *d = &p_dst->p[n];
+
+        for( int y = 0; y < s->i_lines; y++ )
+        {
+            for( int x = s->i_visible_pitch; x < d->i_visible_pitch; x += s->i_pixel_pitch )
+                memcpy( &d->p_pixels[y*d->i_pitch + x], &d->p_pixels[y*d->i_pitch + s->i_visible_pitch - s->i_pixel_pitch], s->i_pixel_pitch );
+        }
+    }
+}
+
-static void Convert( struct SwsContext *ctx,
-const video_format_t *p_fmti
+int i_height
-{
-    uint8_t *src[3]; int src_stride[3];
@@ -415 +474 @@
-
-#if LIBSWSCALE_VERSION_INT  >= ((0<<16)+(5<<8)+0)
-p_fmti->
+
-               dst, dst_stride );
-#else
-p_fmti->
+
-                       dst, dst_stride );
-#endif
@@ -450 +509 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    if( p_sys->ctxA )
-    {
@@ -456 +526 @@
-        {
-            /* We extract the A plane to rescale it, and then we reinject it. */
-pic, p_fmti
-
-
-
-pic_dst, p_sys->p_dst_a, p_fmto
+src, p_fmti->i_width * p_sys->i_extend_factor, p_fmti->i_height
+
+->i_height
+
+dst, p_sys->p_dst_a, p_fmto->i_width * p_sys->i_extend_factor, p_fmto->i_height
-        }
-        else
-        {
-pic_dst, p_pic, p_fmti
+dst, p_src, p_fmti->i_height
-        }
+    }
+
+    if( p_sys->i_extend_factor != 1 )
+    {
+        picture_CopyPixels( p_pic_dst, p_dst );
-    }
-