Fix video format passed to pf_update_regions. (Fix asa without direct

[vlc] / src / video_output / vout_pictures.c

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index dd53f3e7ed329eba73f71e089cf4b43fdef48053..6b233df012d5433e0f1b154ab819b4305963d793 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -25,15 +25,19 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                                /* free() */
-#include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                            /* strerror() */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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
  *
@@ -103,8 +107,8 @@ void vout_DatePicture( vout_thread_t *p_vout,
  * threads.
  */
 picture_t *vout_CreatePicture( vout_thread_t *p_vout,
-                               vlc_bool_t b_progressive,
-                               vlc_bool_t b_top_field_first,
+                               bool b_progressive,
+                               bool b_top_field_first,
                                unsigned int i_nb_fields )
 {
     int         i_pic;                                      /* picture index */
@@ -216,7 +220,7 @@ void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
 {
     vlc_mutex_lock( &p_vout->picture_lock );
 
-#ifdef DEBUG
+#ifndef NDEBUG
     /* Check if picture status is valid */
     if( (p_pic->i_status != RESERVED_PICTURE) &&
         (p_pic->i_status != RESERVED_DATED_PICTURE) &&
@@ -256,13 +260,6 @@ void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
     vlc_mutex_lock( &p_vout->picture_lock );
     p_pic->i_refcount--;
 
-    if( p_pic->i_refcount < 0 )
-    {
-        msg_Err( p_vout, "picture %p refcount is %i",
-                 p_pic, p_pic->i_refcount );
-        p_pic->i_refcount = 0;
-    }
-
     if( ( p_pic->i_refcount == 0 ) &&
         ( p_pic->i_status == DISPLAYED_PICTURE ) )
     {
@@ -381,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,
@@ -401,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,
@@ -572,7 +571,6 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
         case FOURCC_YUY2:
         case FOURCC_UYVY:
         case FOURCC_J422:
-            p_format->i_bits_per_pixel = 16;
             p_format->i_bits_per_pixel = 16;
             break;
         case FOURCC_I411:
@@ -607,6 +605,13 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
         case FOURCC_RGB2:
             p_format->i_bits_per_pixel = 8;
             break;
+
+        case FOURCC_GREY:
+        case FOURCC_Y800:
+        case FOURCC_Y8:
+            p_format->i_bits_per_pixel = 8;
+            break;
+
         default:
             p_format->i_bits_per_pixel = 0;
             break;
@@ -832,6 +837,17 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
             p_pic->i_planes = 1;
             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;
+            p_pic->p->i_visible_pitch = i_width;
+            p_pic->p->i_pixel_pitch = 1;
+            p_pic->i_planes = 1;
+            break;
+
         default:
             msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)",
                              i_chroma, (char*)&i_chroma );
@@ -899,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;
     }
@@ -914,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++ )
@@ -921,21 +952,21 @@ 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
         {
             /* We need to proceed line by line */
             uint8_t *p_in = p_src->p[i].p_pixels;
+            assert( p_in );
             uint8_t *p_out = p_dest->p[i].p_pixels;
+            assert( p_out );
             int i_line;
 
             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;
             }