id->p_decoder->p_module = NULL;
return VLC_EGENERIC;
}
- p_sys->fmt_audio.i_rate = fmt_last->i_rate;
- p_sys->fmt_audio.i_physical_channels = fmt_last->i_physical_channels;
+ id->fmt_audio.i_rate = fmt_last->i_rate;
+ id->fmt_audio.i_physical_channels = fmt_last->i_physical_channels;
return VLC_SUCCESS;
}
}
/* Check if audio format has changed, and filters need reinit */
- if( unlikely( ( id->p_decoder->fmt_out.audio.i_rate != p_sys->fmt_audio.i_rate ) ||
- ( id->p_decoder->fmt_out.audio.i_physical_channels != p_sys->fmt_audio.i_physical_channels ) ) )
+ if( unlikely( ( id->p_decoder->fmt_out.audio.i_rate != id->fmt_audio.i_rate ) ||
+ ( id->p_decoder->fmt_out.audio.i_physical_channels != id->fmt_audio.i_physical_channels ) ) )
{
msg_Info( p_stream, "Audio changed, trying to reinitialize filters" );
if( id->p_af_chain != NULL )
/* Audio */
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
- audio_sample_format_t fmt_audio;
char *psz_aenc;
char *psz_alang;
config_chain_t *p_audio_cfg;
/* Video */
vlc_fourcc_t i_vcodec; /* codec video (0 if not transcode) */
- video_format_t fmt_input_video;
char *psz_venc;
config_chain_t *p_video_cfg;
int i_vbitrate;
{
filter_chain_t *p_f_chain; /**< Video filters */
filter_chain_t *p_uf_chain; /**< User-specified video filters */
+ video_format_t fmt_input_video;
};
- struct aout_filters *p_af_chain; /**< Audio filters */
+ struct
+ {
+ struct aout_filters *p_af_chain; /**< Audio filters */
+ audio_format_t fmt_audio;
+ };
+
};
/* Encoder */
if( unlikely (
id->p_encoder->p_module &&
- !video_format_IsSimilar( &p_sys->fmt_input_video, &id->p_decoder->fmt_out.video )
+ !video_format_IsSimilar( &id->fmt_input_video, &id->p_decoder->fmt_out.video )
)
)
{
msg_Info( p_stream, "aspect-ratio changed, reiniting. %i -> %i : %i -> %i.",
- p_sys->fmt_input_video.i_sar_num, id->p_decoder->fmt_out.video.i_sar_num,
- p_sys->fmt_input_video.i_sar_den, id->p_decoder->fmt_out.video.i_sar_den
+ id->fmt_input_video.i_sar_num, id->p_decoder->fmt_out.video.i_sar_num,
+ id->fmt_input_video.i_sar_den, id->p_decoder->fmt_out.video.i_sar_den
);
/* Close filters */
if( id->p_f_chain )
transcode_video_filter_init( p_stream, id );
transcode_video_encoder_init( p_stream, id );
conversion_video_filter_append( id );
- memcpy( &p_sys->fmt_input_video, &id->p_decoder->fmt_out.video, sizeof(video_format_t));
+ memcpy( &id->fmt_input_video, &id->p_decoder->fmt_out.video, sizeof(video_format_t));
}
transcode_video_filter_init( p_stream, id );
transcode_video_encoder_init( p_stream, id );
conversion_video_filter_append( id );
- memcpy( &p_sys->fmt_input_video, &id->p_decoder->fmt_out.video, sizeof(video_format_t));
+ memcpy( &id->fmt_input_video, &id->p_decoder->fmt_out.video, sizeof(video_format_t));
if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
{