mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 07:42:17 +00:00
7a1396b6ca
Enable autoprobing for demux_mf, so that image files can be directly displayed with e.g. "mpv file.jpg --pause". (The --pause switch is needed to prevent the window from closing immediately.) Since demux_mf doesn't have any real file format probing and goes by file extension only, move the demuxer down the demuxer list to ensure it's checked last. (ffmpeg's demux_mf equivalent, "image2", probes by file extensions too, and there doesn't seem to be anything that can probe typical image file formats from binary data.) Remove the --mf "w" and "h" suboptions. Don't pass the width/height to the video stream header. Both of these are useless, because the decoder reads the real image size at a later point from the file headers. Remove setting the BITMAPINFOHEADER as well, as vd_lavc doesn't need this. Enable --correct-pts by default. This fixes displaying a single image with vo_vdpau (as mentioned by uau). Keep around a pointer to the sh_video stream header instead of accessing demuxer->video->sh_video. Fixes a crash when deselecting the video track. Note that the format probing is incorrect when opening images from HTTP locations. File extensions don't have to match the actual file format. A correct implementation would require to check the MIME type, or to probe the binary data correctly.
180 lines
4.7 KiB
C
180 lines
4.7 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer 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
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "osdep/io.h"
|
|
|
|
#include "config.h"
|
|
|
|
#ifdef HAVE_GLOB
|
|
#include <glob.h>
|
|
#else
|
|
#include "osdep/glob.h"
|
|
#endif
|
|
#include "osdep/strsep.h"
|
|
|
|
#include "core/mp_msg.h"
|
|
#include "stream/stream.h"
|
|
#include "core/path.h"
|
|
|
|
#include "mf.h"
|
|
|
|
double mf_fps = 25.0;
|
|
char * mf_type = NULL; //"jpg";
|
|
|
|
mf_t* open_mf_pattern(char * filename)
|
|
{
|
|
#if defined(HAVE_GLOB) || defined(__MINGW32__)
|
|
glob_t gg;
|
|
int i;
|
|
char * fname;
|
|
mf_t * mf;
|
|
int error_count = 0;
|
|
int count = 0;
|
|
|
|
mf=calloc( 1,sizeof( mf_t ) );
|
|
|
|
if( filename[0] == '@' )
|
|
{
|
|
FILE *lst_f=fopen(filename + 1,"r");
|
|
if ( lst_f )
|
|
{
|
|
fname=malloc(MP_PATH_MAX);
|
|
while ( fgets( fname,MP_PATH_MAX,lst_f ) )
|
|
{
|
|
/* remove spaces from end of fname */
|
|
char *t=fname + strlen( fname ) - 1;
|
|
while ( t > fname && isspace( *t ) ) *(t--)=0;
|
|
if ( !mp_path_exists( fname ) )
|
|
{
|
|
mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
|
|
}
|
|
else
|
|
{
|
|
mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) );
|
|
mf->names[mf->nr_of_files]=strdup( fname );
|
|
mf->nr_of_files++;
|
|
}
|
|
}
|
|
fclose( lst_f );
|
|
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files );
|
|
goto exit_mf;
|
|
}
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] %s is not indirect filelist\n",filename+1 );
|
|
}
|
|
|
|
if( strchr( filename,',') )
|
|
{
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] filelist: %s\n",filename );
|
|
|
|
while ( ( fname=strsep( &filename,"," ) ) )
|
|
{
|
|
if ( !mp_path_exists( fname ) )
|
|
{
|
|
mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
|
|
}
|
|
else
|
|
{
|
|
mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) );
|
|
mf->names[mf->nr_of_files]=strdup( fname );
|
|
// mp_msg( MSGT_STREAM,MSGL_V,"[mf] added file %d.: %s\n",mf->nr_of_files,mf->names[mf->nr_of_files] );
|
|
mf->nr_of_files++;
|
|
}
|
|
}
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files );
|
|
|
|
goto exit_mf;
|
|
}
|
|
|
|
fname=malloc( strlen( filename ) + 32 );
|
|
|
|
if ( !strchr( filename,'%' ) )
|
|
{
|
|
strcpy( fname,filename );
|
|
if ( !strchr( filename,'*' ) ) strcat( fname,"*" );
|
|
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] search expr: %s\n",fname );
|
|
|
|
if ( glob( fname,0,NULL,&gg ) )
|
|
{ free( mf ); free( fname ); return NULL; }
|
|
|
|
mf->nr_of_files=gg.gl_pathc;
|
|
mf->names=calloc( gg.gl_pathc, sizeof( char* ) );
|
|
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d (%zd)\n",mf->nr_of_files, gg.gl_pathc * sizeof( char* ) );
|
|
|
|
for( i=0;i < gg.gl_pathc;i++ )
|
|
{
|
|
if (mp_path_isdir(gg.gl_pathv[i]))
|
|
continue;
|
|
mf->names[i]=strdup( gg.gl_pathv[i] );
|
|
// mp_msg( MSGT_STREAM,MSGL_DBG2,"[mf] added file %d.: %s\n",i,mf->names[i] );
|
|
}
|
|
globfree( &gg );
|
|
goto exit_mf;
|
|
}
|
|
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] search expr: %s\n",filename );
|
|
|
|
while ( error_count < 5 )
|
|
{
|
|
sprintf( fname,filename,count++ );
|
|
if ( !mp_path_exists( fname ) )
|
|
{
|
|
error_count++;
|
|
mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
|
|
}
|
|
else
|
|
{
|
|
mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) );
|
|
mf->names[mf->nr_of_files]=strdup( fname );
|
|
// mp_msg( MSGT_STREAM,MSGL_V,"[mf] added file %d.: %s\n",mf->nr_of_files,mf->names[mf->nr_of_files] );
|
|
mf->nr_of_files++;
|
|
}
|
|
}
|
|
|
|
mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files );
|
|
|
|
exit_mf:
|
|
free( fname );
|
|
return mf;
|
|
#else
|
|
mp_msg(MSGT_STREAM,MSGL_FATAL,"[mf] mf support is disabled on your os\n");
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
mf_t* open_mf_single(char * filename)
|
|
{
|
|
mf_t *mf = calloc(1, sizeof(mf_t));
|
|
mf->nr_of_files = 1;
|
|
mf->names = calloc(1, sizeof(char *));
|
|
mf->names[0] = strdup(filename);
|
|
return mf;
|
|
}
|