/*****************************************************************************
* rawvid.c : raw video input module for vlc
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Antoine Cellerier <dionoea at videolan d.t 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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.
*****************************************************************************/
/*****************************************************************************
#define FPS_TEXT N_("Frames per Second")
#define FPS_LONGTEXT N_("This is the desired frame rate when " \
- "playing raw video streams. In the form 30000/1001 or 29.97")
+ "playing raw video streams. In the form 30000/1001 or 29.97")
#define WIDTH_TEXT N_("Width")
#define WIDTH_LONGTEXT N_("This specifies the width in pixels of the raw " \
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
int i_width=-1, i_height=-1;
- unsigned u_fps_num=0, u_fps_den=1;
+ unsigned u_fps_num, u_fps_den;
vlc_fourcc_t i_chroma = 0;
- unsigned int i_sar_num = 0;
- unsigned int i_sar_den = 0;
+ unsigned int i_sar_num;
+ unsigned int i_sar_den;
const struct preset_t *p_preset = NULL;
const uint8_t *p_peek;
bool b_y4m = false;
return VLC_EGENERIC;
}
valid:
- /* Set p_input field */
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
/* override presets if yuv4mpeg2 */
if( b_y4m )
{
+ /* The string should start with "YUV4MPEG2" */
char *psz = stream_ReadLine( p_demux->s );
char *psz_buf;
int a = 1;
int b = 1;
- /* The string will start with "YUV4MPEG2" */
- assert( strlen(psz) >= 9 );
+ if( unlikely(psz == NULL) )
+ goto error;
/* NB, it is not possible to handle interlaced here, since the
* interlaced picture flags are in picture_t not block_t */
free( psz_tmp );
}
- psz_tmp = var_CreateGetNonEmptyString( p_demux, "rawvid-fps" );
- if( psz_tmp )
+ if( var_InheritURational( p_demux, &u_fps_num, &u_fps_den, "rawvid-fps" ) )
{
- char *p_ptr;
- /* fps can either be n/d or q.f
- * for accuracy, avoid representation in float */
- u_fps_num = strtol( psz_tmp, &p_ptr, 10 );
- if( *p_ptr == '/' )
- {
- p_ptr++;
- u_fps_den = strtol( p_ptr, NULL, 10 );
- }
- else if( *p_ptr == '.' )
- {
- char *p_end;
- p_ptr++;
- int i_frac = strtol( p_ptr, &p_end, 10 );
- u_fps_den = (p_end - p_ptr) * 10;
- if( !u_fps_den )
- u_fps_den = 1;
- u_fps_num = u_fps_num * u_fps_den + i_frac;
- }
- else if( *p_ptr == '\0')
- {
- u_fps_den = 1;
- }
- free( psz_tmp );
+ u_fps_num = 0;
+ u_fps_den = 1;
}
- psz_tmp = var_CreateGetNonEmptyString( p_demux, "rawvid-aspect-ratio" );
- if( psz_tmp )
- {
- char *psz_denominator = strchr( psz_tmp, ':' );
- if( psz_denominator )
- {
- *psz_denominator++ = '\0';
- i_sar_num = atoi( psz_tmp ) * i_height;
- i_sar_den = atoi( psz_denominator ) * i_width;
- }
- free( psz_tmp );
- }
+ if( var_InheritURational( p_demux, &i_sar_num, &i_sar_den,
+ "rawvid-aspect-ratio" ) )
+ i_sar_num = i_sar_den = 1;
/* moan about anything wrong */
if( i_width <= 0 || i_height <= 0 )
}
es_format_Init( &p_sys->fmt_video, VIDEO_ES, i_chroma );
- video_format_Setup( &p_sys->fmt_video.video,
- i_chroma, i_width, i_height,
+ video_format_Setup( &p_sys->fmt_video.video, i_chroma,
+ i_width, i_height, i_width, i_height,
i_sar_num, i_sar_den );
vlc_ureduce( &p_sys->fmt_video.video.i_frame_rate,
* p_sys->fmt_video.video.i_bits_per_pixel / 8;
p_sys->p_es_video = es_out_Add( p_demux->out, &p_sys->fmt_video );
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
return VLC_SUCCESS;
error:
projects / vlc / blobdiff