[what][feature] 实现 DeserializeAV1TileInfoSyntax

Author: HR1025

AV1BinaryReader.cpp

@@ -56,6 +56,17 @@ static uint8_t kRightAndLookUp[8] = {0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0
 
 #define MMP_AV1_I_PRED_OPERATION(bits, value)       MMP_AV1_U_PRED_OPERATION(bits, value)
 
+static int64_t FllorLog2(uint64_t x)
+{
+    int64_t s = 0;
+    while (x != 0)
+    {
+        x = x >> 1;
+        s ++;
+    }
+    return s - 1;
+}
+
 AV1BinaryReader::AV1BinaryReader(AbstractAV1ByteReader::ptr reader)
 {
     _curBitPos = 8;
@@ -91,6 +102,30 @@ int64_t AV1BinaryReader::su(size_t n)
     return value;
 }
 
+uint64_t AV1BinaryReader::le(size_t n)
+{
+    uint64_t t = 0;
+    for (size_t i=0; i<n; i++)
+    {
+        uint64_t byte = f(8);
+        t += (byte << (i*8));
+    }
+    return t;
+}
+
+uint64_t AV1BinaryReader::ns(size_t n)
+{
+    uint64_t w = FllorLog2(n) + 1;
+    uint64_t m = (1 << w) - n;
+    uint64_t v = f((size_t)(w - 1));
+    if (v < m)
+    {
+        return v;
+    }
+    uint64_t extra_bit = f(1);
+    return (v << 1) - m + extra_bit;
+}
+
 uint64_t AV1BinaryReader::uvlc()
 {
     uint32_t leadingZeros = 0;
@@ -144,6 +179,11 @@ void AV1BinaryReader::byte_alignment()
     }
 }
 
+size_t AV1BinaryReader::get_position()
+{
+    return _reader->Tell() + _curBitPos;
+}
+
 bool AV1BinaryReader::ReadBytes(size_t byte, uint8_t* value)
 {
     size_t readByte = _reader->Read(value, byte);

AV1BinaryReader.h

@@ -26,11 +26,14 @@ class AV1BinaryReader
 public:
     uint64_t f(size_t n);
     int64_t  su(size_t n);
+    uint64_t le(size_t n);
+    uint64_t ns(size_t n);
     uint64_t uvlc();
     uint64_t leb128();
     uint64_t read_delta_q();
 public:
     void byte_alignment();
+    size_t get_position();
 private:
     bool ReadBytes(size_t byte, uint8_t* value);
     void ReadOneByteAuto(bool force = false);

AV1Common.cpp

@@ -73,6 +73,11 @@ AV1ObuHeaderSyntax::AV1ObuHeaderSyntax()
     obu_reserved_1bit = 0;
 }
 
+AV1GeneralMetadataOBUSyntax::AV1GeneralMetadataOBUSyntax()
+{
+    metadata_type = 0;
+}
+
 AV1SuperresParamsSyntax::AV1SuperresParamsSyntax()
 {
     use_superres = 0;
@@ -222,6 +227,7 @@ AV1GeneralTileGroupOBUSyntax::AV1GeneralTileGroupOBUSyntax()
     tile_start_and_end_present_flag = 0;
     tg_start = 0;
     tg_end = 0;
+    tile_size_minus_1 = 0;
 }
 
 AV1LoopRestorationParamsSyntax::AV1LoopRestorationParamsSyntax()
@@ -269,5 +275,12 @@ AV1LoopFilterParamsSyntax::AV1LoopFilterParamsSyntax()
     loop_filter_delta_update = 0;
 }
 
+AV1TileInfoSyntax::AV1TileInfoSyntax()
+{
+    uniform_tile_spacing_flag = 0;
+    context_update_tile_id = 0;
+    tile_size_bytes_minus_1 = 0;
+}
+
 } // namespace Codec
 } // namespace Mmp

AV1Common.h

@@ -405,6 +405,18 @@ enum class AV1TxMode
     AV1_TX_MODE_SELECT = 2
 };
 
