fix poc7-2 (#341). poc7-1 is already fixed in (#373)

strukturag · Jan 24, 2023 · f49d850 · f49d850
1 parent c96962c
commit f49d850
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/libde265/de265.cc b/libde265/de265.cc
@@ -159,6 +159,8 @@ LIBDE265_API const char* de265_get_error_text(de265_error err)
     return "collocated motion-vector is outside image area";
   case DE265_WARNING_PCM_BITDEPTH_TOO_LARGE:
     return "PCM bit-depth too large";
+  case DE265_WARNING_REFERENCE_IMAGE_SIZE_DOES_NOT_MATCH_SPS:
+    return "Size of reference image does not match current size in SPS";
 
   default: return "unknown error";
   }

diff --git a/libde265/de265.h b/libde265/de265.h
@@ -136,7 +136,8 @@ typedef enum {
   DE265_WARNING_CANNOT_APPLY_SAO_OUT_OF_MEMORY=1024,
   DE265_WARNING_SPS_MISSING_CANNOT_DECODE_SEI=1025,
   DE265_WARNING_COLLOCATED_MOTION_VECTOR_OUTSIDE_IMAGE_AREA=1026,
-  DE265_WARNING_PCM_BITDEPTH_TOO_LARGE=1027
+  DE265_WARNING_PCM_BITDEPTH_TOO_LARGE=1027,
+  DE265_WARNING_REFERENCE_IMAGE_SIZE_DOES_NOT_MATCH_SPS=1029
 } de265_error;
 
 LIBDE265_API const char* de265_get_error_text(de265_error err);

diff --git a/libde265/motion.cc b/libde265/motion.cc
@@ -354,6 +354,12 @@ void generate_inter_prediction_samples(base_context* ctx,
 
         // TODO: fill predSamplesC with black or grey
       }
+      else if (refPic->get_width(0) != sps->pic_width_in_luma_samples ||
+               refPic->get_height(0) != sps->pic_height_in_luma_samples ||
+               img->get_chroma_format() != refPic->get_chroma_format()) {
+        img->integrity = INTEGRITY_DECODING_ERRORS;
+        ctx->add_warning(DE265_WARNING_REFERENCE_IMAGE_SIZE_DOES_NOT_MATCH_SPS, false);
+      }
       else {
         // 8.5.3.2.2