diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-16 23:30:38 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-16 23:30:38 +0000 |
| commit | 13c43f2bd39e65724f9221982d8f26c8139a36ae (patch) | |
| tree | 328c137a899e1cb56566a05125292e4342d5a02d /dec_video.c | |
| parent | f17a194e38a58a3d6420abab9027e253ca4a0851 (diff) | |
| download | mpv-13c43f2bd39e65724f9221982d8f26c8139a36ae.tar.bz2 mpv-13c43f2bd39e65724f9221982d8f26c8139a36ae.tar.xz | |
ffmpeg postprocess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2229 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
| -rw-r--r-- | dec_video.c | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/dec_video.c b/dec_video.c index b669d8a1a1..80cf1290fc 100644 --- a/dec_video.c +++ b/dec_video.c @@ -59,6 +59,9 @@ extern picture_t *picture; // exported from libmpeg2/decode.c static AVPicture lavc_picture; int avcodec_inited=0; #endif +#ifdef FF_POSTPROCESS + unsigned int lavc_pp=0; +#endif #ifndef NEW_DECORE #include "opendivx/decore.h" @@ -110,6 +113,10 @@ int get_video_quality_max(sh_video_t *sh_video){ case VFM_MPEG: return GET_PP_QUALITY_MAX; #endif +#ifdef FF_POSTPROCESS + case VFM_FFMPEG: + return GET_PP_QUALITY_MAX; +#endif case VFM_DIVX4: case VFM_ODIVX: #ifdef NEW_DECORE @@ -143,6 +150,12 @@ void set_video_quality(sh_video_t *sh_video,int quality){ } break; #endif +#ifdef FF_POSTPROCESS + case VFM_FFMPEG: + if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; + lavc_pp=getPpModeForQuality(quality); + break; +#endif case VFM_DIVX4: case VFM_ODIVX: { DEC_SET dec_set; @@ -345,7 +358,9 @@ switch(sh_video->codec->driver){ mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec); return 0; } - +#ifdef FF_POSTPROCESS + lavc_pp=divx_quality; +#endif mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n"); break; #endif @@ -501,11 +516,29 @@ if(verbose>1){ if(!drop_frame && got_picture){ // if(!drop_frame){ if(planar){ - planes=lavc_picture.data; - stride=lavc_picture.linesize; - //stride[1]=stride[2]=0; - //stride[0]/=2; - blit_frame=2; +#ifdef FF_POSTPROCESS + if(lavc_pp){ + // postprocess + if(!sh_video->our_out_buffer) + sh_video->our_out_buffer = (char*)memalign(64,sh_video->disp_w*sh_video->disp_h*3/2); + 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; + postprocess(lavc_picture.data,lavc_picture.linesize[0], + planes,sh_video->disp_w, + sh_video->disp_w,sh_video->disp_h, + &quant_store[0][0],MBC+1,lavc_pp); + } else +#endif + { + planes=lavc_picture.data; + stride=lavc_picture.linesize; + //stride[1]=stride[2]=0; + //stride[0]/=2; + } + blit_frame=2; } else { int y; // temporary hack - FIXME |