#include <vlc_common.h>
#include <libvlc.h>
#include <vlc_vout.h>
-#include <vlc_osd.h>
#include <vlc_filter.h>
#include <vlc_image.h>
#include <vlc_block.h>
#include <vlc_picture_fifo.h>
#include <vlc_picture_pool.h>
-#include "vout_pictures.h"
#include "vout_internal.h"
/**
- * Display a picture
+ * It retreives a picture from the vout or NULL if no pictures are
+ * available yet.
*
- * Remove the reservation flag of a picture, which will cause it to be ready
- * for display.
- */
-void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
-{
- vlc_mutex_lock( &p_vout->p->picture_lock );
-
- p_pic->p_next = NULL;
- picture_fifo_Push(p_vout->p->decoder_fifo, p_pic);
-
- vlc_cond_signal( &p_vout->p->picture_wait );
- vlc_mutex_unlock( &p_vout->p->picture_lock );
-}
-
-/**
- * Allocate a picture in the video output heap.
+ * You MUST call vout_PutPicture or vout_ReleasePicture on it.
*
- * This function creates a reserved image in the video output heap.
- * A null pointer is returned if the function fails. This method provides an
- * already allocated zone of memory in the picture data fields.
- * It needs locking since several pictures can be created by several producers
- * threads.
+ * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a
+ * read-only reference.
*/
-picture_t *vout_CreatePicture( vout_thread_t *p_vout,
- bool b_progressive,
- bool b_top_field_first,
- unsigned int i_nb_fields )
+picture_t *vout_GetPicture( vout_thread_t *p_vout )
{
-#warning "TODO remove unused vout_CreatePicture parameters"
/* Get lock */
vlc_mutex_lock( &p_vout->p->picture_lock );
picture_t *p_pic = picture_pool_Get(p_vout->p->decoder_pool);
if (p_pic) {
picture_Reset(p_pic);
- p_pic->p_next = NULL; // FIXME put it in picture_Reset ?
+ p_pic->p_next = NULL;
}
vlc_mutex_unlock( &p_vout->p->picture_lock );
return p_pic;
}
-/* */
-void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic )
+/**
+ * It gives to the vout a picture to be displayed.
+ *
+ * The given picture MUST comes from vout_GetPicture.
+ *
+ * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be
+ * read/used.
+ */
+void vout_PutPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->p->picture_lock );
- picture_Release( p_pic );
+ p_pic->p_next = NULL;
+ picture_fifo_Push(p_vout->p->decoder_fifo, p_pic);
- vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->p->picture_lock );
-}
-void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
-{
- vout_DropPicture( p_vout, p_pic );
+ vout_control_Wake( &p_vout->p->control);
}
-
/**
- * Increment reference counter of a picture
- *
- * This function increments the reference counter of a picture in the video
- * heap. It needs a lock since several producer threads can access the picture.
+ * It releases a picture retreived by vout_GetPicture.
*/
-void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
+void vout_ReleasePicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->p->picture_lock );
- picture_Hold( p_pic );
+
+ picture_Release( p_pic );
+
vlc_mutex_unlock( &p_vout->p->picture_lock );
+
+ vout_control_Wake( &p_vout->p->control);
}
/**
- * Decrement reference counter of a picture
- *
- * This function decrement the reference counter of a picture in the video heap
+ * It increment the reference counter of a picture retreived by
+ * vout_GetPicture.
*/
-void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
+void vout_HoldPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->p->picture_lock );
- picture_Release( p_pic );
- vlc_cond_signal( &p_vout->p->picture_wait );
+ picture_Hold( p_pic );
+
vlc_mutex_unlock( &p_vout->p->picture_lock );
}
i_bytes += p->i_pitch * p->i_lines;
}
- p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
- if( p_pic->p_data == NULL )
+ uint8_t *p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
+ if( !p_data )
{
p_pic->i_planes = 0;
return VLC_EGENERIC;
}
/* Fill the p_pixels field for each plane */
- p_pic->p[0].p_pixels = p_pic->p_data;
+ p_pic->p[0].p_pixels = p_data;
for( int i = 1; i < p_pic->i_planes; i++ )
{
p_pic->p[i].p_pixels = &p_pic->p[i-1].p_pixels[ p_pic->p[i-1].i_lines *
/*****************************************************************************
*
*****************************************************************************/
-typedef struct
-{
- unsigned i_plane_count;
- struct
- {
- struct
- {
- unsigned i_num;
- unsigned i_den;
- } w;
- struct
- {
- unsigned i_num;
- unsigned i_den;
- } h;
- } p[VOUT_MAX_PLANES];
- unsigned i_pixel_size;
-
-} chroma_description_t;
-
-#define PLANAR(n, w_den, h_den) \
- { n, { {{1,1}, {1,1}}, {{1,w_den}, {1,h_den}}, {{1,w_den}, {1,h_den}}, {{1,1}, {1,1}} }, 1 }
-#define PACKED(size) \
- { 1, { {{1,1}, {1,1}} }, size }
-
-static const struct
-{
- vlc_fourcc_t p_fourcc[5];
- chroma_description_t description;
-} p_chromas[] = {
- { { VLC_CODEC_I411, 0 }, PLANAR(3, 4, 1) },
- { { VLC_CODEC_I410, VLC_CODEC_YV9, 0 }, PLANAR(3, 4, 4) },
- { { VLC_CODEC_YV12, VLC_CODEC_I420, VLC_CODEC_J420, 0 }, PLANAR(3, 2, 2) },
- { { VLC_CODEC_I422, VLC_CODEC_J422, 0 }, PLANAR(3, 2, 1) },
- { { VLC_CODEC_I440, VLC_CODEC_J440, 0 }, PLANAR(3, 1, 2) },
- { { VLC_CODEC_I444, VLC_CODEC_J444, 0 }, PLANAR(3, 1, 1) },
- { { VLC_CODEC_YUVA, 0 }, PLANAR(4, 1, 1) },
-
- { { VLC_CODEC_UYVY, VLC_CODEC_VYUY, VLC_CODEC_YUYV, VLC_CODEC_YVYU, 0 }, PACKED(2) },
- { { VLC_CODEC_RGB8, VLC_CODEC_GREY, VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED(1) },
- { { VLC_CODEC_RGB16, VLC_CODEC_RGB15, 0 }, PACKED(2) },
- { { VLC_CODEC_RGB24, 0 }, PACKED(3) },
- { { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED(4) },
-
- { { VLC_CODEC_Y211, 0 }, { 1, { {{1,4}, {1,1}} }, 4 } },
-
- { {0}, { 0, {}, 0 } }
-};
-
-#undef PACKED
-#undef PLANAR
-
-static const chroma_description_t *vlc_fourcc_GetChromaDescription( vlc_fourcc_t i_fourcc )
-{
- for( unsigned i = 0; p_chromas[i].p_fourcc[0]; i++ )
- {
- const vlc_fourcc_t *p_fourcc = p_chromas[i].p_fourcc;
- for( unsigned j = 0; p_fourcc[j]; j++ )
- {
- if( p_fourcc[j] == i_fourcc )
- return &p_chromas[i].description;
- }
- }
- return NULL;
-}
-
static int LCM( int a, int b )
{
return a * b / GCD( a, b );
video_format_Setup( &p_picture->format, i_chroma, i_width, i_height,
i_sar_num, i_sar_den );
- const chroma_description_t *p_dsc =
+ const vlc_chroma_description_t *p_dsc =
vlc_fourcc_GetChromaDescription( p_picture->format.i_chroma );
if( !p_dsc )
return VLC_EGENERIC;
int i_modulo_w = 1;
int i_modulo_h = 1;
int i_ratio_h = 1;
- for( unsigned i = 0; i < p_dsc->i_plane_count; i++ )
+ for( unsigned i = 0; i < p_dsc->plane_count; i++ )
{
- i_modulo_w = LCM( i_modulo_w, 16 * p_dsc->p[i].w.i_den );
- i_modulo_h = LCM( i_modulo_h, 16 * p_dsc->p[i].h.i_den );
- if( i_ratio_h < p_dsc->p[i].h.i_den )
- i_ratio_h = p_dsc->p[i].h.i_den;
+ i_modulo_w = LCM( i_modulo_w, 16 * p_dsc->p[i].w.den );
+ i_modulo_h = LCM( i_modulo_h, 16 * p_dsc->p[i].h.den );
+ if( i_ratio_h < p_dsc->p[i].h.den )
+ i_ratio_h = p_dsc->p[i].h.den;
}
const int i_width_aligned = ( i_width + i_modulo_w - 1 ) / i_modulo_w * i_modulo_w;
const int i_height_aligned = ( i_height + i_modulo_h - 1 ) / i_modulo_h * i_modulo_h;
const int i_height_extra = 2 * i_ratio_h; /* This one is a hack for some ASM functions */
- for( unsigned i = 0; i < p_dsc->i_plane_count; i++ )
+ for( unsigned i = 0; i < p_dsc->plane_count; i++ )
{
plane_t *p = &p_picture->p[i];
- p->i_lines = (i_height_aligned + i_height_extra ) * p_dsc->p[i].h.i_num / p_dsc->p[i].h.i_den;
- p->i_visible_lines = i_height * p_dsc->p[i].h.i_num / p_dsc->p[i].h.i_den;
- p->i_pitch = i_width_aligned * p_dsc->p[i].w.i_num / p_dsc->p[i].w.i_den * p_dsc->i_pixel_size;
- p->i_visible_pitch = i_width * p_dsc->p[i].w.i_num / p_dsc->p[i].w.i_den * p_dsc->i_pixel_size;
- p->i_pixel_pitch = p_dsc->i_pixel_size;
+ p->i_lines = (i_height_aligned + i_height_extra ) * p_dsc->p[i].h.num / p_dsc->p[i].h.den;
+ p->i_visible_lines = i_height * p_dsc->p[i].h.num / p_dsc->p[i].h.den;
+ p->i_pitch = i_width_aligned * p_dsc->p[i].w.num / p_dsc->p[i].w.den * p_dsc->pixel_size;
+ p->i_visible_pitch = i_width * p_dsc->p[i].w.num / p_dsc->p[i].w.den * p_dsc->pixel_size;
+ p->i_pixel_pitch = p_dsc->pixel_size;
assert( (p->i_pitch % 16) == 0 );
}
- p_picture->i_planes = p_dsc->i_plane_count;
+ p_picture->i_planes = p_dsc->plane_count;
return VLC_SUCCESS;
}
{
video_format_t fmt = *p_fmt;
- /* It is needed to be sure all informations are filled */
+ /* It is needed to be sure all information are filled */
video_format_Setup( &fmt, p_fmt->i_chroma,
p_fmt->i_width, p_fmt->i_height,
p_fmt->i_sar_num, p_fmt->i_sar_den );
p_picture->format = fmt;
p_picture->i_refcount = 1;
p_picture->pf_release = PictureReleaseCallback;
- p_picture->i_status = RESERVED_PICTURE;
return p_picture;
}
unsigned int i_original_height;
if( fmt_in.i_sar_num >= fmt_in.i_sar_den )
{
- i_original_width = fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den;
+ i_original_width = (int64_t)fmt_in.i_width * fmt_in.i_sar_num / fmt_in.i_sar_den;
i_original_height = fmt_in.i_height;
}
else
{
i_original_width = fmt_in.i_width;
- i_original_height = fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num;
+ i_original_height = (int64_t)fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num;
}
/* */
projects / vlc / blobdiff