RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 04:42:10 +00:00
Code Issues Releases Wiki Activity

some cleanup, redundant code removed

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1361 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-07-20 02:14:14 +00:00
parent 1bdae59372
commit cf953cab09
1 changed files with 53 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
dec_video.c
View File

@ -259,14 +259,21 @@ switch(sh_video->codec->driver){
int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){
unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx];
int planar=(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420);
int blit_frame=0; int blit_frame=0;
uint8_t* planes_[3];
uint8_t** planes=planes_;
int stride_[3];
int* stride=stride_;
unsigned int t=GetTimer();
unsigned int t2;
//-------------------- Decode a frame: ----------------------- //-------------------- Decode a frame: -----------------------
switch(sh_video->codec->driver){ switch(sh_video->codec->driver){
case 3: { case 3: {
// OpenDivX // OpenDivX
unsigned int t=GetTimer();
unsigned int t2;
DEC_FRAME dec_frame; DEC_FRAME dec_frame;
#ifdef NEW_DECORE #ifdef NEW_DECORE
DEC_PICTURE dec_pic; DEC_PICTURE dec_pic;
@ -281,42 +288,34 @@ switch(sh_video->codec->driver){
dec_pic.y=dec_pic.u=dec_pic.v=NULL; dec_pic.y=dec_pic.u=dec_pic.v=NULL;
decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);
#else #else
opendivx_src[0]=NULL;
decore(0x123, 0, &dec_frame, NULL); decore(0x123, 0, &dec_frame, NULL);
#endif #endif
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f; if(!drop_frame)
// let's display // let's display
#ifdef NEW_DECORE #ifdef NEW_DECORE
if(dec_pic.y){ if(dec_pic.y){
void* src[3]; planes[0]=dec_pic.y;
int stride[3]; planes[1]=dec_pic.u;
src[0]=dec_pic.y; planes[2]=dec_pic.v;
src[1]=dec_pic.u;
src[2]=dec_pic.v;
stride[0]=dec_pic.stride_y; stride[0]=dec_pic.stride_y;
stride[1]=stride[2]=dec_pic.stride_uv; stride[1]=stride[2]=dec_pic.stride_uv;
video_out->draw_slice(src,stride, blit_frame=2;
sh_video->disp_w,sh_video->disp_h,0,0);
blit_frame=1;
} }
#else #else
if(opendivx_src[0]){ if(opendivx_src[0]){
video_out->draw_slice(opendivx_src,opendivx_stride, planes=opendivx_src; stride=opendivx_stride;
sh_video->disp_w,sh_video->disp_h,0,0); blit_frame=2;
opendivx_src[0]=NULL;
blit_frame=1;
} }
#endif #endif
t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
break; break;
} }
#ifdef NEW_DECORE #ifdef NEW_DECORE
case 7: { case 7: {
// DivX4Linux // DivX4Linux
unsigned int t=GetTimer();
unsigned int t2;
DEC_FRAME dec_frame; DEC_FRAME dec_frame;
// let's decode // let's decode
dec_frame.length = in_size; dec_frame.length = in_size;
@ -326,86 +325,41 @@ switch(sh_video->codec->driver){
dec_frame.stride=sh_video->disp_w; dec_frame.stride=sh_video->disp_w;
// printf("Decoding DivX4 frame\n"); // printf("Decoding DivX4 frame\n");
decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f; if(!drop_frame) blit_frame=3;
if(!drop_frame && sh_video->our_out_buffer){
// printf("Displaying DivX4 frame\n");
if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
uint8_t* dst[3];
int stride[3];
stride[0]=sh_video->disp_w;
stride[1]=stride[2]=sh_video->disp_w/2;
dst[0]=sh_video->our_out_buffer;
dst[2]=dst[0]+sh_video->disp_w*sh_video->disp_h;
dst[1]=dst[2]+sh_video->disp_w*sh_video->disp_h/4;
video_out->draw_slice(dst,stride,sh_video->disp_w,sh_video->disp_h,0,0);
} else
video_out->draw_frame((uint8_t **)&sh_video->our_out_buffer);
blit_frame=1;
}
t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
break; break;
} }
#endif #endif
#ifdef USE_DIRECTSHOW #ifdef USE_DIRECTSHOW
case 4: { // W32/DirectShow case 4: { // W32/DirectShow
unsigned int t=GetTimer();
unsigned int t2;
if(drop_frame<2) DS_VideoDecoder_DecodeFrame(start, in_size, 0, !drop_frame); if(drop_frame<2) DS_VideoDecoder_DecodeFrame(start, in_size, 0, !drop_frame);
if(!drop_frame) blit_frame=3;
if(!drop_frame && sh_video->our_out_buffer){
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
uint8_t* dst[3];
int stride[3];
stride[0]=sh_video->disp_w;
stride[1]=stride[2]=sh_video->disp_w/2;
dst[0]=sh_video->our_out_buffer;
dst[2]=dst[0]+sh_video->disp_w*sh_video->disp_h;
dst[1]=dst[2]+sh_video->disp_w*sh_video->disp_h/4;
video_out->draw_slice(dst,stride,sh_video->disp_w,sh_video->disp_h,0,0);
} else
video_out->draw_frame((uint8_t **)&sh_video->our_out_buffer);
t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
blit_frame=1;
}
break; break;
} }
#endif #endif
#ifdef USE_LIBAVCODEC #ifdef USE_LIBAVCODEC
case 5: { // libavcodec case 5: { // libavcodec
unsigned int t=GetTimer();
unsigned int t2;
int got_picture=0; int got_picture=0;
if(drop_frame<2 && in_size>0){ if(drop_frame<2 && in_size>0){
int ret = avcodec_decode_video(&lavc_context, &lavc_picture, int ret = avcodec_decode_video(&lavc_context, &lavc_picture,
&got_picture, start, in_size); &got_picture, start, in_size);
if(ret<0) fprintf(stderr, "Error while decoding frame!\n"); if(ret<0) fprintf(stderr, "Error while decoding frame!\n");
if(!drop_frame && got_picture){
planes=lavc_picture.data;
stride=lavc_picture.linesize;
blit_frame=2;
}
} }
if(!drop_frame && got_picture){
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
video_out->draw_slice(lavc_picture.data,lavc_picture.linesize,sh_video->disp_w,sh_video->disp_h,0,0);
t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
blit_frame=1;
}
break; break;
} }
#endif #endif
#ifdef ARCH_X86
case 6: case 6:
case 2: case 2:
#ifdef ARCH_X86
{ {
HRESULT ret; HRESULT ret;
unsigned int t=GetTimer();
unsigned int t2;
if(in_size){ if(!in_size) break;
sh_video->bih->biSizeImage = in_size; sh_video->bih->biSizeImage = in_size;
// sh_video->bih->biWidth = 1280; // sh_video->bih->biWidth = 1280;
@ -428,43 +382,43 @@ else
drop_frame ? 0 : sh_video->our_out_buffer); drop_frame ? 0 : sh_video->our_out_buffer);
if(ret){ printf("Error decompressing frame, err=%d\n",(int)ret);break; } if(ret){ printf("Error decompressing frame, err=%d\n",(int)ret);break; }
}
// current_module="draw_frame"; if(!drop_frame) blit_frame=3;
if(!drop_frame){
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
// if(out_fmt==IMGFMT_YV12){
if(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420){
uint8_t* dst[3];
int stride[3];
stride[0]=sh_video->disp_w;
stride[1]=stride[2]=sh_video->disp_w/2;
dst[0]=sh_video->our_out_buffer;
dst[2]=dst[0]+sh_video->disp_w*sh_video->disp_h;
dst[1]=dst[2]+sh_video->disp_w*sh_video->disp_h/4;
video_out->draw_slice(dst,stride,sh_video->disp_w,sh_video->disp_h,0,0);
} else
video_out->draw_frame((uint8_t **)&sh_video->our_out_buffer);
t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
blit_frame=1;
}
break; break;
} }
#else
printf("Win32 video codec unavailable on non-x86 CPU -> force nosound :(\n");
break;
#endif #endif
case 1: { case 1: {
int t=0; int t=0;
t-=GetTimer(); t-=GetTimer();
mpeg2_decode_data(video_out, start, start+in_size,drop_frame); mpeg2_decode_data(video_out, start, start+in_size,drop_frame);
t+=GetTimer(); video_time_usage+=t*0.000001; t+=GetTimer(); video_time_usage+=t*0.000001;
blit_frame=1; if(!drop_frame) blit_frame=1;
break; break;
} }
} // switch } // switch
//------------------------ frame decoded. -------------------- //------------------------ frame decoded. --------------------
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
switch(blit_frame){
case 3:
if(planar){
stride[0]=sh_video->disp_w;
stride[1]=stride[2]=sh_video->disp_w/2;
planes[0]=sh_video->our_out_buffer;
planes[2]=planes[0]+sh_video->disp_w*sh_video->disp_h;
planes[1]=planes[2]+sh_video->disp_w*sh_video->disp_h/4;
} else
planes[0]=sh_video->our_out_buffer;
case 2:
if(planar)
video_out->draw_slice(planes,stride,sh_video->disp_w,sh_video->disp_h,0,0);
else
video_out->draw_frame(planes);
t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
blit_frame=1;
break;
}
return blit_frame; return blit_frame;
} }