diff options
Diffstat (limited to 'libmpcodecs/vd_dmo.c')
-rw-r--r-- | libmpcodecs/vd_dmo.c | 54 |
1 files changed, 41 insertions, 13 deletions
diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c index 217fd05725..42630d7c7e 100644 --- a/libmpcodecs/vd_dmo.c +++ b/libmpcodecs/vd_dmo.c @@ -39,6 +39,12 @@ static const vd_info_t info = { LIBVD_EXTERN(dmo) +struct context { + void *decoder; + uint8_t *buffer; + int stride; +}; + // to set/get/query special features/parameters static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; @@ -46,59 +52,81 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ - unsigned int out_fmt; - if(!(sh->context=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ + unsigned int out_fmt=sh->codec->outfmt[sh->outfmtidx]; + struct context *ctx; + void *decoder; + if(!(decoder=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh->codec->dll); mp_tmsg(MSGT_DECVIDEO,MSGL_HINT,"You need to upgrade/install the binary codecs package.\nGo to http://www.mplayerhq.hu/dload.html\n"); return 0; } - if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; - out_fmt=sh->codec->outfmt[sh->outfmtidx]; + if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0; + sh->context = ctx = calloc(1, sizeof(*ctx)); + ctx->decoder = decoder; switch(out_fmt){ case IMGFMT_YUY2: case IMGFMT_UYVY: - DMO_VideoDecoder_SetDestFmt(sh->context,16,out_fmt);break; // packed YUV + DMO_VideoDecoder_SetDestFmt(ctx->decoder,16,out_fmt);break; // packed YUV case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: - DMO_VideoDecoder_SetDestFmt(sh->context,12,out_fmt);break; // planar YUV + DMO_VideoDecoder_SetDestFmt(ctx->decoder,12,out_fmt);break; // planar YUV case IMGFMT_YVU9: - DMO_VideoDecoder_SetDestFmt(sh->context,9,out_fmt);break; + DMO_VideoDecoder_SetDestFmt(ctx->decoder,9,out_fmt);break; + case IMGFMT_RGB24: + case IMGFMT_BGR24: + if (sh->disp_w & 3) + { + ctx->stride = ((sh->disp_w * 3) + 3) & ~3; + ctx->buffer = memalign(64, ctx->stride * sh->disp_h); + } default: - DMO_VideoDecoder_SetDestFmt(sh->context,out_fmt&255,0); // RGB/BGR + DMO_VideoDecoder_SetDestFmt(ctx->decoder,out_fmt&255,0); // RGB/BGR } - DMO_VideoDecoder_StartInternal(sh->context); + DMO_VideoDecoder_StartInternal(ctx->decoder); mp_tmsg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DMO video codec init OK.\n"); return 1; } // uninit driver static void uninit(sh_video_t *sh){ - DMO_VideoDecoder_Destroy(sh->context); + struct context *ctx = sh->context; + DMO_VideoDecoder_Destroy(ctx->decoder); + free(ctx); + sh->context = NULL; } //mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h); // decode a frame static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ + struct context *ctx = sh->context; + uint8_t *buffer = ctx->buffer; + int type = ctx->buffer ? MP_IMGTYPE_EXPORT : MP_IMGTYPE_TEMP; mp_image_t* mpi; if(len<=0) return NULL; // skipped frame if(flags&3){ // framedrop: - DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 0, 0); + DMO_VideoDecoder_DecodeInternal(ctx->decoder, data, len, 0, 0); return NULL; } - mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/, + mpi=mpcodecs_get_image(sh, type, MP_IMGFLAG_COMMON_PLANE, sh->disp_w, sh->disp_h); + if (buffer) { + mpi->planes[0] = buffer; + mpi->stride[0] = ctx->stride; + } else { + buffer = mpi->planes[0]; + } if(!mpi){ // temporary! mp_tmsg(MSGT_DECVIDEO,MSGL_WARN,"[VD_DMO] Couldn't allocate image for cinepak codec.\n"); return NULL; } - DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 1, mpi->planes[0]); + DMO_VideoDecoder_DecodeInternal(ctx->decoder, data, len, 1, buffer); return mpi; } |