Fix Y4M parsing

Netflix · Oct 30, 2023 · 8bcd525 · 8bcd525
1 parent af31e4c
commit 8bcd525
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/libvmaf/tools/vmaf.c b/libvmaf/tools/vmaf.c
@@ -89,10 +89,9 @@ static int fetch_picture(video_input *vid, VmafPicture *pic)
         for (unsigned i = 0; i < 3; i++) {
             int xdec = i&&!(info.pixel_fmt&1);
             int ydec = i&&!(info.pixel_fmt&2);
-            int xstride = info.depth > 8 ? 2 : 1;
             uint8_t *ycbcr_data = ycbcr[i].data +
                 (info.pic_y >> ydec) * ycbcr[i].stride +
-                (info.pic_x * xstride >> xdec);
+                (info.pic_x >> xdec);
             // ^ gross, but this is how the daala y4m API works. FIXME.
             uint8_t *pic_data = pic->data[i];
 
@@ -106,10 +105,9 @@ static int fetch_picture(video_input *vid, VmafPicture *pic)
         for (unsigned i = 0; i < 3; i++) {
             int xdec = i&&!(info.pixel_fmt&1);
             int ydec = i&&!(info.pixel_fmt&2);
-            int xstride = info.depth > 8 ? 2 : 1;
             uint16_t *ycbcr_data = (uint16_t*) ycbcr[i].data +
                 (info.pic_y >> ydec) * (ycbcr[i].stride / 2) +
-                (info.pic_x * xstride >> xdec);
+                (info.pic_x >> xdec);
             // ^ gross, but this is how the daala y4m API works. FIXME.
             uint16_t *pic_data = pic->data[i];