comparison libmpcodecs/vd_theora.c @ 34493:da31318562d9

vd_theora: Skip th_decode_ycbcr_out() for packets representing dropped frames. In case of 0-byte packets we do not need to call th_decode_ycbcr_out() to decode the frame because we have a duplicated frame, and so we can use the last frame. patch by Giorgio Vazzana, mywing81 gmail com

34492:1495455e6d22

typedef struct theora_struct_st {
    th_setup_info *tsi;
    th_dec_ctx    *tctx;
    th_comment     tc;
    th_info        ti;
} theora_struct_t;

/** Convert Theora pixelformat to the corresponding IMGFMT_ */
static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt){
    switch(fmt) {

static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags)
{
   theora_struct_t *context = sh->context;
   int errorCode = 0;
   ogg_packet op;
   th_ycbcr_buffer ycbcrbuf;
   mp_image_t* mpi;

   // no delayed frames
   if (!data || !len)
       return NULL;

      mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode packetin failed: %i \n",
	     errorCode);
      return NULL;
   }

   errorCode = th_decode_ycbcr_out (context->tctx, ycbcrbuf);
   if (errorCode < 0)
   {
      mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode YUVout failed: %i \n",
	     errorCode);
      return NULL;
   }

    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, ycbcrbuf[0].width, ycbcrbuf[0].height);
    if(!mpi) return NULL;

    mpi->planes[0]=ycbcrbuf[0].data;
    mpi->stride[0]=ycbcrbuf[0].stride;
    mpi->planes[1]=ycbcrbuf[1].data;
    mpi->stride[1]=ycbcrbuf[1].stride;
    mpi->planes[2]=ycbcrbuf[2].data;
    mpi->stride[2]=ycbcrbuf[2].stride;

    return mpi;
}

34493:da31318562d9

typedef struct theora_struct_st {
    th_setup_info *tsi;
    th_dec_ctx    *tctx;
    th_comment     tc;
    th_info        ti;
    th_ycbcr_buffer ycbcrbuf;
} theora_struct_t;

/** Convert Theora pixelformat to the corresponding IMGFMT_ */
static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt){
    switch(fmt) {

static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags)
{
   theora_struct_t *context = sh->context;
   int errorCode = 0;
   ogg_packet op;
   mp_image_t* mpi;

   // no delayed frames
   if (!data || !len)
       return NULL;

      mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode packetin failed: %i \n",
	     errorCode);
      return NULL;
   }

    if (errorCode != TH_DUPFRAME) {
        errorCode = th_decode_ycbcr_out(context->tctx, context->ycbcrbuf);
        if (errorCode != 0) {
            mp_msg(MSGT_DECVIDEO, MSGL_ERR,
                   "Theora decode YUVout failed: %i \n", errorCode);
            return NULL;
        }
    }

    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
                             context->ycbcrbuf[0].width,
                             context->ycbcrbuf[0].height);
    if(!mpi) return NULL;

    mpi->planes[0] = context->ycbcrbuf[0].data;
    mpi->stride[0] = context->ycbcrbuf[0].stride;
    mpi->planes[1] = context->ycbcrbuf[1].data;
    mpi->stride[1] = context->ycbcrbuf[1].stride;
    mpi->planes[2] = context->ycbcrbuf[2].data;
    mpi->stride[2] = context->ycbcrbuf[2].stride;

    return mpi;
}