Ticket #514: pic_cropping_bug.patch

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1336 +1336 @@
 #if PIC_CROPPING
   READ_FLAG(     uiCode, "pic_cropping_flag");                   pcSPS->setPicCroppingFlag ( uiCode ? true : false );
   if (uiCode != 0)
-  {
-    READ_UVLC(   uiCode, "pic_crop_left_offset" );               pcSPS->setPicCropLeftOffset( uiCode );
-    READ_UVLC(   uiCode, "pic_crop_right_offset" );              pcSPS->setPicCropRightOffset( uiCode );
-    READ_UVLC(   uiCode, "pic_crop_top_offset" );                pcSPS->setPicCropTopOffset( uiCode );
-    READ_UVLC(   uiCode, "pic_crop_bottom_offset" );             pcSPS->setPicCropBottomOffset( uiCode );
+  {  
+    UInt  CropUnitX;
+    UInt  CropUnitY;
+
+    // get cropping units based on chroma format
+    if(pcSPS->getChromaFormatIdc() == 1) {
+      CropUnitX = 2;
+      CropUnitY = 2;
+    }
+    else if(pcSPS->getChromaFormatIdc() == 2) {
+      CropUnitX = 2;
+      CropUnitY = 1;
+    }
+    else {
+      CropUnitX = 1;
+      CropUnitY = 1;
+    }
+
+    READ_UVLC(   uiCode, "pic_crop_left_offset" );               pcSPS->setPicCropLeftOffset( CropUnitX*uiCode );
+    READ_UVLC(   uiCode, "pic_crop_right_offset" );              pcSPS->setPicCropRightOffset( CropUnitX*uiCode );
+    READ_UVLC(   uiCode, "pic_crop_top_offset" );                pcSPS->setPicCropTopOffset( CropUnitY*uiCode );
+    READ_UVLC(   uiCode, "pic_crop_bottom_offset" );             pcSPS->setPicCropBottomOffset( CropUnitY*uiCode );
   }
 #endif
 

Lib/TLibEncoder/TEncCavlc.cpp

@@ -391 +391 @@
 #if PIC_CROPPING
   WRITE_FLAG( pcSPS->getPicCroppingFlag(),          "pic_cropping_flag" );
   if (pcSPS->getPicCroppingFlag())
-  {
-    WRITE_UVLC( pcSPS->getPicCropLeftOffset(),      "pic_crop_left_offset" );
-    WRITE_UVLC( pcSPS->getPicCropRightOffset(),     "pic_crop_right_offset" );
-    WRITE_UVLC( pcSPS->getPicCropTopOffset(),       "pic_crop_top_offset" );
-    WRITE_UVLC( pcSPS->getPicCropBottomOffset(),    "pic_crop_bottom_offset" );
+  {       
+    UInt  CropUnitX;
+    UInt  CropUnitY;
+
+    // get cropping units based on chroma format
+    if(pcSPS->getChromaFormatIdc() == 1) {
+      CropUnitX = 2;
+      CropUnitY = 2;
+    }
+    else if(pcSPS->getChromaFormatIdc() == 2) {
+      CropUnitX = 2;
+      CropUnitY = 1;
+    }
+    else {
+      CropUnitX = 1;
+      CropUnitY = 1;
+    }
+
+    WRITE_UVLC( pcSPS->getPicCropLeftOffset()/CropUnitX,      "pic_crop_left_offset" );
+    WRITE_UVLC( pcSPS->getPicCropRightOffset()/CropUnitX,     "pic_crop_right_offset" );
+    WRITE_UVLC( pcSPS->getPicCropTopOffset()/CropUnitY,       "pic_crop_top_offset" );
+    WRITE_UVLC( pcSPS->getPicCropBottomOffset()/CropUnitY,    "pic_crop_bottom_offset" );
   }
 #endif