diff options
| author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-02 22:45:39 +0000 |
|---|---|---|
| committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-02 22:45:39 +0000 |
| commit | 80168a072df13df22f4782735cd5a7cd72743b4f (patch) | |
| tree | e65a8f83929cc0427c46307a593b8c5726e78384 /dec_video.c | |
| parent | 9996ca0ac9ffa70efd3685beabb2fa1391ecb446 (diff) | |
| download | mpv-80168a072df13df22f4782735cd5a7cd72743b4f.tar.bz2 mpv-80168a072df13df22f4782735cd5a7cd72743b4f.tar.xz | |
further work on the RoQ audio decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4487 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
| -rw-r--r-- | dec_video.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/dec_video.c b/dec_video.c index d9b928d2d5..90980c5bb2 100644 --- a/dec_video.c +++ b/dec_video.c @@ -34,6 +34,8 @@ extern int verbose; // defined in mplayer.c #include "dec_video.h" +#include "roqav.h" + // =================================================================== extern double video_time_usage; @@ -424,6 +426,15 @@ sh_video->image=new_mp_image(sh_video->disp_w,sh_video->disp_h); mp_image_setfmt(sh_video->image,out_fmt); switch(sh_video->codec->driver){ + case VFM_ROQVIDEO: +#ifdef USE_MP_IMAGE + sh_video->image->type=MP_IMGTYPE_STATIC; +#else + sh_video->our_out_buffer = + (char*)memalign(64, sh_video->disp_w * sh_video->disp_h * 1.5); +#endif + sh_video->context = roq_decode_video_init(); + break; case VFM_CINEPAK: { #ifdef USE_MP_IMAGE sh_video->image->type=MP_IMGTYPE_STATIC; @@ -1080,6 +1091,11 @@ if(verbose>1){ sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255)); blit_frame = 3; break; + case VFM_ROQVIDEO: + roq_decode_video(start, in_size, sh_video->our_out_buffer, + sh_video->disp_w, sh_video->disp_h, sh_video->context); + blit_frame = 3; + break; } // switch //------------------------ frame decoded. -------------------- |