#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 ()
/*****************************************************************************
unsigned u_fps_den;
unsigned u_ar_num;
unsigned u_ar_den;
- int i_chroma;
+ vlc_fourcc_t i_chroma;
};
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 }
};
int i_width=-1, i_height=-1;
unsigned u_fps_num=0, u_fps_den=1;
char *psz_ext;
- uint32_t i_chroma;
+ vlc_fourcc_t i_chroma;
unsigned int i_aspect = 0;
const struct preset_t *p_preset = NULL;
const uint8_t *p_peek;
/* override presets if yuv4mpeg2 */
if( b_y4m )
{
- char *psz;
- char *buf;
+ char *psz = stream_ReadLine( p_demux->s );
+ char *psz_buf;
int a = 1;
int b = 1;
- psz = stream_ReadLine( p_demux->s );
+
+ /* The string will start with "YUV4MPEG2" */
+ assert( strlen(psz) >= 9 );
/* NB, it is not possible to handle interlaced here, since the
* interlaced picture flags are in picture_t not block_t */
-#define READ_FRAC( key, num, den ) \
- buf = strstr( psz+9, key );\
- if( buf )\
+#define READ_FRAC( key, num, den ) do { \
+ psz_buf = strstr( psz+9, key );\
+ if( psz_buf )\
{\
- char *end = strchr( buf+1, ' ' );\
+ char *end = strchr( psz_buf+1, ' ' );\
char *sep;\
if( end ) *end = '\0';\
- sep = strchr( buf+1, ':' );\
+ sep = strchr( psz_buf+1, ':' );\
if( sep )\
{\
*sep = '\0';\
{\
den = 1;\
}\
- num = atoi( buf+2 );\
+ num = atoi( psz_buf+2 );\
if( sep ) *sep = ':';\
if( end ) *end = ' ';\
- }
- READ_FRAC( " W", i_width, a )
- READ_FRAC( " H", i_height, a )
- READ_FRAC( " F", u_fps_num, u_fps_den )
- READ_FRAC( " A", a, b )
+ } } while(0)
+ READ_FRAC( " W", i_width, a );
+ READ_FRAC( " H", i_height, a );
+ 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);
- buf = strstr( psz+9, " C" );
- if( buf )
+ psz_buf = strstr( psz+9, " C" );
+ if( psz_buf )
{
- char *end = strchr( buf+1, ' ' );
- if( end ) *end = '\0';
- buf+=2;
- if( !strncmp( buf, "420jpeg", 7 ) ) {
- i_chroma = VLC_FOURCC('I','4','2','0');
- }
- else if( !strncmp( buf, "420paldv", 8 ) ) {
- i_chroma = VLC_FOURCC('I','4','2','0');
- }
- else if( !strncmp( buf, "420", 3 ) ) {
- i_chroma = VLC_FOURCC('I','4','2','0');
- }
- else if( !strncmp( buf, "422", 3 ) ) {
- i_chroma = VLC_FOURCC('I','4','2','2');
- }
- else if( !strncmp( buf, "444", 3 ) ) {
- i_chroma = VLC_FOURCC('I','4','4','4');
- }
- else if( !strncmp( buf, "mono", 4 ) ) {
- i_chroma = VLC_FOURCC('G','R','E','Y');
- }
- else {
- msg_Warn( p_demux, "Unknown YUV4MPEG2 chroma type \"%s\"", buf );
+ static const struct { const char *psz_name; vlc_fourcc_t i_fcc; } formats[] =
+ {
+ { "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;
+ char *psz_end = strchr( psz_buf+1, ' ' );
+ if( psz_end )
+ *psz_end = '\0';
+ psz_buf += 2;
+
+ for( int i = 0; formats[i].psz_name != NULL; i++ )
+ {
+ if( !strncmp( psz_buf, formats[i].psz_name, strlen(formats[i].psz_name) ) )
+ {
+ i_chroma = formats[i].i_fcc;
+ b_found = true;
+ break;
+ }
}
- if( end ) *end = ' ';
+ if( !b_found )
+ msg_Warn( p_demux, "Unknown YUV4MPEG2 chroma type \"%s\"", psz_buf );
+ if( psz_end )
+ *psz_end = ' ';
}
free( psz );
if( i_tmp ) i_height = i_tmp;
char *psz_tmp;
- psz_tmp = var_CreateGetString( p_demux, "rawvid-chroma" );
+ psz_tmp = var_CreateGetNonEmptyString( p_demux, "rawvid-chroma" );
if( psz_tmp )
{
if( strlen( psz_tmp ) != 4 )
free( psz_tmp );
}
- psz_tmp = var_CreateGetString( p_demux, "rawvid-fps" );
- if( psz_tmp ) {
+ psz_tmp = var_CreateGetNonEmptyString( p_demux, "rawvid-fps" );
+ if( psz_tmp )
+ {
char *p_ptr;
/* fps can either be n/d or q.f
* for accuracy, avoid representation in float */
free( psz_tmp );
}
- psz_tmp = var_CreateGetString( p_demux, "rawvid-aspect-ratio" );
+ psz_tmp = var_CreateGetNonEmptyString( p_demux, "rawvid-aspect-ratio" );
if( psz_tmp )
{
char *psz_denominator = strchr( psz_tmp, ':' );
}
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_aspect );
vlc_ureduce( &p_sys->fmt_video.video.i_frame_rate,
&p_sys->fmt_video.video.i_frame_rate_base,
return VLC_SUCCESS;
error:
- if( p_sys )
- free( p_sys );
+ free( p_sys );
return VLC_EGENERIC;
}
if( p_sys->b_y4m )
{
/* Skip the frame header */
- unsigned char psz_buf[10];
- psz_buf[9] = '\0';
- stream_Read( p_demux->s, psz_buf, strlen( "FRAME" ) );
- while( psz_buf[0] != 0x0a )
+ /* Skip "FRAME" */
+ if( stream_Read( p_demux->s, NULL, 5 ) < 5 )
+ return 0;
+ /* Find \n */
+ for( ;; )
{
- if( stream_Read( p_demux->s, psz_buf, 1 ) < 1 )
+ uint8_t b;
+ if( stream_Read( p_demux->s, &b, 1 ) < 1 )
return 0;
+ if( b == 0x0a )
+ break;
}
}
{
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