Commit cef7a5d4 authored by Antoine Cellerier's avatar Antoine Cellerier

Three new chroma converters:

 * yuy2_i420: convert from Packed YUV 4:2:2 to Planar YUV 4:2:0
 * yuy2_i422: convert from Packed YUV 4:2:2 to Planar YUV 4:2:2
 * chroma_chain: attempt to chain 2 chroma converters to acheive the conversion (i.e. yuy2 -> rv32 will be done using yuy2 -> i420 -> rv32)
parent 83d8b6b3
...@@ -1268,7 +1268,7 @@ if test "${SYS}" != "mingwce"; then ...@@ -1268,7 +1268,7 @@ if test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump]) VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump])
VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder]) VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder])
VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur]) VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur])
VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga i422_i420]) VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga i422_i420 yuy2_i422 yuy2_i420 chroma_chain])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer]) VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])
VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer param_eq]) VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer param_eq])
......
...@@ -71,3 +71,14 @@ SOURCES_grey_yuv = \ ...@@ -71,3 +71,14 @@ SOURCES_grey_yuv = \
grey_yuv.c \ grey_yuv.c \
$(NULL) $(NULL)
SOURCES_yuy2_i422 = \
yuy2_i422.c \
$(NULL)
SOURCES_yuy2_i420 = \
yuy2_i420.c \
$(NULL)
SOURCES_chroma_chain = \
chain.c \
$(NULL)
/*****************************************************************************
* chain.c : chain multiple chroma modules as a last resort solution
*****************************************************************************
* Copyright (C) 2007 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc_vout.h>
/*****************************************************************************
* Local and extern prototypes.
*****************************************************************************/
static int Activate ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
static void Chain ( vout_thread_t *, picture_t *, picture_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Chroma conversions using a chain of chroma conversion modules") );
set_capability( "chroma", 1 );
set_callbacks( Activate, Destroy );
vlc_module_end();
#define MAX_CHROMAS 2
struct chroma_sys_t
{
vlc_fourcc_t i_chroma;
vout_chroma_t chroma1;
vout_chroma_t chroma2;
picture_t *p_tmp;
};
static const vlc_fourcc_t pi_allowed_chromas[] = {
VLC_FOURCC('I','4','2','0'),
VLC_FOURCC('I','4','2','2'),
0
};
/*****************************************************************************
* Activate: allocate a chroma function
*****************************************************************************
* This function allocates and initializes a chroma function
*****************************************************************************/
static int Activate( vlc_object_t *p_this )
{
static int hack = 0;
vout_thread_t *p_vout = (vout_thread_t *)p_this;
if( hack )
{
msg_Err( p_this, "Preventing chain chroma reccursion" );
return VLC_EGENERIC;
}
hack = 1;
chroma_sys_t *p_sys = (chroma_sys_t *)malloc( sizeof( chroma_sys_t ) );
if( !p_sys )
{
hack = 0;
return VLC_ENOMEM;
}
memset( p_sys, 0, sizeof( chroma_sys_t ) );
int i;
vlc_fourcc_t i_output_chroma = p_vout->output.i_chroma;
vlc_fourcc_t i_render_chroma = p_vout->render.i_chroma;
for( i = 0; pi_allowed_chromas[i]; i++ )
{
msg_Warn( p_vout, "Trying %4s as a chroma chain",
(const char *)&pi_allowed_chromas[i] );
p_vout->output.i_chroma = pi_allowed_chromas[i];
p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL, 0 );
p_vout->output.i_chroma = i_output_chroma;
if( !p_vout->chroma.p_module )
continue;
p_sys->chroma1 = p_vout->chroma;
memset( &p_vout->chroma, 0, sizeof( vout_chroma_t ) );
p_vout->render.i_chroma = pi_allowed_chromas[i];
p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL, 0 );
p_vout->render.i_chroma = i_render_chroma;
if( !p_vout->chroma.p_module )
{
p_vout->chroma = p_sys->chroma1;
module_Unneed( p_vout, p_vout->chroma.p_module );
continue;
}
p_sys->chroma2 = p_vout->chroma;
memset( &p_vout->chroma, 0, sizeof( vout_chroma_t ) );
p_sys->i_chroma = pi_allowed_chromas[i];
p_vout->chroma.pf_convert = Chain;
p_vout->chroma.p_sys = p_sys;
hack = 0;
return VLC_SUCCESS;
}
free( p_sys );
hack = 0;
return VLC_EGENERIC;
}
static void Destroy( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_chroma_t chroma = p_vout->chroma;
p_vout->chroma = chroma.p_sys->chroma1;
module_Unneed( p_vout, p_vout->chroma.p_module );
p_vout->chroma = chroma.p_sys->chroma2;
module_Unneed( p_vout, p_vout->chroma.p_module );
p_vout->chroma = chroma;
if( chroma.p_sys->p_tmp )
{
free( chroma.p_sys->p_tmp->p_data_orig );
free( chroma.p_sys->p_tmp );
}
free( chroma.p_sys );
}
/*****************************************************************************
* Chain
*****************************************************************************/
static void Chain( vout_thread_t *p_vout, picture_t *p_source,
picture_t *p_dest )
{
chroma_sys_t *p_sys = p_vout->chroma.p_sys;
if( !p_sys->p_tmp )
{
picture_t *p_tmp = malloc( sizeof( picture_t ) );
vout_AllocatePicture( VLC_OBJECT( p_vout ), p_tmp,
p_sys->i_chroma,
p_source->p_heap->i_width,
p_source->p_heap->i_height,
p_source->p_heap->i_aspect );
if( !p_tmp )
return;
p_sys->p_tmp = p_tmp;
p_tmp->pf_release = NULL;
p_tmp->i_status = RESERVED_PICTURE;
p_tmp->p_sys = NULL;
}
p_sys->chroma1.pf_convert( p_vout, p_source, p_sys->p_tmp );
p_sys->chroma2.pf_convert( p_vout, p_sys->p_tmp, p_dest );
}
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment