*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <string.h> /* strerror() */
#include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include <vlc/decoder.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
#include "vlc_image.h"
decoder_t *p_decoder;
image_handler_t *p_image; /* filter for resizing */
int i_height, i_width;
- int i_sar_num, i_sar_den;
+ unsigned int i_sar_num, i_sar_den;
char *psz_id;
vlc_bool_t b_inited;
};
struct decoder_owner_sys_t
{
picture_t *pp_pics[PICTURE_RING_SIZE];
+
+ /* Current format in use by the output */
+ video_format_t video;
};
typedef void (* pf_release_t)( picture_t * );
#define WIDTH_TEXT N_("Video width")
#define WIDTH_LONGTEXT N_( \
- "Allows you to specify the output video width." )
+ "Output video width." )
#define HEIGHT_TEXT N_("Video height")
#define HEIGHT_LONGTEXT N_( \
- "Allows you to specify the output video height." )
+ "Output video height." )
#define RATIO_TEXT N_("Sample aspect ratio")
#define RATIO_LONGTEXT N_( \
"Sample aspect ratio of the destination (1:1, 3:4, 2:3)." )
set_callbacks( Open, Close );
- var_Create( p_module->p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
vlc_module_end();
static const char *ppsz_sout_options[] = {
{
sout_stream_t *p_stream = (sout_stream_t *)p_this;
sout_stream_sys_t *p_sys;
- libvlc_t *p_libvlc = p_this->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_this->p_libvlc_global;
vlc_value_t val;
- sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_stream->p_sys = p_sys;
p_sys->b_inited = VLC_FALSE;
- var_Get( p_libvlc, "mosaic-lock", &val );
+ var_Get( p_libvlc_global, "mosaic-lock", &val );
p_sys->p_lock = val.p_address;
var_Get( p_stream, SOUT_CFG_PREFIX "id", &val );
p_sys->psz_id = val.psz_string;
var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
- p_sys->i_height = val.i_int;
+ p_sys->i_height = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
- p_sys->i_width = val.i_int;
+ p_sys->i_width = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX "sar", &val );
if ( val.psz_string )
*psz_parser++ = '\0';
p_sys->i_sar_num = atoi( val.psz_string );
p_sys->i_sar_den = atoi( psz_parser );
- vlc_reduce( &p_sys->i_sar_num, &p_sys->i_sar_den,
- p_sys->i_sar_num, p_sys->i_sar_den, 0 );
+ vlc_ureduce( &p_sys->i_sar_num, &p_sys->i_sar_den,
+ p_sys->i_sar_num, p_sys->i_sar_den, 0 );
}
else
{
p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
for( i = 0; i < PICTURE_RING_SIZE; i++ )
p_sys->p_decoder->p_owner->pp_pics[i] = 0;
+ p_sys->p_decoder->p_owner->video = p_fmt->video;
//p_sys->p_decoder->p_cfg = p_sys->p_video_cfg;
p_sys->p_decoder->p_module =
p_bridge = GetBridge( p_stream );
if ( p_bridge == NULL )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
vlc_value_t val;
p_bridge = malloc( sizeof( bridge_t ) );
- var_Create( p_libvlc, "mosaic-struct", VLC_VAR_ADDRESS );
+ var_Create( p_libvlc_global, "mosaic-struct", VLC_VAR_ADDRESS );
val.p_address = p_bridge;
- var_Set( p_libvlc, "mosaic-struct", val );
+ var_Set( p_libvlc_global, "mosaic-struct", val );
p_bridge->i_es_num = 0;
p_bridge->pp_es = NULL;
return VLC_SUCCESS;
}
- if ( p_sys->p_decoder )
+ if ( p_sys->p_decoder != NULL )
{
+ picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics;
+
if( p_sys->p_decoder->p_module )
module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
vlc_object_detach( p_sys->p_decoder );
vlc_object_destroy( p_sys->p_decoder );
+
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ {
+ if ( pp_ring[i] != NULL )
+ {
+ if ( pp_ring[i]->p_data_orig != NULL )
+ free( pp_ring[i]->p_data_orig );
+ free( pp_ring[i]->p_sys );
+ free( pp_ring[i] );
+ }
+ }
}
vlc_mutex_lock( p_sys->p_lock );
if ( b_last_es )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
for ( i = 0; i < p_bridge->i_es_num; i++ )
free( p_bridge->pp_es[i] );
free( p_bridge->pp_es );
free( p_bridge );
- var_Destroy( p_libvlc, "mosaic-struct" );
+ var_Destroy( p_libvlc_global, "mosaic-struct" );
}
vlc_mutex_unlock( p_sys->p_lock );
if ( p_sys->i_height || p_sys->i_width )
{
- video_format_t fmt_out = {0}, fmt_in = {0};
+ video_format_t fmt_out, fmt_in;
+
+ memset( &fmt_in, 0, sizeof(video_format_t) );
+ memset( &fmt_out, 0, sizeof(video_format_t) );
fmt_in = p_sys->p_decoder->fmt_out.video;
fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
struct picture_sys_t
{
vlc_object_t *p_owner;
+ vlc_bool_t b_dead;
};
static void video_release_buffer( picture_t *p_pic )
static picture_t *video_new_buffer( decoder_t *p_dec )
{
+ decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
picture_t **pp_ring = p_dec->p_owner->pp_pics;
picture_t *p_pic;
int i;
+ if( p_dec->fmt_out.video.i_width != p_sys->video.i_width ||
+ p_dec->fmt_out.video.i_height != p_sys->video.i_height ||
+ p_dec->fmt_out.video.i_chroma != p_sys->video.i_chroma ||
+ p_dec->fmt_out.video.i_aspect != p_sys->video.i_aspect )
+ {
+ if( !p_dec->fmt_out.video.i_sar_num ||
+ !p_dec->fmt_out.video.i_sar_den )
+ {
+ p_dec->fmt_out.video.i_sar_num =
+ p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height;
+
+ p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
+ p_dec->fmt_out.video.i_width;
+ }
+
+ vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
+ &p_dec->fmt_out.video.i_sar_den,
+ p_dec->fmt_out.video.i_sar_num,
+ p_dec->fmt_out.video.i_sar_den, 0 );
+
+ if( !p_dec->fmt_out.video.i_visible_width ||
+ !p_dec->fmt_out.video.i_visible_height )
+ {
+ p_dec->fmt_out.video.i_visible_width =
+ p_dec->fmt_out.video.i_width;
+ p_dec->fmt_out.video.i_visible_height =
+ p_dec->fmt_out.video.i_height;
+ }
+
+ p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
+ p_sys->video = p_dec->fmt_out.video;
+
+ for( i = 0; i < PICTURE_RING_SIZE; i++ )
+ {
+ if ( pp_ring[i] != NULL )
+ {
+ if ( pp_ring[i]->i_status == DESTROYED_PICTURE )
+ {
+ if ( pp_ring[i]->p_data_orig != NULL )
+ free( pp_ring[i]->p_data_orig );
+ free( pp_ring[i]->p_sys );
+ free( pp_ring[i] );
+ }
+ else
+ {
+ pp_ring[i]->p_sys->b_dead = VLC_TRUE;
+ }
+ pp_ring[i] = NULL;
+ }
+ }
+ }
+
/* Find an empty space in the picture ring buffer */
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
+ if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
{
pp_ring[i]->i_status = RESERVED_PICTURE;
return pp_ring[i];
}
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
- if( pp_ring[i] == 0 ) break;
+ if( pp_ring[i] == NULL ) break;
}
if( i == PICTURE_RING_SIZE )
if( !p_pic->i_planes )
{
free( p_pic );
- return 0;
+ return NULL;
}
p_pic->pf_release = video_release_buffer;
p_pic->p_sys = malloc( sizeof(picture_sys_t) );
p_pic->p_sys->p_owner = VLC_OBJECT(p_dec);
+ p_pic->p_sys->b_dead = VLC_FALSE;
p_pic->i_status = RESERVED_PICTURE;
pp_ring[i] = p_pic;
{
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
+ if ( p_pic->p_sys->b_dead )
+ {
+ if ( p_pic->p_data_orig != NULL )
+ free( p_pic->p_data_orig );
+ free( p_pic->p_sys );
+ free( p_pic );
+ }
}
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )