RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Implement FIXME: Restore original width/height when CODECS_FLAG_ALIGN16 

is set and codec init failed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22030 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-01-27 15:29:07 +00:00
parent 92258be85a
commit 4199378edd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libmpcodecs/dec_video.c
View File

@ -185,6 +185,7 @@ int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){
while(1){
int i;
int orig_w, orig_h;
// restore original fourcc:
if(sh_video->bih) sh_video->bih->biCompression=orig_fourcc;
if(!(sh_video->codec=find_video_codec(sh_video->format,
@ -238,22 +239,30 @@ int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){
sh_video->codec->name, sh_video->codec->drv);
continue;
}
orig_w = sh_video->bih ? sh_video->bih->biWidth : sh_video->disp_w;
orig_h = sh_video->bih ? sh_video->bih->biHeight : sh_video->disp_h;
sh_video->disp_w = orig_w;
sh_video->disp_h = orig_h;
// it's available, let's try to init!
if(sh_video->codec->flags & CODECS_FLAG_ALIGN16){
// align width/height to n*16
// FIXME: save orig w/h, and restore if codec init failed!
if(sh_video->bih){
sh_video->disp_w=sh_video->bih->biWidth=(sh_video->bih->biWidth+15)&(~15);
sh_video->disp_h=sh_video->bih->biHeight=(sh_video->bih->biHeight+15)&(~15);
} else {
sh_video->disp_w=(sh_video->disp_w+15)&(~15);
sh_video->disp_h=(sh_video->disp_h+15)&(~15);
}
}
if (sh_video->bih) {
sh_video->bih->biWidth = sh_video->disp_w;
sh_video->bih->biHeight = sh_video->disp_h;
}
// init()
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_OpeningVideoDecoder,mpvdec->info->short_name,mpvdec->info->name);
if(!mpvdec->init(sh_video)){
mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VDecoderInitFailed);
sh_video->disp_w=orig_w;
sh_video->disp_h=orig_h;
if (sh_video->bih) {
sh_video->bih->biWidth = sh_video->disp_w;
sh_video->bih->biHeight = sh_video->disp_h;
}
continue; // try next...
}
// Yeah! We got it!