/*****************************************************************************
* vout_pictures.c : picture management functions
*****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2004 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-
-#include "vlc_video.h"
-#include "video_output.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
-#include "vout_pictures.h"
+#include <vlc_common.h>
+#include <libvlc.h>
+#include <vlc_vout.h>
+#include <vlc_filter.h>
+#include <vlc_image.h>
+#include <vlc_block.h>
+#include <vlc_picture_fifo.h>
+#include <vlc_picture_pool.h>
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void CopyPicture( vout_thread_t *, picture_t *, picture_t * );
+#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. The picture won't be displayed until vout_DatePicture has been
- * called.
+ * You MUST call vout_PutPicture or vout_ReleasePicture on it.
+ *
+ * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a
+ * read-only reference.
*/
-void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
+picture_t *vout_GetPicture( vout_thread_t *p_vout )
{
- vlc_mutex_lock( &p_vout->picture_lock );
- switch( p_pic->i_status )
- {
- case RESERVED_PICTURE:
- p_pic->i_status = RESERVED_DISP_PICTURE;
- break;
- case RESERVED_DATED_PICTURE:
- p_pic->i_status = READY_PICTURE;
- break;
- default:
- msg_Err( p_vout, "picture to display %p has invalid status %d",
- p_pic, p_pic->i_status );
- break;
+ /* 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;
}
+ vlc_mutex_unlock( &p_vout->p->picture_lock );
- vlc_mutex_unlock( &p_vout->picture_lock );
+ return p_pic;
}
/**
- * Date a picture
+ * It gives to the vout a picture to be displayed.
*
- * Remove the reservation flag of a picture, which will cause it to be ready
- * for display. The picture won't be displayed until vout_DisplayPicture has
- * been called.
- * \param p_vout The vout in question
- * \param p_pic The picture to date
- * \param date The date to display the picture
+ * The given picture MUST comes from vout_GetPicture.
+ *
+ * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be
+ * read/used.
*/
-void vout_DatePicture( vout_thread_t *p_vout,
- picture_t *p_pic, mtime_t date )
+void vout_PutPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
- vlc_mutex_lock( &p_vout->picture_lock );
- p_pic->date = date;
- switch( p_pic->i_status )
- {
- case RESERVED_PICTURE:
- p_pic->i_status = RESERVED_DATED_PICTURE;
- break;
- case RESERVED_DISP_PICTURE:
- p_pic->i_status = READY_PICTURE;
- break;
- default:
- msg_Err( p_vout, "picture to date %p has invalid status %d",
- p_pic, p_pic->i_status );
- break;
- }
+ vlc_mutex_lock( &p_vout->p->picture_lock );
- vlc_mutex_unlock( &p_vout->picture_lock );
+ p_pic->p_next = NULL;
+ picture_fifo_Push(p_vout->p->decoder_fifo, p_pic);
+
+ vlc_mutex_unlock( &p_vout->p->picture_lock );
+
+ vout_control_Wake( &p_vout->p->control);
}
/**
- * Allocate a picture in the video output heap.
- *
- * 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.
+ * It releases a picture retreived by vout_GetPicture.
*/
-picture_t *vout_CreatePicture( vout_thread_t *p_vout,
- vlc_bool_t b_progressive,
- vlc_bool_t b_top_field_first,
- unsigned int i_nb_fields )
+void vout_ReleasePicture( vout_thread_t *p_vout, picture_t *p_pic )
{
- int i_pic; /* picture index */
- picture_t * p_pic;
- picture_t * p_freepic = NULL; /* first free picture */
+ vlc_mutex_lock( &p_vout->p->picture_lock );
- /* Get lock */
- vlc_mutex_lock( &p_vout->picture_lock );
+ picture_Release( p_pic );
- /*
- * Look for an empty place in the picture heap.
- */
- for( i_pic = 0; i_pic < I_RENDERPICTURES; i_pic++ )
- {
- p_pic = PP_RENDERPICTURE[(p_vout->render.i_last_used_pic + i_pic + 1)
- % I_RENDERPICTURES];
+ vlc_mutex_unlock( &p_vout->p->picture_lock );
- switch( p_pic->i_status )
- {
- case DESTROYED_PICTURE:
- /* Memory will not be reallocated, and function can end
- * immediately - this is the best possible case, since no
- * memory allocation needs to be done */
- p_pic->i_status = RESERVED_PICTURE;
- p_pic->i_refcount = 0;
- p_pic->b_force = 0;
-
- p_pic->b_progressive = b_progressive;
- p_pic->i_nb_fields = i_nb_fields;
- p_pic->b_top_field_first = b_top_field_first;
-
- p_vout->i_heap_size++;
- p_vout->render.i_last_used_pic =
- ( p_vout->render.i_last_used_pic + i_pic + 1 )
- % I_RENDERPICTURES;
- vlc_mutex_unlock( &p_vout->picture_lock );
- return( p_pic );
-
- case FREE_PICTURE:
- /* Picture is empty and ready for allocation */
- p_vout->render.i_last_used_pic =
- ( p_vout->render.i_last_used_pic + i_pic + 1 )
- % I_RENDERPICTURES;
- p_freepic = p_pic;
- break;
-
- default:
- break;
- }
- }
+ vout_control_Wake( &p_vout->p->control);
+}
- /*
- * Prepare picture
- */
- if( p_freepic != NULL )
- {
- vout_AllocatePicture( VLC_OBJECT(p_vout),
- p_freepic, p_vout->render.i_chroma,
- p_vout->render.i_width, p_vout->render.i_height,
- p_vout->render.i_aspect );
+/**
+ * It increment the reference counter of a picture retreived by
+ * vout_GetPicture.
+ */
+void vout_HoldPicture( vout_thread_t *p_vout, picture_t *p_pic )
+{
+ vlc_mutex_lock( &p_vout->p->picture_lock );
- if( p_freepic->i_planes )
- {
- /* Copy picture information, set some default values */
- p_freepic->i_status = RESERVED_PICTURE;
- p_freepic->i_type = MEMORY_PICTURE;
- p_freepic->b_slow = 0;
+ picture_Hold( p_pic );
- p_freepic->i_refcount = 0;
- p_freepic->b_force = 0;
+ vlc_mutex_unlock( &p_vout->p->picture_lock );
+}
- p_freepic->b_progressive = b_progressive;
- p_freepic->i_nb_fields = i_nb_fields;
- p_freepic->b_top_field_first = b_top_field_first;
+/**
+ * Allocate a new picture in the heap.
+ *
+ * This function allocates a fake direct buffer in memory, which can be
+ * used exactly like a video buffer. The video output thread then manages
+ * how it gets displayed.
+ */
+static int vout_AllocatePicture( picture_t *p_pic,
+ vlc_fourcc_t i_chroma,
+ int i_width, int i_height,
+ int i_sar_num, int i_sar_den )
+{
+ /* Make sure the real dimensions are a multiple of 16 */
+ if( picture_Setup( p_pic, i_chroma, i_width, i_height,
+ i_sar_num, i_sar_den ) != VLC_SUCCESS )
+ return VLC_EGENERIC;
- p_freepic->i_matrix_coefficients = 1;
+ /* Calculate how big the new image should be */
+ size_t i_bytes = 0;
+ for( int i = 0; i < p_pic->i_planes; i++ )
+ {
+ const plane_t *p = &p_pic->p[i];
- p_vout->i_heap_size++;
- }
- else
+ if( p->i_pitch <= 0 || p->i_lines <= 0 ||
+ p->i_pitch > (SIZE_MAX - i_bytes)/p->i_lines )
{
- /* Memory allocation failed : set picture as empty */
- p_freepic->i_status = FREE_PICTURE;
- p_freepic = NULL;
-
- msg_Err( p_vout, "picture allocation failed" );
+ p_pic->i_planes = 0;
+ return VLC_ENOMEM;
}
+ i_bytes += p->i_pitch * p->i_lines;
+ }
- vlc_mutex_unlock( &p_vout->picture_lock );
-
- return( p_freepic );
+ 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;
}
- /* No free or destroyed picture could be found, but the decoder
- * will try again in a while. */
- vlc_mutex_unlock( &p_vout->picture_lock );
+ /* Fill the p_pixels field for each plane */
+ 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 *
+ p_pic->p[i-1].i_pitch ];
+ }
- return( NULL );
+ return VLC_SUCCESS;
}
-/**
- * Remove a permanent or reserved picture from the heap
+/*****************************************************************************
*
- * This function frees a previously reserved picture or a permanent
- * picture. It is meant to be used when the construction of a picture aborted.
- * Note that the picture will be destroyed even if it is linked !
- */
-void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
+ *****************************************************************************/
+static void PictureReleaseCallback( picture_t *p_picture )
{
- vlc_mutex_lock( &p_vout->picture_lock );
-
-#ifdef DEBUG
- /* Check if picture status is valid */
- if( (p_pic->i_status != RESERVED_PICTURE) &&
- (p_pic->i_status != RESERVED_DATED_PICTURE) &&
- (p_pic->i_status != RESERVED_DISP_PICTURE) )
- {
- msg_Err( p_vout, "picture to destroy %p has invalid status %d",
- p_pic, p_pic->i_status );
- }
-#endif
-
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
-
- vlc_mutex_unlock( &p_vout->picture_lock );
+ if( --p_picture->i_refcount > 0 )
+ return;
+ picture_Delete( p_picture );
}
-/**
- * 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.
- */
-void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
+ *****************************************************************************/
+void picture_Reset( picture_t *p_picture )
{
- vlc_mutex_lock( &p_vout->picture_lock );
- p_pic->i_refcount++;
- vlc_mutex_unlock( &p_vout->picture_lock );
+ /* */
+ p_picture->date = VLC_TS_INVALID;
+ p_picture->b_force = false;
+ p_picture->b_progressive = false;
+ p_picture->i_nb_fields = 0;
+ p_picture->b_top_field_first = false;
+ picture_CleanupQuant( p_picture );
}
-/**
- * Decrement reference counter of a picture
+/*****************************************************************************
*
- * This function decrement the reference counter of a picture in the video heap
- */
-void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
+ *****************************************************************************/
+static int LCM( int a, int b )
{
- vlc_mutex_lock( &p_vout->picture_lock );
- p_pic->i_refcount--;
+ return a * b / GCD( a, b );
+}
+
+int picture_Setup( picture_t *p_picture, vlc_fourcc_t i_chroma,
+ int i_width, int i_height, int i_sar_num, int i_sar_den )
+{
+ /* Store default values */
+ p_picture->i_planes = 0;
+ for( unsigned i = 0; i < VOUT_MAX_PLANES; i++ )
+ {
+ plane_t *p = &p_picture->p[i];
+ p->p_pixels = NULL;
+ p->i_pixel_pitch = 0;
+ }
- if( p_pic->i_refcount < 0 )
+ p_picture->pf_release = NULL;
+ p_picture->p_release_sys = NULL;
+ p_picture->i_refcount = 0;
+
+ p_picture->i_qtype = QTYPE_NONE;
+ p_picture->i_qstride = 0;
+ p_picture->p_q = NULL;
+
+ video_format_Setup( &p_picture->format, i_chroma, i_width, i_height,
+ i_sar_num, i_sar_den );
+
+ const vlc_chroma_description_t *p_dsc =
+ vlc_fourcc_GetChromaDescription( p_picture->format.i_chroma );
+ if( !p_dsc )
+ return VLC_EGENERIC;
+
+ /* We want V (width/height) to respect:
+ (V * p_dsc->p[i].w.i_num) % p_dsc->p[i].w.i_den == 0
+ (V * p_dsc->p[i].w.i_num/p_dsc->p[i].w.i_den * p_dsc->i_pixel_size) % 16 == 0
+ Which is respected if you have
+ V % lcm( p_dsc->p[0..planes].w.i_den * 16) == 0
+ */
+ int i_modulo_w = 1;
+ int i_modulo_h = 1;
+ int i_ratio_h = 1;
+ for( unsigned i = 0; i < p_dsc->plane_count; i++ )
{
- msg_Err( p_vout, "picture %p refcount is %i",
- p_pic, p_pic->i_refcount );
- p_pic->i_refcount = 0;
+ 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;
}
- if( ( p_pic->i_refcount == 0 ) &&
- ( p_pic->i_status == DISPLAYED_PICTURE ) )
+ 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->plane_count; i++ )
{
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
+ plane_t *p = &p_picture->p[i];
+
+ 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->plane_count;
- vlc_mutex_unlock( &p_vout->picture_lock );
+ return VLC_SUCCESS;
}
-/**
- * Render a picture
+/*****************************************************************************
*
- * This function chooses whether the current picture needs to be copied
- * before rendering, does the subpicture magic, and tells the video output
- * thread which direct buffer needs to be displayed.
- */
-picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
- subpicture_t *p_subpic )
+ *****************************************************************************/
+picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_resource_t *p_resource )
{
- if( p_pic == NULL )
- {
- /* XXX: subtitles */
+ video_format_t fmt = *p_fmt;
+
+ /* 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 );
+ /* */
+ picture_t *p_picture = calloc( 1, sizeof(*p_picture) );
+ if( !p_picture )
return NULL;
- }
- if( p_pic->i_type == DIRECT_PICTURE )
+ if( p_resource )
{
- if( !p_vout->render.b_allow_modify_pics || p_pic->i_refcount )
+ if( picture_Setup( p_picture, fmt.i_chroma, fmt.i_width, fmt.i_height,
+ fmt.i_sar_num, fmt.i_sar_den ) )
{
- /* Picture is in a direct buffer and is still in use,
- * we need to copy it to another direct buffer before
- * displaying it if there are subtitles. */
- if( p_subpic != NULL )
- {
- /* We have subtitles. First copy the picture to
- * the spare direct buffer, then render the
- * subtitles. */
- CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] );
-
- vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic );
-
- return PP_OUTPUTPICTURE[0];
- }
-
- /* No subtitles, picture is in a directbuffer so
- * we can display it directly even if it is still
- * in use. */
- return p_pic;
+ free( p_picture );
+ return NULL;
}
+ p_picture->p_sys = p_resource->p_sys;
- /* Picture is in a direct buffer but isn't used by the
- * decoder. We can safely render subtitles on it and
- * display it. */
- vout_RenderSubPictures( p_vout, p_pic, p_subpic );
-
- return p_pic;
- }
-
- /* Not a direct buffer. We either need to copy it to a direct buffer,
- * or render it if the chroma isn't the same. */
- if( p_vout->b_direct )
- {
- /* Picture is not in a direct buffer, but is exactly the
- * same size as the direct buffers. A memcpy() is enough,
- * then render the subtitles. */
-
- if( PP_OUTPUTPICTURE[0]->pf_lock )
- if( PP_OUTPUTPICTURE[0]->pf_lock( p_vout, PP_OUTPUTPICTURE[0] ) )
- {
- if( PP_OUTPUTPICTURE[0]->pf_unlock )
- PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] );
-
- return NULL;
- }
-
- if( p_subpic == NULL ||
- ( p_vout->render.b_allow_modify_pics && !p_pic->i_refcount ) )
+ for( int i = 0; i < p_picture->i_planes; i++ )
{
- vout_RenderSubPictures( p_vout, p_pic, p_subpic );
- CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] );
- }
- else if( PP_OUTPUTPICTURE[0]->b_slow )
- {
- /* The picture buffer is in slow memory. We'll use
- * the "2 * VOUT_MAX_PICTURES + 1" picture as a temporary
- * one for subpictures rendering. */
- picture_t *p_tmp_pic = &p_vout->p_picture[2 * VOUT_MAX_PICTURES];
- if( p_tmp_pic->i_status == FREE_PICTURE )
- {
- vout_AllocatePicture( VLC_OBJECT(p_vout),
- p_tmp_pic, p_vout->render.i_chroma,
- p_vout->render.i_width,
- p_vout->render.i_height,
- p_vout->render.i_aspect );
- p_tmp_pic->i_type = MEMORY_PICTURE;
- p_tmp_pic->i_status = RESERVED_PICTURE;
- }
-
- CopyPicture( p_vout, p_pic, p_tmp_pic );
-
- vout_RenderSubPictures( p_vout, p_tmp_pic, p_subpic );
-
- CopyPicture( p_vout, p_tmp_pic, PP_OUTPUTPICTURE[0] );
+ p_picture->p[i].p_pixels = p_resource->p[i].p_pixels;
+ p_picture->p[i].i_lines = p_resource->p[i].i_lines;
+ p_picture->p[i].i_pitch = p_resource->p[i].i_pitch;
}
- else
- {
- CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] );
-
- vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic );
- }
-
- if( PP_OUTPUTPICTURE[0]->pf_unlock )
- PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] );
-
- return PP_OUTPUTPICTURE[0];
}
-
- /* Picture is not in a direct buffer, and needs to be converted to
- * another size/chroma. Then the subtitles need to be rendered as
- * well. This usually means software YUV, or hardware YUV with a
- * different chroma. */
-
- if( p_subpic != NULL && p_vout->p_picture[0].b_slow )
+ else
{
- /* The picture buffer is in slow memory. We'll use
- * the "2 * VOUT_MAX_PICTURES + 1" picture as a temporary
- * one for subpictures rendering. */
- picture_t *p_tmp_pic = &p_vout->p_picture[2 * VOUT_MAX_PICTURES];
- if( p_tmp_pic->i_status == FREE_PICTURE )
+ if( vout_AllocatePicture( p_picture,
+ fmt.i_chroma, fmt.i_width, fmt.i_height,
+ fmt.i_sar_num, fmt.i_sar_den ) )
{
- vout_AllocatePicture( VLC_OBJECT(p_vout),
- p_tmp_pic, p_vout->output.i_chroma,
- p_vout->output.i_width,
- p_vout->output.i_height,
- p_vout->output.i_aspect );
- p_tmp_pic->i_type = MEMORY_PICTURE;
- p_tmp_pic->i_status = RESERVED_PICTURE;
+ free( p_picture );
+ return NULL;
}
-
- /* Convert image to the first direct buffer */
- p_vout->chroma.pf_convert( p_vout, p_pic, p_tmp_pic );
-
- /* Render subpictures on the first direct buffer */
- vout_RenderSubPictures( p_vout, p_tmp_pic, p_subpic );
-
- if( p_vout->p_picture[0].pf_lock )
- if( p_vout->p_picture[0].pf_lock( p_vout, &p_vout->p_picture[0] ) )
- return NULL;
-
- CopyPicture( p_vout, p_tmp_pic, &p_vout->p_picture[0] );
}
- else
- {
- if( p_vout->p_picture[0].pf_lock )
- if( p_vout->p_picture[0].pf_lock( p_vout, &p_vout->p_picture[0] ) )
- return NULL;
+ /* */
+ p_picture->format = fmt;
+ p_picture->i_refcount = 1;
+ p_picture->pf_release = PictureReleaseCallback;
- /* Convert image to the first direct buffer */
- p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] );
+ return p_picture;
+}
+picture_t *picture_NewFromFormat( const video_format_t *p_fmt )
+{
+ return picture_NewFromResource( p_fmt, NULL );
+}
+picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den )
+{
+ video_format_t fmt;
- /* Render subpictures on the first direct buffer */
- vout_RenderSubPictures( p_vout, &p_vout->p_picture[0], p_subpic );
- }
+ memset( &fmt, 0, sizeof(fmt) );
+ video_format_Setup( &fmt, i_chroma, i_width, i_height,
+ i_sar_num, i_sar_den );
- if( p_vout->p_picture[0].pf_unlock )
- p_vout->p_picture[0].pf_unlock( p_vout, &p_vout->p_picture[0] );
+ return picture_NewFromFormat( &fmt );
+}
- return &p_vout->p_picture[0];
+/*****************************************************************************
+ *
+ *****************************************************************************/
+void picture_Delete( picture_t *p_picture )
+{
+ assert( p_picture && p_picture->i_refcount == 0 );
+ assert( p_picture->p_release_sys == NULL );
+
+ free( p_picture->p_q );
+ free( p_picture->p_data_orig );
+ free( p_picture->p_sys );
+ free( p_picture );
}
-/**
- * Calculate image window coordinates
+/*****************************************************************************
*
- * This function will be accessed by plugins. It calculates the relative
- * position of the output window and the image window.
- */
-void vout_PlacePicture( vout_thread_t *p_vout,
- unsigned int i_width, unsigned int i_height,
- unsigned int *pi_x, unsigned int *pi_y,
- unsigned int *pi_width, unsigned int *pi_height )
+ *****************************************************************************/
+void picture_CopyPixels( picture_t *p_dst, const picture_t *p_src )
{
- if( (i_width <= 0) || (i_height <=0) )
- {
- *pi_width = *pi_height = *pi_x = *pi_y = 0;
+ int i;
- return;
- }
+ for( i = 0; i < p_src->i_planes ; i++ )
+ plane_CopyPixels( p_dst->p+i, p_src->p+i );
+}
- if( p_vout->b_scale )
- {
- *pi_width = i_width;
- *pi_height = i_height;
- }
- else
- {
- *pi_width = __MIN( i_width, p_vout->render.i_width );
- *pi_height = __MIN( i_height, p_vout->render.i_height );
- }
+void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src )
+{
+ const unsigned i_width = __MIN( p_dst->i_visible_pitch,
+ p_src->i_visible_pitch );
+ const unsigned i_height = __MIN( p_dst->i_visible_lines,
+ p_src->i_visible_lines );
- if( VOUT_ASPECT_FACTOR * *pi_width / *pi_height < p_vout->render.i_aspect )
+ if( p_src->i_pitch == p_dst->i_pitch )
{
- *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+ /* There are margins, but with the same width : perfect ! */
+ vlc_memcpy( p_dst->p_pixels, p_src->p_pixels,
+ p_src->i_pitch * i_height );
}
else
{
- *pi_height = *pi_width * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
- }
+ /* We need to proceed line by line */
+ uint8_t *p_in = p_src->p_pixels;
+ uint8_t *p_out = p_dst->p_pixels;
+ int i_line;
- if( *pi_width > i_width )
- {
- *pi_width = i_width;
- *pi_height = VOUT_ASPECT_FACTOR * *pi_width / p_vout->render.i_aspect;
- }
+ assert( p_in );
+ assert( p_out );
- if( *pi_height > i_height )
- {
- *pi_height = i_height;
- *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
- }
-
- switch( p_vout->i_alignment & VOUT_ALIGN_HMASK )
- {
- case VOUT_ALIGN_LEFT:
- *pi_x = 0;
- break;
- case VOUT_ALIGN_RIGHT:
- *pi_x = i_width - *pi_width;
- break;
- default:
- *pi_x = ( i_width - *pi_width ) / 2;
- }
-
- switch( p_vout->i_alignment & VOUT_ALIGN_VMASK )
- {
- case VOUT_ALIGN_TOP:
- *pi_y = 0;
- break;
- case VOUT_ALIGN_BOTTOM:
- *pi_y = i_height - *pi_height;
- break;
- default:
- *pi_y = ( i_height - *pi_height ) / 2;
+ for( i_line = i_height; i_line--; )
+ {
+ vlc_memcpy( p_out, p_in, i_width );
+ p_in += p_src->i_pitch;
+ p_out += p_dst->i_pitch;
+ }
}
}
-/**
- * Allocate a new picture in the heap.
+/*****************************************************************************
*
- * This function allocates a fake direct buffer in memory, which can be
- * used exactly like a video buffer. The video output thread then manages
- * how it gets displayed.
- */
-void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic,
- vlc_fourcc_t i_chroma,
- int i_width, int i_height, int i_aspect )
+ *****************************************************************************/
+int picture_Export( vlc_object_t *p_obj,
+ block_t **pp_image,
+ video_format_t *p_fmt,
+ picture_t *p_picture,
+ vlc_fourcc_t i_format,
+ int i_override_width, int i_override_height )
{
- int i_bytes, i_index;
-
- vout_InitPicture( p_this, p_pic, i_chroma,
- i_width, i_height, i_aspect );
-
- /* Calculate how big the new image should be */
- i_bytes = p_pic->format.i_bits_per_pixel *
- p_pic->format.i_width * p_pic->format.i_height / 8;
-
- p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, 16, i_bytes );
-
- if( p_pic->p_data == NULL )
+ /* */
+ video_format_t fmt_in = p_picture->format;
+ if( fmt_in.i_sar_num <= 0 || fmt_in.i_sar_den <= 0 )
{
- p_pic->i_planes = 0;
- return;
+ fmt_in.i_sar_num =
+ fmt_in.i_sar_den = 1;
}
- /* Fill the p_pixels field for each plane */
- p_pic->p[ 0 ].p_pixels = p_pic->p_data;
-
- for( i_index = 1; i_index < p_pic->i_planes; i_index++ )
+ /* */
+ video_format_t fmt_out;
+ memset( &fmt_out, 0, sizeof(fmt_out) );
+ fmt_out.i_sar_num =
+ fmt_out.i_sar_den = 1;
+ fmt_out.i_chroma = i_format;
+
+ /* compute original width/height */
+ unsigned int i_original_width;
+ unsigned int i_original_height;
+ if( fmt_in.i_sar_num >= fmt_in.i_sar_den )
{
- p_pic->p[i_index].p_pixels = p_pic->p[i_index-1].p_pixels
- + p_pic->p[i_index-1].i_lines
- * p_pic->p[i_index-1].i_pitch;
+ 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;
}
-}
-
-/**
- * Initialise the video format fields given chroma/size.
- *
- * This function initializes all the video_frame_format_t fields given the
- * static properties of a picture (chroma and size).
- * \param p_format Pointer to the format structure to initialize
- * \param i_chroma Chroma to set
- * \param i_width Width to set
- * \param i_height Height to set
- * \param i_aspect Aspect ratio
- */
-void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
- int i_width, int i_height, int i_aspect )
-{
- p_format->i_chroma = i_chroma;
- p_format->i_width = p_format->i_visible_width = i_width;
- p_format->i_height = p_format->i_visible_height = i_height;
- p_format->i_x_offset = p_format->i_y_offset = 0;
- p_format->i_aspect = i_aspect;
-
-#if 0
- /* Assume we have square pixels */
- if( i_width && i_height )
- p_format->i_aspect = i_width * VOUT_ASPECT_FACTOR / i_height;
else
- p_format->i_aspect = 0;
-#endif
-
- switch( i_chroma )
{
- case FOURCC_YUVA:
- p_format->i_bits_per_pixel = 32;
- break;
- case FOURCC_I444:
- p_format->i_bits_per_pixel = 24;
- break;
- case FOURCC_I422:
- case FOURCC_YUY2:
- case FOURCC_UYVY:
- p_format->i_bits_per_pixel = 16;
- p_format->i_bits_per_pixel = 16;
- break;
- case FOURCC_I411:
- case FOURCC_YV12:
- case FOURCC_I420:
- case FOURCC_IYUV:
- p_format->i_bits_per_pixel = 12;
- break;
- case FOURCC_I410:
- case FOURCC_YVU9:
- p_format->i_bits_per_pixel = 9;
- break;
- case FOURCC_Y211:
- p_format->i_bits_per_pixel = 8;
- break;
- case FOURCC_YUVP:
- p_format->i_bits_per_pixel = 8;
- break;
-
- case FOURCC_RV32:
- p_format->i_bits_per_pixel = 32;
- break;
- case FOURCC_RV24:
- /* FIXME: Should be 24 here but x11 and our chroma conversion
- * routines assume 32. */
-#ifdef WIN32
- p_format->i_bits_per_pixel = 24;
-#else
- p_format->i_bits_per_pixel = 32;
-#endif
- break;
- case FOURCC_RV15:
- case FOURCC_RV16:
- p_format->i_bits_per_pixel = 16;
- break;
- case FOURCC_RGB2:
- p_format->i_bits_per_pixel = 8;
- break;
- default:
- p_format->i_bits_per_pixel = 0;
- break;
+ i_original_width = fmt_in.i_width;
+ i_original_height = (int64_t)fmt_in.i_height * fmt_in.i_sar_den / fmt_in.i_sar_num;
}
-}
-/**
- * Initialise the picture_t fields given chroma/size.
- *
- * This function initializes most of the picture_t fields given a chroma and
- * size. It makes the assumption that stride == width.
- * \param p_this The calling object
- * \param p_pic Pointer to the picture to initialize
- * \param i_chroma The chroma fourcc to set
- * \param i_width The width of the picture
- * \param i_height The height of the picture
- * \param i_aspect The aspect ratio of the picture
- */
-void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
- vlc_fourcc_t i_chroma,
- int i_width, int i_height, int i_aspect )
-{
- int i_index;
+ /* */
+ fmt_out.i_width = ( i_override_width < 0 ) ?
+ i_original_width : i_override_width;
+ fmt_out.i_height = ( i_override_height < 0 ) ?
+ i_original_height : i_override_height;
- /* Store default values */
- for( i_index = 0; i_index < VOUT_MAX_PLANES; i_index++ )
+ /* scale if only one direction is provided */
+ if( fmt_out.i_height == 0 && fmt_out.i_width > 0 )
{
- p_pic->p[i_index].p_pixels = NULL;
- p_pic->p[i_index].i_pixel_pitch = 1;
+ fmt_out.i_height = fmt_in.i_height * fmt_out.i_width
+ * fmt_in.i_sar_den / fmt_in.i_width / fmt_in.i_sar_num;
}
-
- vout_InitFormat( &p_pic->format, i_chroma, i_width, i_height, i_aspect );
-
- /* Calculate coordinates */
- switch( i_chroma )
+ else if( fmt_out.i_width == 0 && fmt_out.i_height > 0 )
{
- case FOURCC_I411:
- p_pic->p[ Y_PLANE ].i_lines = i_height;
- p_pic->p[ Y_PLANE ].i_pitch = i_width;
- p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch;
- p_pic->p[ U_PLANE ].i_lines = i_height;
- p_pic->p[ U_PLANE ].i_pitch = i_width / 4;
- p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch;
- p_pic->p[ V_PLANE ].i_lines = i_height;
- p_pic->p[ V_PLANE ].i_pitch = i_width / 4;
- p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch;
- p_pic->i_planes = 3;
- break;
-
- case FOURCC_I410:
- case FOURCC_YVU9:
- p_pic->p[ Y_PLANE ].i_lines = i_height;
- p_pic->p[ Y_PLANE ].i_pitch = i_width;
- p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch;
- p_pic->p[ U_PLANE ].i_lines = i_height / 4;
- p_pic->p[ U_PLANE ].i_pitch = i_width / 4;
- p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch;
- p_pic->p[ V_PLANE ].i_lines = i_height / 4;
- p_pic->p[ V_PLANE ].i_pitch = i_width / 4;
- p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch;
- p_pic->i_planes = 3;
- break;
-
- case FOURCC_YV12:
- case FOURCC_I420:
- case FOURCC_IYUV:
- p_pic->p[ Y_PLANE ].i_lines = i_height;
- p_pic->p[ Y_PLANE ].i_pitch = i_width;
- p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch;
- p_pic->p[ U_PLANE ].i_lines = i_height / 2;
- p_pic->p[ U_PLANE ].i_pitch = i_width / 2;
- p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch;
- p_pic->p[ V_PLANE ].i_lines = i_height / 2;
- p_pic->p[ V_PLANE ].i_pitch = i_width / 2;
- p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch;
- p_pic->i_planes = 3;
- break;
-
- case FOURCC_I422:
- p_pic->p[ Y_PLANE ].i_lines = i_height;
- p_pic->p[ Y_PLANE ].i_pitch = i_width;
- p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch;
- p_pic->p[ U_PLANE ].i_lines = i_height;
- p_pic->p[ U_PLANE ].i_pitch = i_width / 2;
- p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch;
- p_pic->p[ V_PLANE ].i_lines = i_height;
- p_pic->p[ V_PLANE ].i_pitch = i_width / 2;
- p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch;
- p_pic->i_planes = 3;
- break;
-
- case FOURCC_I444:
- p_pic->p[ Y_PLANE ].i_lines = i_height;
- p_pic->p[ Y_PLANE ].i_pitch = i_width;
- p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch;
- p_pic->p[ U_PLANE ].i_lines = i_height;
- p_pic->p[ U_PLANE ].i_pitch = i_width;
- p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch;
- p_pic->p[ V_PLANE ].i_lines = i_height;
- p_pic->p[ V_PLANE ].i_pitch = i_width;
- p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch;
- p_pic->i_planes = 3;
- break;
-
- case FOURCC_YUVA:
- p_pic->p[ Y_PLANE ].i_lines = i_height;
- p_pic->p[ Y_PLANE ].i_pitch = i_width;
- p_pic->p[ Y_PLANE ].i_visible_pitch = p_pic->p[ Y_PLANE ].i_pitch;
- p_pic->p[ U_PLANE ].i_lines = i_height;
- p_pic->p[ U_PLANE ].i_pitch = i_width;
- p_pic->p[ U_PLANE ].i_visible_pitch = p_pic->p[ U_PLANE ].i_pitch;
- p_pic->p[ V_PLANE ].i_lines = i_height;
- p_pic->p[ V_PLANE ].i_pitch = i_width;
- p_pic->p[ V_PLANE ].i_visible_pitch = p_pic->p[ V_PLANE ].i_pitch;
- p_pic->p[ A_PLANE ].i_lines = i_height;
- p_pic->p[ A_PLANE ].i_pitch = i_width;
- p_pic->p[ A_PLANE ].i_visible_pitch = p_pic->p[ A_PLANE ].i_pitch;
- p_pic->i_planes = 4;
- break;
-
- case FOURCC_YUVP:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 8;
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_Y211:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 4;
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_UYVY:
- case FOURCC_YUY2:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width * 2;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 4;
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_RGB2:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 1;
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_RV15:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width * 2;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 2;
-/* FIXME: p_heap isn't always reachable
- p_pic->p_heap->i_rmask = 0x001f;
- p_pic->p_heap->i_gmask = 0x03e0;
- p_pic->p_heap->i_bmask = 0x7c00; */
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_RV16:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width * 2;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 2;
-/* FIXME: p_heap isn't always reachable
- p_pic->p_heap->i_rmask = 0x001f;
- p_pic->p_heap->i_gmask = 0x07e0;
- p_pic->p_heap->i_bmask = 0xf800; */
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_RV24:
- p_pic->p->i_lines = i_height;
-
- /* FIXME: Should be 3 here but x11 and our chroma conversion
- * routines assume 4. */
-#ifdef WIN32
- p_pic->p->i_pitch = i_width * 3;
- p_pic->p->i_pixel_pitch = 3;
-#else
- p_pic->p->i_pitch = i_width * 4;
- p_pic->p->i_pixel_pitch = 4;
-#endif
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
-/* FIXME: p_heap isn't always reachable
- p_pic->p_heap->i_rmask = 0xff0000;
- p_pic->p_heap->i_gmask = 0x00ff00;
- p_pic->p_heap->i_bmask = 0x0000ff; */
- p_pic->i_planes = 1;
- break;
-
- case FOURCC_RV32:
- p_pic->p->i_lines = i_height;
- p_pic->p->i_pitch = i_width * 4;
- p_pic->p->i_visible_pitch = p_pic->p->i_pitch;
- p_pic->p->i_pixel_pitch = 4;
-/* FIXME: p_heap isn't always reachable
- p_pic->p_heap->i_rmask = 0xff0000;
- p_pic->p_heap->i_gmask = 0x00ff00;
- p_pic->p_heap->i_bmask = 0x0000ff; */
- p_pic->i_planes = 1;
- break;
-
- default:
- msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)",
- i_chroma, (char*)&i_chroma );
- p_pic->i_planes = 0;
- return;
+ fmt_out.i_width = fmt_in.i_width * fmt_out.i_height
+ * fmt_in.i_sar_num / fmt_in.i_height / fmt_in.i_sar_den;
}
-}
-/**
- * Compare two chroma values
- *
- * This function returns 1 if the two fourcc values given as argument are
- * the same format (eg. UYVY/UYNV) or almost the same format (eg. I420/YV12)
- */
-int vout_ChromaCmp( vlc_fourcc_t i_chroma, vlc_fourcc_t i_amorhc )
-{
- /* If they are the same, they are the same ! */
- if( i_chroma == i_amorhc )
- {
- return 1;
- }
+ image_handler_t *p_image = image_HandlerCreate( p_obj );
- /* Check for equivalence classes */
- switch( i_chroma )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- switch( i_amorhc )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- switch( i_amorhc )
- {
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- switch( i_amorhc )
- {
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- return 1;
-
- default:
- return 0;
- }
-
- default:
- return 0;
- }
-}
+ block_t *p_block = image_Write( p_image, p_picture, &fmt_in, &fmt_out );
-/* Following functions are local */
+ image_HandlerDelete( p_image );
-/*****************************************************************************
- * CopyPicture: copy a picture to another one
- *****************************************************************************
- * This function takes advantage of the image format, and reduces the
- * number of calls to memcpy() to the minimum. Source and destination
- * images must have same width (hence i_visible_pitch), height, and chroma.
- *****************************************************************************/
-static void CopyPicture( vout_thread_t * p_vout,
- picture_t *p_src, picture_t *p_dest )
-{
- int i;
+ if( !p_block )
+ return VLC_EGENERIC;
- for( i = 0; i < p_src->i_planes ; i++ )
- {
- if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch )
- {
- /* There are margins, but with the same width : perfect ! */
- p_vout->p_vlc->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_lines );
- }
- else
- {
- /* We need to proceed line by line */
- uint8_t *p_in = p_src->p[i].p_pixels;
- uint8_t *p_out = p_dest->p[i].p_pixels;
- int i_line;
-
- for( i_line = p_src->p[i].i_lines; i_line--; )
- {
- p_vout->p_vlc->pf_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;
- }
- }
- }
- p_dest->date = p_src->date;
+ p_block->i_pts =
+ p_block->i_dts = p_picture->date;
+
+ if( p_fmt )
+ *p_fmt = fmt_out;
+ *pp_image = p_block;
+
+ return VLC_SUCCESS;
}
+
projects / vlc / blobdiff