X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fhevc.h;h=1804755327e134075d06891811d5ca435bed656d;hb=20aec597d05f1930dbd4e4c5ab8ee837dea5b5f3;hp=2f20db82856e156382316976368940f1b33c3649;hpb=0cc8e34a94c84132cf5b0f6472c5f61c8a66cee1;p=ffmpeg

diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 2f20db82856..1804755327e 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -22,50 +22,74 @@
 #define AVCODEC_HEVC_H
 
 /**
- * Table 7-3: NAL unit type codes
+ * Table 7-1 – NAL unit type codes and NAL unit type classes in
+ * T-REC-H.265-201802
  */
 enum HEVCNALUnitType {
-    HEVC_NAL_TRAIL_N    = 0,
-    HEVC_NAL_TRAIL_R    = 1,
-    HEVC_NAL_TSA_N      = 2,
-    HEVC_NAL_TSA_R      = 3,
-    HEVC_NAL_STSA_N     = 4,
-    HEVC_NAL_STSA_R     = 5,
-    HEVC_NAL_RADL_N     = 6,
-    HEVC_NAL_RADL_R     = 7,
-    HEVC_NAL_RASL_N     = 8,
-    HEVC_NAL_RASL_R     = 9,
-    HEVC_NAL_VCL_N10    = 10,
-    HEVC_NAL_VCL_R11    = 11,
-    HEVC_NAL_VCL_N12    = 12,
-    HEVC_NAL_VCL_R13    = 13,
-    HEVC_NAL_VCL_N14    = 14,
-    HEVC_NAL_VCL_R15    = 15,
-    HEVC_NAL_BLA_W_LP   = 16,
-    HEVC_NAL_BLA_W_RADL = 17,
-    HEVC_NAL_BLA_N_LP   = 18,
-    HEVC_NAL_IDR_W_RADL = 19,
-    HEVC_NAL_IDR_N_LP   = 20,
-    HEVC_NAL_CRA_NUT    = 21,
-    HEVC_NAL_IRAP_VCL22 = 22,
-    HEVC_NAL_IRAP_VCL23 = 23,
-    HEVC_NAL_RSV_VCL24  = 24,
-    HEVC_NAL_RSV_VCL25  = 25,
-    HEVC_NAL_RSV_VCL26  = 26,
-    HEVC_NAL_RSV_VCL27  = 27,
-    HEVC_NAL_RSV_VCL28  = 28,
-    HEVC_NAL_RSV_VCL29  = 29,
-    HEVC_NAL_RSV_VCL30  = 30,
-    HEVC_NAL_RSV_VCL31  = 31,
-    HEVC_NAL_VPS        = 32,
-    HEVC_NAL_SPS        = 33,
-    HEVC_NAL_PPS        = 34,
-    HEVC_NAL_AUD        = 35,
-    HEVC_NAL_EOS_NUT    = 36,
-    HEVC_NAL_EOB_NUT    = 37,
-    HEVC_NAL_FD_NUT     = 38,
-    HEVC_NAL_SEI_PREFIX = 39,
-    HEVC_NAL_SEI_SUFFIX = 40,
+    HEVC_NAL_TRAIL_N        = 0,
+    HEVC_NAL_TRAIL_R        = 1,
+    HEVC_NAL_TSA_N          = 2,
+    HEVC_NAL_TSA_R          = 3,
+    HEVC_NAL_STSA_N         = 4,
+    HEVC_NAL_STSA_R         = 5,
+    HEVC_NAL_RADL_N         = 6,
+    HEVC_NAL_RADL_R         = 7,
+    HEVC_NAL_RASL_N         = 8,
+    HEVC_NAL_RASL_R         = 9,
+    HEVC_NAL_VCL_N10        = 10,
+    HEVC_NAL_VCL_R11        = 11,
+    HEVC_NAL_VCL_N12        = 12,
+    HEVC_NAL_VCL_R13        = 13,
+    HEVC_NAL_VCL_N14        = 14,
+    HEVC_NAL_VCL_R15        = 15,
+    HEVC_NAL_BLA_W_LP       = 16,
+    HEVC_NAL_BLA_W_RADL     = 17,
+    HEVC_NAL_BLA_N_LP       = 18,
+    HEVC_NAL_IDR_W_RADL     = 19,
+    HEVC_NAL_IDR_N_LP       = 20,
+    HEVC_NAL_CRA_NUT        = 21,
+    HEVC_NAL_RSV_IRAP_VCL22 = 22,
+    HEVC_NAL_RSV_IRAP_VCL23 = 23,
+    HEVC_NAL_RSV_VCL24      = 24,
+    HEVC_NAL_RSV_VCL25      = 25,
+    HEVC_NAL_RSV_VCL26      = 26,
+    HEVC_NAL_RSV_VCL27      = 27,
+    HEVC_NAL_RSV_VCL28      = 28,
+    HEVC_NAL_RSV_VCL29      = 29,
+    HEVC_NAL_RSV_VCL30      = 30,
+    HEVC_NAL_RSV_VCL31      = 31,
+    HEVC_NAL_VPS            = 32,
+    HEVC_NAL_SPS            = 33,
+    HEVC_NAL_PPS            = 34,
+    HEVC_NAL_AUD            = 35,
+    HEVC_NAL_EOS_NUT        = 36,
+    HEVC_NAL_EOB_NUT        = 37,
+    HEVC_NAL_FD_NUT         = 38,
+    HEVC_NAL_SEI_PREFIX     = 39,
+    HEVC_NAL_SEI_SUFFIX     = 40,
+    HEVC_NAL_RSV_NVCL41     = 41,
+    HEVC_NAL_RSV_NVCL42     = 42,
+    HEVC_NAL_RSV_NVCL43     = 43,
+    HEVC_NAL_RSV_NVCL44     = 44,
+    HEVC_NAL_RSV_NVCL45     = 45,
+    HEVC_NAL_RSV_NVCL46     = 46,
+    HEVC_NAL_RSV_NVCL47     = 47,
+    HEVC_NAL_UNSPEC48       = 48,
+    HEVC_NAL_UNSPEC49       = 49,
+    HEVC_NAL_UNSPEC50       = 50,
+    HEVC_NAL_UNSPEC51       = 51,
+    HEVC_NAL_UNSPEC52       = 52,
+    HEVC_NAL_UNSPEC53       = 53,
+    HEVC_NAL_UNSPEC54       = 54,
+    HEVC_NAL_UNSPEC55       = 55,
+    HEVC_NAL_UNSPEC56       = 56,
+    HEVC_NAL_UNSPEC57       = 57,
+    HEVC_NAL_UNSPEC58       = 58,
+    HEVC_NAL_UNSPEC59       = 59,
+    HEVC_NAL_UNSPEC60       = 60,
+    HEVC_NAL_UNSPEC61       = 61,
+    HEVC_NAL_UNSPEC62       = 62,
+    HEVC_NAL_UNSPEC63       = 63,
 };
 
 enum HEVCSliceType {
@@ -119,6 +143,9 @@ enum {
     // A.4.1: table A.6 allows at most 20 tile columns for any level.
     HEVC_MAX_TILE_COLUMNS = 20,
 
+    // A.4.2: table A.6 allows at most 600 slice segments for any level.
+    HEVC_MAX_SLICE_SEGMENTS = 600,
+
     // 7.4.7.1: in the worst case (tiles_enabled_flag and
     // entropy_coding_sync_enabled_flag are both set), entry points can be
     // placed at the beginning of every Ctb row in every tile, giving an