[MPlayer-cvslog] r36979 - trunk/libmpcodecs/vd_hmblck.c

[iive]

Author: iive
Date: Wed Mar  5 22:58:04 2014
New Revision: 36979

Log:
Fix image size restrictions set by r35242.

Luma blocks are 16x16, but chroma blocks are (two interweaved) 8x16.
Since chroma is at quarter resolution it means that the image
width must be multiple of 16, while
height must be multiple of 32.

Modified:
   trunk/libmpcodecs/vd_hmblck.c

Modified: trunk/libmpcodecs/vd_hmblck.c
==============================================================================
--- trunk/libmpcodecs/vd_hmblck.c	Wed Mar  5 19:48:23 2014	(r36978)
+++ trunk/libmpcodecs/vd_hmblck.c	Wed Mar  5 22:58:04 2014	(r36979)
@@ -81,9 +81,14 @@ static int init(sh_video_t *sh){
 
     if(sh->format != IMGFMT_HM12) return 0;
 
-    if((sh->disp_w&31) != 0 || (sh->disp_h&31) != 0) {
+    if((sh->disp_w&15) != 0) {
         mp_msg(MSGT_DECVIDEO, MSGL_ERR,
-               "hmblck: Image size must be multiple of 32.\n");
+               "hmblck: Image width must be multiple of 16.\n");
+        return 0;
+    }
+    if((sh->disp_h&31) != 0) {
+        mp_msg(MSGT_DECVIDEO, MSGL_ERR,
+               "hmblck: Image height must be multiple of 32.\n");
         return 0;
     }
     return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,sh->format);