Ticket #191: vd_theora.c.diff

libmpcodecs/vd_theora.c

@@ -27 +27 @@
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
+    switch(cmd) {
+    case VDCTRL_QUERY_FORMAT:
+        if ((*((int*)arg)) == IMGFMT_YV12)
+            return CONTROL_TRUE;
+        return CONTROL_FALSE;
+    }
+    
     return CONTROL_UNKNOWN;
 }
 
@@ -104 +111 @@
 
     if(sh->aspect==0.0 && context->inf.aspect_denominator!=0)
     {
-       sh->aspect = (float)(context->inf.aspect_numerator * context->inf.width)/
-          (context->inf.aspect_denominator * context->inf.height);
+       sh->aspect = (float)(context->inf.aspect_numerator * context->inf.frame_width)/
+          (context->inf.aspect_denominator * context->inf.frame_height);
     }
     
     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
 
-    return mpcodecs_config_vo (sh,sh->disp_w,sh->disp_h,IMGFMT_YV12);
+    return mpcodecs_config_vo (sh,context->inf.frame_width,context->inf.frame_height,IMGFMT_YV12);
 }
 
 /* 
@@ -160 +167 @@
       return 0;
    }
 
-    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, sh->disp_w, sh->disp_h);
-    if(!mpi) return NULL;
-    
-    mpi->planes[0]=yuv.y;
-    mpi->stride[0]=yuv.y_stride;
-    mpi->planes[1]=yuv.u;
-    mpi->stride[1]=yuv.uv_stride;
-    mpi->planes[2]=yuv.v;
-    mpi->stride[2]=yuv.uv_stride;
-
+   if (yuv.y_stride > 0 || yuv.uv_stride > 0) {
+       mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, sh->disp_w, sh->disp_h);
+       if(!mpi) return NULL;
+       
+       mpi->planes[0]=yuv.y;
+       mpi->stride[0]=yuv.y_stride;
+       mpi->planes[1]=yuv.u;
+       mpi->stride[1]=yuv.uv_stride;
+       mpi->planes[2]=yuv.v;
+       mpi->stride[2]=yuv.uv_stride;
+   } else {
+       mpi = mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE, yuv.y_width, yuv.y_height);
+       if(!mpi) return NULL;
+       
+       for (i = 0; i < yuv.y_height; i++)
+           memcpy(mpi->planes[0]+i*mpi->stride[0], yuv.y+i*yuv.y_stride, yuv.y_width);
+       for (i = 0; i < yuv.uv_height; i++)
+           memcpy(mpi->planes[1]+i*mpi->stride[1], yuv.u+i*yuv.uv_stride, yuv.uv_width);
+       for (i = 0; i < yuv.uv_height; i++)
+           memcpy(mpi->planes[2]+i*mpi->stride[2], yuv.v+i*yuv.uv_stride, yuv.uv_width);
+   }
+   
+   
     return mpi;
 }