github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 06:03:45 +01:00
Code Releases Activity

Issue a warning in VDec if disp_w and disp_h weren't set by codec and try workaround.

Browse Source 
Fix ijpg codec to set sh->disp_w and sh->disp_h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5366 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2002-03-27 02:58:55 +00:00
parent cf09259cc2
commit a6723d9346
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmpcodecs/vd.c
View File

@ -123,6 +123,18 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outf
int screen_size_y=0;//SCREEN_SIZE_Y;
vo_functions_t* video_out=sh->video_out;
#if 1
if(!(sh->disp_w && sh->disp_h))
mp_msg(MSGT_DECVIDEO,MSGL_WARN,
"VDec: codec didn't set sh->disp_w and sh->disp_h, trying to workaround!\n");
/* XXX: HACK, if sh->disp_* aren't set,
* but we have w and h, set them :: atmos */
if(!sh->disp_w && w)
sh->disp_w=w;
if(!sh->disp_h && h)
sh->disp_h=h;
#endif
mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d, %s \n",
w,h,vo_format_name(preferred_outfmt));

6
libmpcodecs/vd_ijpg.c
View File

@ -133,8 +133,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
if ( len <= 0 ) return NULL; // skipped frame
cinfo.err=jpeg_std_error( &jerr.pub );
jerr.pub.error_exit=my_error_exit;
if( setjmp( jerr.setjmp_buffer ) )
{
mp_msg( MSGT_DECVIDEO,MSGL_ERR,"[ijpg] setjmp error ...\n" );
@ -144,8 +142,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
jpeg_create_decompress( &cinfo );
jpeg_buf_src( &cinfo,data,len );
jpeg_read_header( &cinfo,TRUE );
width=cinfo.image_width;
height=cinfo.image_height;
sh->disp_w=width=cinfo.image_width;
sh->disp_h=height=cinfo.image_height;
jpeg_start_decompress( &cinfo );
depth=cinfo.output_components * 8;