Guest User

Untitled

a guest
Aug 2nd, 2026
55
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.11 KB | None | 0 0
  1. diff drivers/media/platform/verisilicon/rockchip_av1_entropymode.h drivers/media/platform/apple/avd/avd-av1-entropymode.h
  2. 3,4c3,4
  3. < #ifndef _ROCKCHIP_AV1_ENTROPYMODE_H_
  4. < #define _ROCKCHIP_AV1_ENTROPYMODE_H_
  5. ---
  6. > #ifndef _AVD_AV1_ENTROPYMODE_H_
  7. > #define _AVD_AV1_ENTROPYMODE_H_
  8. 8,9d7
  9. < struct hantro_ctx;
  10. <
  11. 59a58
  12. > #define PALETTE_COLOR_CONTEXTS 5
  13. 181,204c180
  14. < struct mvcdfs {
  15. < u16 joint_cdf[3];
  16. < u16 sign_cdf[2];
  17. < u16 clsss_cdf[2][10];
  18. < u16 clsss0_fp_cdf[2][2][3];
  19. < u16 fp_cdf[2][3];
  20. < u16 class0_hp_cdf[2];
  21. < u16 hp_cdf[2];
  22. < u16 class0_cdf[2];
  23. < u16 bits_cdf[2][10];
  24. < };
  25. <
  26. < struct av1cdfs {
  27. < u16 partition_cdf[13][16];
  28. < u16 kf_ymode_cdf[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS][AV1_INTRA_MODES - 1];
  29. < u16 segment_pred_cdf[PREDICTION_PROBS];
  30. < u16 spatial_pred_seg_tree_cdf[SPATIAL_PREDICTION_PROBS][MAX_MB_SEGMENTS - 1];
  31. < u16 mbskip_cdf[MBSKIP_CONTEXTS];
  32. < u16 delta_q_cdf[DELTA_Q_PROBS];
  33. < u16 delta_lf_multi_cdf[FRAME_LF_COUNT][DELTA_LF_PROBS];
  34. < u16 delta_lf_cdf[DELTA_LF_PROBS];
  35. < u16 skip_mode_cdf[SKIP_MODE_CONTEXTS];
  36. < u16 vartx_part_cdf[VARTX_PART_CONTEXTS][1];
  37. < u16 tx_size_cdf[MAX_TX_CATS][AV1_TX_SIZE_CONTEXTS][MAX_TX_DEPTH];
  38. ---
  39. > struct avd_av1_cdfs {
  40. 206c182,204
  41. < u16 uv_mode_cdf[2][AV1_INTRA_MODES][AV1_INTRA_MODES - 1 + 1];
  42. ---
  43. > u16 uv_mode_cdf_1[AV1_INTRA_MODES][AV1_INTRA_MODES - 1];
  44. > u16 uv_mode_cdf_2[AV1_INTRA_MODES][AV1_INTRA_MODES - 1 + 1];
  45. > u16 angle_delta_cdf[DIRECTIONAL_MODES][6];
  46. > u16 intrabc_cdf[1];
  47. > u16 partition_cdf_0[12];
  48. > u16 partition_cdf_1[12][9];
  49. > u16 partition_cdf_2[4][7];
  50. > u16 tx_size_cdf_0[MAX_TX_CATS - 1];
  51. > u16 tx_size_cdf_1[MAX_TX_CATS - 1][AV1_TX_SIZE_CONTEXTS][MAX_TX_DEPTH];
  52. > u16 vartx_part_cdf[VARTX_PART_CONTEXTS - 1][1];
  53. > u16 filter_intra_mode_cdf[FILTER_INTRA_MODES - 1];
  54. > u16 filter_intra_cdf[BLOCK_SIZES_ALL];
  55. > u16 spatial_pred_seg_tree_cdf[SPATIAL_PREDICTION_PROBS][MAX_MB_SEGMENTS - 1];
  56. > u16 segment_id_predicted_cdf[3];
  57. > u16 class0_hp_cdf[2][2];
  58. > u16 hp_cdf[2][2];
  59. > u16 sign_cdf[2][2];
  60. > u16 bits_cdf[2][2][10];
  61. > u16 class0_cdf[2][2];
  62. > u16 newmv_cdf[NEWMV_MODE_CONTEXTS];
  63. > u16 zeromv_cdf[ZEROMV_MODE_CONTEXTS];
  64. > u16 refmv_cdf[REFMV_MODE_CONTEXTS - 3];
  65. > u16 drl_cdf[DRL_MODE_CONTEXTS];
  66. 209,211c207,208
  67. < u16 single_ref_cdf[AV1_REF_CONTEXTS][SINGLE_REFS - 1];
  68. < u16 comp_ref_type_cdf[COMP_REF_TYPE_CONTEXTS][1];
  69. < u16 uni_comp_ref_cdf[UNI_COMP_REF_CONTEXTS][UNIDIR_COMP_REFS - 1][1];
  70. ---
  71. > u16 skip_mode_cdf[SKIP_MODE_CONTEXTS];
  72. > u16 mbskip_cdf[MBSKIP_CONTEXTS];
  73. 214,217c211,212
  74. < u16 newmv_cdf[NEWMV_MODE_CONTEXTS];
  75. < u16 zeromv_cdf[ZEROMV_MODE_CONTEXTS];
  76. < u16 refmv_cdf[REFMV_MODE_CONTEXTS];
  77. < u16 drl_cdf[DRL_MODE_CONTEXTS];
  78. ---
  79. > u16 single_ref_cdf[AV1_REF_CONTEXTS][SINGLE_REFS - 1];
  80. > u16 inter_compound_mode_cdf[8][INTER_COMPOUND_MODES - 1];
  81. 219,220d213
  82. < struct mvcdfs mv_cdf;
  83. < u16 obmc_cdf[BLOCK_SIZE_TYPES];
  84. 222,229c215,218
  85. < u16 inter_compound_mode_cdf[AV1_INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES - 1];
  86. < u16 compound_type_cdf[BLOCK_SIZE_TYPES][CDF_SIZE(COMPOUND_TYPES - 1)];
  87. < u16 interintra_cdf[BLOCK_SIZE_GROUPS];
  88. < u16 interintra_mode_cdf[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1];
  89. < u16 wedge_interintra_cdf[BLOCK_SIZE_TYPES];
  90. < u16 wedge_idx_cdf[BLOCK_SIZE_TYPES][CDF_SIZE(16)];
  91. < u16 palette_y_mode_cdf[PALETTE_BLOCK_SIZES][PALETTE_Y_MODE_CONTEXTS][1];
  92. < u16 palette_uv_mode_cdf[PALETTE_UV_MODE_CONTEXTS][1];
  93. ---
  94. > u16 joint_cdf[2][3];
  95. > u16 clsss_cdf[2][2][10];
  96. > u16 clsss0_fp_cdf[2][2][2][3];
  97. > u16 fp_cdf[2][2][3];
  98. 231a221,255
  99. > u16 palette_size_2_y_color_cdf[PALETTE_COLOR_CONTEXTS];
  100. > u16 palette_size_3_y_color_cdf[PALETTE_COLOR_CONTEXTS][2];
  101. > u16 palette_size_4_y_color_cdf[PALETTE_COLOR_CONTEXTS][3];
  102. > u16 palette_size_5_y_color_cdf[PALETTE_COLOR_CONTEXTS][4];
  103. > u16 palette_size_6_y_color_cdf[PALETTE_COLOR_CONTEXTS][5];
  104. > u16 palette_size_7_y_color_cdf[PALETTE_COLOR_CONTEXTS][6];
  105. > u16 palette_size_8_y_color_cdf[PALETTE_COLOR_CONTEXTS][7];
  106. > u16 palette_size_2_uv_color_cdf[PALETTE_COLOR_CONTEXTS];
  107. > u16 palette_size_3_uv_color_cdf[PALETTE_COLOR_CONTEXTS][2];
  108. > u16 palette_size_4_uv_color_cdf[PALETTE_COLOR_CONTEXTS][3];
  109. > u16 palette_size_5_uv_color_cdf[PALETTE_COLOR_CONTEXTS][4];
  110. > u16 palette_size_6_uv_color_cdf[PALETTE_COLOR_CONTEXTS][5];
  111. > u16 palette_size_7_uv_color_cdf[PALETTE_COLOR_CONTEXTS][6];
  112. > u16 palette_size_8_uv_color_cdf[PALETTE_COLOR_CONTEXTS][7];
  113. > u16 palette_y_mode_cdf[PALETTE_BLOCK_SIZES][PALETTE_Y_MODE_CONTEXTS][1];
  114. > u16 palette_uv_mode_cdf[PALETTE_UV_MODE_CONTEXTS];
  115. > u16 delta_q_cdf[DELTA_Q_PROBS];
  116. > u16 delta_lf_multi_cdf[FRAME_LF_COUNT][DELTA_LF_PROBS];
  117. > u16 delta_lf_cdf[DELTA_LF_PROBS];
  118. > u16 tx_type_intra0_cdf[EXTTX_SIZES - 2][AV1_INTRA_MODES][6];
  119. > u16 tx_type_intra1_cdf[EXTTX_SIZES - 1][AV1_INTRA_MODES][4];
  120. > u16 tx_type_inter0_cdf[EXTTX_SIZES - 2][EXT_TX_TYPES - 1];
  121. > u16 tx_type_inter1_cdf[11];
  122. > u16 tx_type_inter2_cdf[4];
  123. > u16 compound_idx_cdf[COMP_INDEX_CONTEXTS][CDF_SIZE(2)];
  124. > u16 comp_group_idx_cdf[COMP_GROUP_IDX_CONTEXTS - 1][CDF_SIZE(2)];
  125. > u16 segment_pred_cdf[PREDICTION_PROBS];
  126. > u16 compound_type_cdf[BLOCK_SIZE_TYPES - 3][CDF_SIZE(COMPOUND_TYPES - 1)];
  127. > u16 interintra_cdf[BLOCK_SIZE_GROUPS - 1];
  128. > u16 interintra_mode_cdf[BLOCK_SIZE_GROUPS - 1][INTERINTRA_MODES - 1];
  129. > u16 wedge_idx_cdf[BLOCK_SIZE_TYPES][CDF_SIZE(16)];
  130. > u16 wedge_interintra_cdf[BLOCK_SIZE_TYPES];
  131. > u16 obmc_cdf[BLOCK_SIZE_TYPES];
  132. > u16 comp_ref_type_cdf[COMP_REF_TYPE_CONTEXTS][1];
  133. > u16 uni_comp_ref_cdf[UNI_COMP_REF_CONTEXTS][UNIDIR_COMP_REFS - 1][1];
  134. 234,246c258
  135. < u16 intrabc_cdf[1];
  136. < u16 angle_delta_cdf[DIRECTIONAL_MODES][6];
  137. < u16 filter_intra_mode_cdf[FILTER_INTRA_MODES - 1];
  138. < u16 filter_intra_cdf[BLOCK_SIZES_ALL];
  139. < u16 comp_group_idx_cdf[COMP_GROUP_IDX_CONTEXTS][CDF_SIZE(2)];
  140. < u16 compound_idx_cdf[COMP_INDEX_CONTEXTS][CDF_SIZE(2)];
  141. < u16 dummy0[14];
  142. < // Palette index contexts; sizes 1/7, 2/6, 3/5 packed together
  143. < u16 palette_y_color_index_cdf[PALETTE_IDX_CONTEXTS][8];
  144. < u16 palette_uv_color_index_cdf[PALETTE_IDX_CONTEXTS][8];
  145. < u16 tx_type_intra0_cdf[EXTTX_SIZES][AV1_INTRA_MODES][8];
  146. < u16 tx_type_intra1_cdf[EXTTX_SIZES][AV1_INTRA_MODES][4];
  147. < u16 tx_type_inter_cdf[2][EXTTX_SIZES][EXT_TX_TYPES];
  148. ---
  149. > u16 partition_cdf_3[4];
  150. 248,249d259
  151. < u16 eob_extra_cdf[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS][CDF_SIZE(2)];
  152. < u16 dummy1[5];
  153. 251,253c261,263
  154. < u16 eob_flag_cdf32[PLANE_TYPES][2][8];
  155. < u16 eob_flag_cdf64[PLANE_TYPES][2][8];
  156. < u16 eob_flag_cdf128[PLANE_TYPES][2][8];
  157. ---
  158. > u16 eob_flag_cdf32[PLANE_TYPES][2][5];
  159. > u16 eob_flag_cdf64[PLANE_TYPES][2][6];
  160. > u16 eob_flag_cdf128[PLANE_TYPES][2][7];
  161. 255,258c265,267
  162. < u16 eob_flag_cdf512[PLANE_TYPES][2][16];
  163. < u16 eob_flag_cdf1024[PLANE_TYPES][2][16];
  164. < u16 coeff_base_eob_cdf[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS_EOB][CDF_SIZE(3)];
  165. < u16 coeff_base_cdf[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS][CDF_SIZE(4) + 1];
  166. ---
  167. > u16 eob_flag_cdf512[PLANE_TYPES][1][9];
  168. > u16 eob_flag_cdf1024[PLANE_TYPES][1][10];
  169. > u16 eob_extra_cdf[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS][CDF_SIZE(2)];
  170. 260,262c269,271
  171. < u16 dummy2[2];
  172. < u16 coeff_br_cdf[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS][CDF_SIZE(BR_CDF_SIZE) + 1];
  173. < u16 dummy3[16];
  174. ---
  175. > u16 coeff_base_eob_cdf[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS_EOB][CDF_SIZE(3)];
  176. > u16 coeff_br_cdf[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS][CDF_SIZE(BR_CDF_SIZE)];
  177. > u16 coeff_base_cdf[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS][CDF_SIZE(4)];
  178. 265,270c274,277
  179. < void rockchip_av1_store_cdfs(struct hantro_ctx *ctx,
  180. < u32 refresh_frame_flags);
  181. < void rockchip_av1_get_cdfs(struct hantro_ctx *ctx, u32 ref_idx);
  182. < void rockchip_av1_set_default_cdfs(struct av1cdfs *cdfs,
  183. < struct mvcdfs *cdfs_ndvc);
  184. < void rockchip_av1_default_coeff_probs(u32 base_qindex, void *ptr);
  185. ---
  186. > /* void rockchip_av1_set_default_cdfs(struct av1cdfs *cdfs); //, */
  187. > void avd_av1_set_default_cdfs(void *cdfs); //,
  188. > /* struct mvcdfs *cdfs_ndvc); */
  189. > void avd_av1_default_coeff_probs(u32 base_qindex, void *ptr);
  190. 272c279
  191. < #endif /* _ROCKCHIP_AV1_ENTROPYMODE_H_ */
  192. ---
  193. > #endif /* _AVD_AV1_ENTROPYMODE_H_ */
Advertisement
Add Comment
Please, Sign In to add comment