comparison libmpcodecs/vd_ffmpeg.c @ 6738:77f2713ae7fd

svq1 direct rendering

6737:39619804c8b6

    vd_ffmpeg_ctx *ctx = sh->context;
    mp_image_t* mpi=NULL;
//    int flags= MP_IMGFLAG_ALIGNED_STRIDE;
    int flags= MP_IMGFLAG_ACCEPT_STRIDE;
    int type= MP_IMGTYPE_IPB;
    
    if(init_vo(sh)<0){
        printf("init_vo failed\n");
        return;
    }

    }
#endif
    mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n");

    mpi= mpcodecs_get_image(sh,type, flags,
// MN: arpi, is the next line ok? (i doubt it), its needed for height%16!=0 files
			(width+15)&(~15), (height+15)&(~15));

    // ok, lets see what did we get:
    if(  mpi->flags&MP_IMGFLAG_DRAW_CALLBACK &&
       !(mpi->flags&MP_IMGFLAG_DIRECT)){
	// nice, filter/vo likes draw_callback :)

    ret = avcodec_decode_video(avctx, &lavc_picture,
	     &got_picture, data, len);
    if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n");
    if(!got_picture) return NULL;	// skipped image
    
    if(init_vo(sh)<0) return NULL;

#if LIBAVCODEC_BUILD > 4615
    if(dr1 && avctx->dr_opaque_frame){
        mpi= (mp_image_t*)avctx->dr_opaque_frame;

6738:77f2713ae7fd

    vd_ffmpeg_ctx *ctx = sh->context;
    mp_image_t* mpi=NULL;
//    int flags= MP_IMGFLAG_ALIGNED_STRIDE;
    int flags= MP_IMGFLAG_ACCEPT_STRIDE;
    int type= MP_IMGTYPE_IPB;
    int align=15;

    if(avctx->pix_fmt == PIX_FMT_YUV410P)
        align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64)

    if(init_vo(sh)<0){
        printf("init_vo failed\n");
        return;
    }

    }
#endif
    mp_msg(MSGT_DECVIDEO,MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n");

    mpi= mpcodecs_get_image(sh,type, flags,
			(width+align)&(~align), (height+align)&(~align));

    // ok, lets see what did we get:
    if(  mpi->flags&MP_IMGFLAG_DRAW_CALLBACK &&
       !(mpi->flags&MP_IMGFLAG_DIRECT)){
	// nice, filter/vo likes draw_callback :)

    ret = avcodec_decode_video(avctx, &lavc_picture,
	     &got_picture, data, len);
    if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n");
    if(!got_picture) return NULL;	// skipped image

    if(init_vo(sh)<0) return NULL;

#if LIBAVCODEC_BUILD > 4615
    if(dr1 && avctx->dr_opaque_frame){
        mpi= (mp_image_t*)avctx->dr_opaque_frame;