/*****************************************************************************
* ffms.c: ffmpegsource input
*****************************************************************************
- * Copyright (C) 2009-2010 x264 project
+ * Copyright (C) 2009-2015 x264 project
*
* Authors: Mike Gurlitz <mike.gurlitz@gmail.com>
* Steven Walters <kemuri9@gmail.com>
+ * Henrik Gramner <henrik@gramner.com>
*
* 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
#ifdef _WIN32
#include <windows.h>
-#else
-#define SetConsoleTitle(t)
#endif
typedef struct
int reduce_pts;
int vfr_input;
int num_frames;
+ int64_t time;
} ffms_hnd_t;
static int FFMS_CC update_progress( int64_t current, int64_t total, void *private )
{
- if( current % 10 )
+ int64_t *update_time = private;
+ int64_t oldtime = *update_time;
+ int64_t newtime = x264_mdate();
+ if( oldtime && newtime - oldtime < UPDATE_INTERVAL )
return 0;
+ *update_time = newtime;
+
char buf[200];
sprintf( buf, "ffms [info]: indexing input file [%.1f%%]", 100.0 * current / total );
fprintf( stderr, "%s \r", buf+5 );
- SetConsoleTitle( buf );
+ x264_cli_set_console_title( buf );
fflush( stderr );
return 0;
}
+/* handle the deprecated jpeg pixel formats */
+static int handle_jpeg( int csp, int *fullrange )
+{
+ switch( csp )
+ {
+ case AV_PIX_FMT_YUVJ420P: *fullrange = 1; return AV_PIX_FMT_YUV420P;
+ case AV_PIX_FMT_YUVJ422P: *fullrange = 1; return AV_PIX_FMT_YUV422P;
+ case AV_PIX_FMT_YUVJ444P: *fullrange = 1; return AV_PIX_FMT_YUV444P;
+ default: return csp;
+ }
+}
+
static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, cli_input_opt_t *opt )
{
ffms_hnd_t *h = calloc( 1, sizeof(ffms_hnd_t) );
if( !h )
return -1;
- FFMS_Init( 0 );
+
+#ifdef __MINGW32__
+ /* FFMS supports UTF-8 filenames, but it uses std::fstream internally which is broken with Unicode in MinGW. */
+ FFMS_Init( 0, 0 );
+ char src_filename[MAX_PATH];
+ char idx_filename[MAX_PATH];
+ FAIL_IF_ERROR( !x264_ansi_filename( psz_filename, src_filename, MAX_PATH, 0 ), "invalid ansi filename\n" );
+ if( opt->index_file )
+ FAIL_IF_ERROR( !x264_ansi_filename( opt->index_file, idx_filename, MAX_PATH, 1 ), "invalid ansi filename\n" );
+#else
+ FFMS_Init( 0, 1 );
+ char *src_filename = psz_filename;
+ char *idx_filename = opt->index_file;
+#endif
+
FFMS_ErrorInfo e;
e.BufferSize = 0;
int seekmode = opt->seek ? FFMS_SEEK_NORMAL : FFMS_SEEK_LINEAR_NO_RW;
FFMS_Index *idx = NULL;
if( opt->index_file )
{
- struct stat index_s, input_s;
- if( !stat( opt->index_file, &index_s ) && !stat( psz_filename, &input_s ) &&
- input_s.st_mtime < index_s.st_mtime )
- idx = FFMS_ReadIndex( opt->index_file, &e );
+ x264_struct_stat index_s, input_s;
+ if( !x264_stat( opt->index_file, &index_s ) && !x264_stat( psz_filename, &input_s ) &&
+ input_s.st_mtime < index_s.st_mtime && index_s.st_size )
+ idx = FFMS_ReadIndex( idx_filename, &e );
}
if( !idx )
{
- idx = FFMS_MakeIndex( psz_filename, 0, 0, NULL, NULL, 0, update_progress, NULL, &e );
- fprintf( stderr, " \r" );
+ if( opt->progress )
+ {
+ idx = FFMS_MakeIndex( src_filename, 0, 0, NULL, NULL, 0, update_progress, &h->time, &e );
+ fprintf( stderr, " \r" );
+ }
+ else
+ idx = FFMS_MakeIndex( src_filename, 0, 0, NULL, NULL, 0, NULL, NULL, &e );
FAIL_IF_ERROR( !idx, "could not create index\n" )
- if( opt->index_file && FFMS_WriteIndex( opt->index_file, idx, &e ) )
+ if( opt->index_file && FFMS_WriteIndex( idx_filename, idx, &e ) )
x264_cli_log( "ffms", X264_LOG_WARNING, "could not write index file\n" );
}
int trackno = FFMS_GetFirstTrackOfType( idx, FFMS_TYPE_VIDEO, &e );
FAIL_IF_ERROR( trackno < 0, "could not find video track\n" )
- h->video_source = FFMS_CreateVideoSource( psz_filename, trackno, idx, 1, seekmode, &e );
+ h->video_source = FFMS_CreateVideoSource( src_filename, trackno, idx, 1, seekmode, &e );
FAIL_IF_ERROR( !h->video_source, "could not create video source\n" )
h->track = FFMS_GetTrackFromVideo( h->video_source );
const FFMS_Frame *frame = FFMS_GetFrame( h->video_source, 0, &e );
FAIL_IF_ERROR( !frame, "could not read frame 0\n" )
+ info->fullrange = 0;
info->width = frame->EncodedWidth;
info->height = frame->EncodedHeight;
- info->csp = frame->EncodedPixelFormat | X264_CSP_OTHER;
+ info->csp = handle_jpeg( frame->EncodedPixelFormat, &info->fullrange ) | X264_CSP_OTHER;
info->interlaced = frame->InterlacedFrame;
info->tff = frame->TopFieldFirst;
+ info->fullrange |= frame->ColorRange == FFMS_CR_JPEG;
/* ffms timestamps are in milliseconds. ffms also uses int64_ts for timebase,
* so we need to reduce large timebases to prevent overflow */
return 0;
}
-static int picture_alloc( cli_pic_t *pic, int csp, int width, int height )
+static int picture_alloc( cli_pic_t *pic, hnd_t handle, int csp, int width, int height )
{
- if( x264_cli_pic_alloc( pic, csp, width, height ) )
+ if( x264_cli_pic_alloc( pic, X264_CSP_NONE, width, height ) )
return -1;
+ pic->img.csp = csp;
pic->img.planes = 4;
return 0;
}
return 0;
}
-static void picture_clean( cli_pic_t *pic )
+static void picture_clean( cli_pic_t *pic, hnd_t handle )
{
memset( pic, 0, sizeof(cli_pic_t) );
}
projects / x264 / blobdiff