+/**
+ * @sa 6.7.1. General metadata OBU semantics
+ */
+enum class AV1MetadataType
+{
+    METADATA_TYPE_HDR_CLL = 1,
+    METADATA_TYPE_HDR_MDCV = 2,
+    METADATA_TYPE_SCALABILITY = 3,
+    METADATA_TYPE_ITUT_T35 = 4,
+    METADATA_TYPE_TIMECODE = 5
+};
+
 class AV1ColorConfigSyntax
 {
 public:
@@ -480,7 +492,7 @@ class AV1TemporalDelimiterObuSyntax
 class AV1PaddingOBUSyntax
 {
 public:
-    using ptr = std::shared_ptr<AV1OperatingParametersInfoSyntax>;
+    using ptr = std::shared_ptr<AV1PaddingOBUSyntax>;
 public:
     AV1PaddingOBUSyntax();
     ~AV1PaddingOBUSyntax();
@@ -691,9 +703,14 @@ class AV1GeneralMetadataOBUSyntax
     using ptr = std::shared_ptr<AV1GeneralMetadataOBUSyntax>;
 public:
     AV1GeneralMetadataOBUSyntax();
-    ~AV1GeneralMetadataOBUSyntax();
+    ~AV1GeneralMetadataOBUSyntax() = default;
 public:
     uint32_t metadata_type;
+    AV1MetadataITUT_T35Syntax::ptr metadata_itut_t35;
+    AV1MetadataHighDynamicRangeContentLightLevelSyntax::ptr metadata_hdr_cll;
+    AV1MetadataHighDynamicRangeMasteringDisplayColorVolumeSyntax::ptr metadata_hdr_mdcv;
+    AV1MetadataScalabilitySyntax::ptr metadata_scalability;
+    AV1MetadataTimecodeSyntax::ptr metadata_timecode;
 };
 
 class AV1SuperresParamsSyntax
@@ -802,6 +819,45 @@ class AV1QuantizationParamsSyntax
     uint8_t  qm_v;
 };
 
+class AV1FilmGrainParamsSyntax
+{
+public:
+    using ptr = std::shared_ptr<AV1FilmGrainParamsSyntax>;
+public:
+    AV1FilmGrainParamsSyntax();
+    ~AV1FilmGrainParamsSyntax() = default;
+public:
+    uint8_t  apply_grain;
+    uint16_t grain_seed;
+    uint8_t  update_grain;
+    uint8_t  film_grain_params_ref_idx;
+    uint8_t  num_y_points;
+    std::vector<uint8_t> point_y_value;
+    std::vector<uint8_t> point_y_scaling;
+    uint8_t  chroma_scaling_from_luma;
+    uint8_t  num_cb_points;
+    std::vector<uint8_t> point_cb_value;
+    std::vector<uint8_t> point_cb_scaling;
+    uint8_t  num_cr_points;
+    std::vector<uint8_t> point_cr_value;
+    std::vector<uint8_t> point_cr_scaling;
+    uint8_t  grain_scaling_minus_8;
+    uint8_t  ar_coeff_lag;
+    std::vector<uint8_t> ar_coeffs_y_plus_128;
+    std::vector<uint8_t> ar_coeffs_cb_plus_128;
+    std::vector<uint8_t> ar_coeffs_cr_plus_128;
+    uint8_t  ar_coeff_shift_minus_6;
+    uint8_t  grain_scale_shift;
+    uint8_t  cb_mult;
+    uint8_t  cb_luma_mult;
+    uint16_t cb_offset;
+    uint8_t  cr_mult;
+    uint8_t  cr_luma_mult;
+    uint16_t cr_offset;
+    uint8_t  overlap_flag;
+    uint8_t  clip_to_restricted_range;
+};
+
 class AV1UncompressedHeaderSyntax
 {
 public:
@@ -820,8 +876,16 @@ class AV1UncompressedHeaderSyntax
     uint8_t  frame_size_override_flag;
     uint8_t  allow_intrabc;
     uint8_t  primary_ref_frame;
+    uint8_t  error_resilient_mode;
+    uint8_t  disable_cdf_update;
+    uint8_t  allow_screen_content_tools;
+    uint8_t  force_integer_mv;
+    uint64_t current_frame_id;
+    uint8_t  buffer_removal_time_present_flag;
+    std::vector<uint64_t> buffer_removal_time;
 public:
     AV1TemporalPointInfoSyntax::ptr temporal_point_info;
+    AV1FilmGrainParamsSyntax::ptr load_grain_params;
 };
 
 class AV1TxModeSyntax
@@ -846,45 +910,6 @@ class AV1FrameReferenceModeSyntax
     uint8_t  reference_select;
 };
 
