X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_pictures.c;h=6b233df012d5433e0f1b154ab819b4305963d793;hb=bb03e12e367a4e3a5e8127fd5ebc1a7eb670c4f0;hp=4149e8cfd29523df3715e4b003b9a4cb17e2a352;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 4149e8cfd2..6b233df012 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -30,11 +30,14 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
+#include <vlc_filter.h>
 #include "vout_pictures.h"
 
+#include <assert.h>
+
 /**
  * Display a picture
  *
@@ -375,7 +378,8 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
         }
 
         /* Convert image to the first direct buffer */
-        p_vout->chroma.pf_convert( p_vout, p_pic, p_tmp_pic );
+        p_vout->p_chroma->p_owner = (filter_owner_sys_t *)p_tmp_pic;
+        p_vout->p_chroma->pf_video_filter( p_vout->p_chroma, p_pic );
 
         /* Render subpictures on the first direct buffer */
         spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out, p_tmp_pic,
@@ -395,7 +399,8 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
                 return NULL;
 
         /* Convert image to the first direct buffer */
-        p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] );
+        p_vout->p_chroma->p_owner = (filter_owner_sys_t *)&p_vout->p_picture[0];
+        p_vout->p_chroma->pf_video_filter( p_vout->p_chroma, p_pic );
 
         /* Render subpictures on the first direct buffer */
         spu_RenderSubpictures( p_vout->p_spu, &p_vout->fmt_out,
@@ -602,6 +607,8 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
             break;
 
         case FOURCC_GREY:
+        case FOURCC_Y800:
+        case FOURCC_Y8:
             p_format->i_bits_per_pixel = 8;
             break;
 
@@ -831,6 +838,8 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
             break;
 
         case FOURCC_GREY:
+        case FOURCC_Y800:
+        case FOURCC_Y8:
             p_pic->p->i_lines = i_height_aligned;
             p_pic->p->i_visible_lines = i_height;
             p_pic->p->i_pitch = i_width_aligned;
@@ -906,6 +915,20 @@ int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc )
                     return 0;
             }
 
+        case FOURCC_GREY:
+        case FOURCC_Y800:
+        case FOURCC_Y8:
+            switch( i_amorhc )
+            {
+                case FOURCC_GREY:
+                case FOURCC_Y800:
+                case FOURCC_Y8:
+                    return 1;
+
+                default:
+                    return 0;
+            }
+
         default:
             return 0;
     }
@@ -921,6 +944,7 @@ int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc )
 void __vout_CopyPicture( vlc_object_t *p_this,
                          picture_t *p_dest, picture_t *p_src )
 {
+    VLC_UNUSED( p_this );
     int i;
 
     for( i = 0; i < p_src->i_planes ; i++ )
@@ -928,9 +952,8 @@ void __vout_CopyPicture( vlc_object_t *p_this,
         if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch )
         {
             /* There are margins, but with the same width : perfect ! */
-            p_this->p_libvlc->pf_memcpy(
-                         p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
-                         p_src->p[i].i_pitch * p_src->p[i].i_visible_lines );
+            vlc_memcpy( p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
+                        p_src->p[i].i_pitch * p_src->p[i].i_visible_lines );
         }
         else
         {
@@ -943,8 +966,7 @@ void __vout_CopyPicture( vlc_object_t *p_this,
 
             for( i_line = p_src->p[i].i_visible_lines; i_line--; )
             {
-                p_this->p_libvlc->pf_memcpy( p_out, p_in,
-                                          p_src->p[i].i_visible_pitch );
+                vlc_memcpy( p_out, p_in, p_src->p[i].i_visible_pitch );
                 p_in += p_src->p[i].i_pitch;
                 p_out += p_dest->p[i].i_pitch;
             }