#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
-#include <vlc_vout.h> /* vout_InitFormat */
+#include <assert.h>
/*****************************************************************************
* Module descriptor
add_integer( "rawvid-width", 0, 0, WIDTH_TEXT, WIDTH_LONGTEXT, 0 )
add_integer( "rawvid-height", 0, 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 )
add_string( "rawvid-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
- true );
+ true )
add_string( "rawvid-aspect-ratio", NULL, NULL,
- ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true );
+ ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true )
vlc_module_end ()
/*****************************************************************************
static const struct preset_t p_presets[] =
{
- { "sqcif", 128, 96, 30000, 1001, 4,3, VLC_FOURCC('Y','V','1','2') },
- { "qcif", 176, 144, 30000, 1001, 4,3, VLC_FOURCC('Y','V','1','2') },
- { "cif", 352, 288, 30000, 1001, 4,3, VLC_FOURCC('Y','V','1','2') },
- { "4cif", 704, 576, 30000, 1001, 4,3, VLC_FOURCC('Y','V','1','2') },
- { "16cif", 1408, 1152, 30000, 1001, 4,3, VLC_FOURCC('Y','V','1','2') },
- { "yuv", 176, 144, 25, 1, 4,3, VLC_FOURCC('Y','V','1','2') },
+ { "sqcif", 128, 96, 30000, 1001, 4,3, VLC_CODEC_YV12 },
+ { "qcif", 176, 144, 30000, 1001, 4,3, VLC_CODEC_YV12 },
+ { "cif", 352, 288, 30000, 1001, 4,3, VLC_CODEC_YV12 },
+ { "4cif", 704, 576, 30000, 1001, 4,3, VLC_CODEC_YV12 },
+ { "16cif", 1408, 1152, 30000, 1001, 4,3, VLC_CODEC_YV12 },
+ { "yuv", 176, 144, 25, 1, 4,3, VLC_CODEC_YV12 },
{ NULL, 0, 0, 0, 0, 0,0, 0 }
};
demux_sys_t *p_sys;
int i_width=-1, i_height=-1;
unsigned u_fps_num=0, u_fps_den=1;
- char *psz_ext;
vlc_fourcc_t i_chroma;
- unsigned int i_aspect = 0;
+ unsigned int i_sar_num = 0;
+ unsigned int i_sar_den = 0;
const struct preset_t *p_preset = NULL;
const uint8_t *p_peek;
- bool b_valid = false;
bool b_y4m = false;
if( stream_Peek( p_demux->s, &p_peek, 9 ) == 9 )
/* http://wiki.multimedia.cx/index.php?title=YUV4MPEG2 */
if( !strncmp( (char *)p_peek, "YUV4MPEG2", 9 ) )
{
- b_valid = true;
b_y4m = true;
+ goto valid;
}
}
- /* guess preset based on file extension */
- psz_ext = strrchr( p_demux->psz_path, '.' );
- if( psz_ext )
+ if( !p_demux->b_force )
{
+ /* guess preset based on file extension */
+ if( !p_demux->psz_file )
+ return VLC_EGENERIC;
+
+ const char *psz_ext = strrchr( p_demux->psz_file, '.' );
+ if( !psz_ext )
+ return VLC_EGENERIC;
psz_ext++;
- for( int i = 0; p_presets[i].psz_ext ; i++ )
+
+ for( unsigned i = 0; p_presets[i].psz_ext ; i++ )
{
if( !strcasecmp( psz_ext, p_presets[i].psz_ext ) )
{
p_preset = &p_presets[i];
- b_valid = true;
- break;
+ goto valid;
}
}
- }
- if( !b_valid && !p_demux->b_force )
return VLC_EGENERIC;
-
+ }
+valid:
/* Set p_input field */
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
i_height = p_preset->i_height;
u_fps_num = p_preset->u_fps_num;
u_fps_den = p_preset->u_fps_den;
- i_aspect = VOUT_ASPECT_FACTOR * p_preset->u_ar_num / p_preset->u_ar_den;
+ i_sar_num = p_preset->u_ar_num * p_preset->i_height;
+ i_sar_den = p_preset->u_ar_den * p_preset->i_width;
i_chroma = p_preset->i_chroma;
}
READ_FRAC( " F", u_fps_num, u_fps_den );
READ_FRAC( " A", a, b );
#undef READ_FRAC
- /* Try to calculate aspect ratio here, rather than store ratio
- * in u_ar_{num,den}, since width may be overridden by then.
- * Plus, a:b is sar. */
if( b != 0 )
- i_aspect = VOUT_ASPECT_FACTOR * a * i_width / (b * i_height);
+ {
+ i_sar_num = a;
+ i_sar_den = b;
+ }
psz_buf = strstr( psz+9, " C" );
if( psz_buf )
{
static const struct { const char *psz_name; vlc_fourcc_t i_fcc; } formats[] =
{
- { "420jpeg", VLC_FOURCC('I','4','2','0') },
- { "420paldv", VLC_FOURCC('I','4','2','0') },
- { "420", VLC_FOURCC('I','4','2','0') },
- { "422", VLC_FOURCC('I','4','2','2') },
- { "444", VLC_FOURCC('I','4','4','4') },
- { "mono", VLC_FOURCC('G','R','E','Y') },
+ { "420jpeg", VLC_CODEC_I420 },
+ { "420paldv", VLC_CODEC_I420 },
+ { "420", VLC_CODEC_I420 },
+ { "422", VLC_CODEC_I422 },
+ { "444", VLC_CODEC_I444 },
+ { "mono", VLC_CODEC_GREY },
{ NULL, 0 }
};
bool b_found = false;
if( psz_denominator )
{
*psz_denominator++ = '\0';
- i_aspect = atoi( psz_tmp ) * VOUT_ASPECT_FACTOR
- / atoi( psz_denominator );
+ i_sar_num = atoi( psz_tmp ) * i_height;
+ i_sar_den = atoi( psz_denominator ) * i_width;
}
free( psz_tmp );
}
}
/* fixup anything missing with sensible assumptions */
- if( !i_aspect )
+ if( i_sar_num <= 0 || i_sar_den <= 0 )
{
/* assume 1:1 sar */
- i_aspect = i_width * VOUT_ASPECT_FACTOR / i_height;
+ i_sar_num = 1;
+ i_sar_den = 1;
}
es_format_Init( &p_sys->fmt_video, VIDEO_ES, i_chroma );
- vout_InitFormat( &p_sys->fmt_video.video, i_chroma, i_width, i_height,
- i_aspect );
+ video_format_Setup( &p_sys->fmt_video.video,
+ i_chroma, 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_frame_rate_base,
u_fps_num, u_fps_den, 0);
date_Init( &p_sys->pcr, p_sys->fmt_video.video.i_frame_rate,
p_sys->fmt_video.video.i_frame_rate_base );
- date_Set( &p_sys->pcr, 1 );
+ date_Set( &p_sys->pcr, 0 );
if( !p_sys->fmt_video.video.i_bits_per_pixel )
{
return VLC_SUCCESS;
error:
- if( p_sys )
- free( p_sys );
+ stream_Seek( p_demux->s, 0 ); // Workaround, but y4m uses stream_ReadLines
+ free( p_sys );
return VLC_EGENERIC;
}
mtime_t i_pcr = date_Get( &p_sys->pcr );
/* Call the pace control */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_pcr );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + i_pcr );
if( p_sys->b_y4m )
{
return 0;
}
- p_block->i_dts = p_block->i_pts = i_pcr;
+ p_block->i_dts = p_block->i_pts = VLC_TS_0 + i_pcr;
es_out_Send( p_demux->out, p_sys->p_es_video, p_block );
date_Increment( &p_sys->pcr, 1 );
{
demux_sys_t *p_sys = p_demux->p_sys;
- /* NB, demux_vaControlHelper only takes int for i_bps currently;
- * (2**31)-1 is insufficient to store 1080p50 4:4:4. */
- int64_t i_bps = 8LL * p_sys->frame_size * p_sys->pcr.i_divider_num
- / p_sys->pcr.i_divider_den;
+ /* (2**31)-1 is insufficient to store 1080p50 4:4:4. */
+ const int64_t i_bps = 8LL * p_sys->frame_size * p_sys->pcr.i_divider_num /
+ p_sys->pcr.i_divider_den;
/* XXX: DEMUX_SET_TIME is precise here */
return demux_vaControlHelper( p_demux->s, 0, -1, i_bps,
p_sys->frame_size, i_query, args );
}
+
projects / vlc / blobdiff