-class AV1FilmGrainParamsSyntax
-{
-public:
-    using ptr = std::shared_ptr<AV1FilmGrainParamsSyntax>;
-public:
-    AV1FilmGrainParamsSyntax();
-    ~AV1FilmGrainParamsSyntax() = default;
-public:
-    uint8_t  apply_grain;
-    uint16_t grain_seed;
-    uint8_t  update_grain;
-    uint8_t  film_grain_params_ref_idx;
-    uint8_t  num_y_points;
-    std::vector<uint8_t> point_y_value;
-    std::vector<uint8_t> point_y_scaling;
-    uint8_t  chroma_scaling_from_luma;
-    uint8_t  num_cb_points;
-    std::vector<uint8_t> point_cb_value;
-    std::vector<uint8_t> point_cb_scaling;
-    uint8_t  num_cr_points;
-    std::vector<uint8_t> point_cr_value;
-    std::vector<uint8_t> point_cr_scaling;
-    uint8_t  grain_scaling_minus_8;
-    uint8_t  ar_coeff_lag;
-    std::vector<uint8_t> ar_coeffs_y_plus_128;
-    std::vector<uint8_t> ar_coeffs_cb_plus_128;
-    std::vector<uint8_t> ar_coeffs_cr_plus_128;
-    uint8_t  ar_coeff_shift_minus_6;
-    uint8_t  grain_scale_shift;
-    uint8_t  cb_mult;
-    uint8_t  cb_luma_mult;
-    uint16_t cb_offset;
-    uint8_t  cr_mult;
-    uint8_t  cr_luma_mult;
-    uint16_t cr_offset;
-    uint8_t  overlap_flag;
-    uint8_t  clip_to_restricted_range;
-};
-
 class AV1GeneralTileGroupOBUSyntax
 {
 public:
@@ -894,8 +919,9 @@ class AV1GeneralTileGroupOBUSyntax
     ~AV1GeneralTileGroupOBUSyntax() = default;
 public:
     uint8_t  tile_start_and_end_present_flag;
-    uint32_t tg_start;
-    uint32_t tg_end;
+    uint64_t tg_start;
+    uint64_t tg_end;
+    uint64_t tile_size_minus_1;
 };
 
 class AV1LoopRestorationParamsSyntax
@@ -1000,6 +1026,23 @@ class AV1LoopFilterParamsSyntax
     uint32_t loop_filter_mode_deltas[2] = {0};
 };
 
+class AV1TileInfoSyntax
+{
+public:
+    using ptr = std::shared_ptr<AV1TileInfoSyntax>;
+public:
+    AV1TileInfoSyntax();
+    ~AV1TileInfoSyntax() = default;
+public:
+    uint8_t  uniform_tile_spacing_flag;
+    std::vector<uint8_t> increment_tile_cols_log2;
+    std::vector<uint8_t> increment_tile_rows_log2;
+    std::vector<uint64_t> width_in_sbs_minus_1;
+    std::vector<uint64_t> height_in_sbs_minus_1;
+    uint64_t context_update_tile_id;
+    uint8_t  tile_size_bytes_minus_1;
+};
+
 /**
  * @sa 7.20. Reference frame update process
  */
@@ -1045,18 +1088,24 @@ class AV1ReferenceFrameContext
     uint8_t   LoopRestorationSize[4];
     uint8_t   AllLossless;
     uint8_t   TxMode;
-    uint32_t  NumTiles;
-    uint16_t  TileCols;
-    uint16_t  TileRows;
-    uint16_t  TileColsLog2;
-    uint16_t  TileRowsLog2;
+    uint64_t  NumTiles;
+    uint64_t  TileCols;
+    uint64_t  TileRows;
+    uint64_t  TileColsLog2;
+    uint64_t  TileRowsLog2;
     uint8_t   FeatureEnabled[AV1_SYMBOL(MAX_SEGMENTS)][AV1_SYMBOL(SEG_LVL_MAX)] = {0};
     uint8_t   Segmentation_Feature_Bits[AV1_SYMBOL(SEG_LVL_MAX)] = {0};
     uint8_t   Segmentation_Feature_Max[AV1_SYMBOL(SEG_LVL_MAX)] = {0};
     uint8_t   Segmentation_Feature_Signed[AV1_SYMBOL(SEG_LVL_MAX)] = {0};
     int64_t   FeatureData[AV1_SYMBOL(MAX_SEGMENTS)][AV1_SYMBOL(SEG_LVL_MAX)] = {0};
     uint8_t   SegIdPreSkip;
     uint8_t   LastActiveSegId;
+    uint8_t   RefValid[AV1_SYMBOL(NUM_REF_FRAMES)] = {0};
+    uint8_t   RefOrderHint[AV1_SYMBOL(NUM_REF_FRAMES)] = {0};
+    uint8_t   OrderHints[AV1_REF(LAST_FRAME) + AV1_SYMBOL(REFS_PER_FRAME)] = {0};
+    uint64_t  TileSizeBytes;
+    uint64_t  MiColStarts[AV1_SYMBOL(MAX_TILE_COLS)] = {0};
+    uint64_t  MiRowStarts[AV1_SYMBOL(MAX_TILE_COLS)] = {0};
 };
 
 } // namespace Codec