Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff drivers/media/platform/verisilicon/rockchip_av1_entropymode.c drivers/media/platform/apple/avd/avd-av1-entropymode.c
- 13,14c13,15
- < #include "hantro.h"
- < #include "rockchip_av1_entropymode.h"
- ---
- > #include <linux/string.h>
- > #include "avd.h"
- > #include "avd-av1-entropymode.h"
- 60,171c61,70
- < static const u16 default_kf_y_mode_cdf
- < [KF_MODE_CONTEXTS][KF_MODE_CONTEXTS][CDF_SIZE(AV1_INTRA_MODES)] = {
- < {
- < {
- < AOM_CDF13(15588, 17027, 19338, 20218, 20682, 21110,
- < 21825, 23244, 24189, 28165, 29093, 30466)
- < },
- < {
- < AOM_CDF13(12016, 18066, 19516, 20303, 20719, 21444,
- < 21888, 23032, 24434, 28658, 30172, 31409)
- < },
- < {
- < AOM_CDF13(10052, 10771, 22296, 22788, 23055, 23239,
- < 24133, 25620, 26160, 29336, 29929, 31567)
- < },
- < {
- < AOM_CDF13(14091, 15406, 16442, 18808, 19136, 19546,
- < 19998, 22096, 24746, 29585, 30958, 32462)
- < },
- < {
- < AOM_CDF13(12122, 13265, 15603, 16501, 18609, 20033,
- < 22391, 25583, 26437, 30261, 31073, 32475)
- < }
- < },
- < {
- < {
- < AOM_CDF13(10023, 19585, 20848, 21440, 21832, 22760,
- < 23089, 24023, 25381, 29014, 30482, 31436)
- < },
- < {
- < AOM_CDF13(5983, 24099, 24560, 24886, 25066, 25795,
- < 25913, 26423, 27610, 29905, 31276, 31794)
- < },
- < {
- < AOM_CDF13(7444, 12781, 20177, 20728, 21077, 21607,
- < 22170, 23405, 24469, 27915, 29090, 30492)
- < },
- < {
- < AOM_CDF13(8537, 14689, 15432, 17087, 17408, 18172,
- < 18408, 19825, 24649, 29153, 31096, 32210)
- < },
- < {
- < AOM_CDF13(7543, 14231, 15496, 16195, 17905, 20717,
- < 21984, 24516, 26001, 29675, 30981, 31994)
- < }
- < },
- < {
- < {
- < AOM_CDF13(12613, 13591, 21383, 22004, 22312, 22577,
- < 23401, 25055, 25729, 29538, 30305, 32077)
- < },
- < {
- < AOM_CDF13(9687, 13470, 18506, 19230, 19604, 20147,
- < 20695, 22062, 23219, 27743, 29211, 30907)
- < },
- < {
- < AOM_CDF13(6183, 6505, 26024, 26252, 26366, 26434,
- < 27082, 28354, 28555, 30467, 30794, 32086)
- < },
- < {
- < AOM_CDF13(10718, 11734, 14954, 17224, 17565, 17924,
- < 18561, 21523, 23878, 28975, 30287, 32252)
- < },
- < {
- < AOM_CDF13(9194, 9858, 16501, 17263, 18424, 19171,
- < 21563, 25961, 26561, 30072, 30737, 32463)
- < }
- < },
- < {
- < {
- < AOM_CDF13(12602, 14399, 15488, 18381, 18778, 19315,
- < 19724, 21419, 25060, 29696, 30917, 32409)
- < },
- < {
- < AOM_CDF13(8203, 13821, 14524, 17105, 17439, 18131,
- < 18404, 19468, 25225, 29485, 31158, 32342)
- < },
- < {
- < AOM_CDF13(8451, 9731, 15004, 17643, 18012, 18425,
- < 19070, 21538, 24605, 29118, 30078, 32018)
- < },
- < {
- < AOM_CDF13(7714, 9048, 9516, 16667, 16817, 16994,
- < 17153, 18767, 26743, 30389, 31536, 32528)
- < },
- < {
- < AOM_CDF13(8843, 10280, 11496, 15317, 16652, 17943,
- < 19108, 22718, 25769, 29953, 30983, 32485)
- < }
- < },
- < {
- < {
- < AOM_CDF13(12578, 13671, 15979, 16834, 19075, 20913,
- < 22989, 25449, 26219, 30214, 31150, 32477)
- < },
- < {
- < AOM_CDF13(9563, 13626, 15080, 15892, 17756, 20863,
- < 22207, 24236, 25380, 29653, 31143, 32277)
- < },
- < {
- < AOM_CDF13(8356, 8901, 17616, 18256, 19350, 20106,
- < 22598, 25947, 26466, 29900, 30523, 32261)
- < },
- < {
- < AOM_CDF13(10835, 11815, 13124, 16042, 17018, 18039,
- < 18947, 22753, 24615, 29489, 30883, 32482)
- < },
- < {
- < AOM_CDF13(7618, 8288, 9859, 10509, 15386, 18657,
- < 22903, 28776, 29180, 31355, 31802, 32593)
- < }
- < }
- ---
- > static_assert(offsetof(struct avd_av1_cdfs, intra_inter_cdf) == 1470);
- > static_assert(offsetof(struct avd_av1_cdfs, txb_skip_cdf) == 4588);
- > static_assert(offsetof(struct avd_av1_cdfs, eob_flag_cdf16) == 4718);
- > static_assert(offsetof(struct avd_av1_cdfs, eob_extra_cdf) == 5034);
- > static_assert(offsetof(struct avd_av1_cdfs, dc_sign_cdf) == 5214);
- > static_assert(offsetof(struct avd_av1_cdfs, coeff_base_cdf) == 6646);
- > static_assert(sizeof(struct avd_av1_cdfs) == 9166);
- >
- > static const u16 default_palette_uv_mode_cdf[ PALETTE_UV_MODE_CONTEXTS ] = {
- > AOM_CDF3(32461, 21488)
- 205,207c104
- < static const u16 default_uv_mode_cdf[CFL_ALLOWED_TYPES]
- < [AV1_INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] = {
- < {
- ---
- > static const u16 default_uv_mode_cdf_1[AV1_INTRA_MODES][CDF_SIZE(UV_INTRA_MODES) - 1] = {
- 260,261c157,158
- < },
- < {
- ---
- > };
- > static const u16 default_uv_mode_cdf_2[AV1_INTRA_MODES][CDF_SIZE(UV_INTRA_MODES) - 1 + 1] = {
- 321d217
- < }
- 324,329c220,226
- < static const u16 default_partition_cdf[13][16] = {
- < {
- < AOM_CDF4(19132, 25510, 30392), AOM_CDF4(13928, 19855, 28540),
- < AOM_CDF4(12522, 23679, 28629), AOM_CDF4(9896, 18783, 25853),
- < AOM_CDF2(11570), AOM_CDF2(16855), AOM_CDF3(9413, 22581)
- < },
- ---
- >
- > static const u16 default_partition_cdf_0[12] = {
- > AOM_CDF4(19132, 25510, 30392), AOM_CDF4(13928, 19855, 28540),
- > AOM_CDF4(12522, 23679, 28629), AOM_CDF4(9896, 18783, 25853),
- > };
- >
- > static const u16 default_partition_cdf_1[12][9] = {
- 356d252
- < AOM_CDF8(27899, 28219, 28529, 32484, 32539, 32619, 32639)
- 360d255
- < AOM_CDF8(6607, 6990, 8268, 32060, 32219, 32338, 32371)
- 364d258
- < AOM_CDF8(5429, 6676, 7122, 32027, 32227, 32531, 32582)
- 367a262,275
- > }
- > };
- >
- > static const u16 default_partition_cdf_2[4][7] = {
- > {
- > AOM_CDF8(27899, 28219, 28529, 32484, 32539, 32619, 32639)
- > },
- > {
- > AOM_CDF8(6607, 6990, 8268, 32060, 32219, 32338, 32371)
- > },
- > {
- > AOM_CDF8(5429, 6676, 7122, 32027, 32227, 32531, 32582)
- > },
- > {
- 372c280,284
- < static const u16 default_intra_ext_tx0_cdf[EXTTX_SIZES][AV1_INTRA_MODES][8] = {
- ---
- > static const u16 default_partition_cdf_3[4] = {
- > AOM_CDF5(11570, 16855, 9413, 22581)
- > };
- >
- > static const u16 default_intra_ext_tx0_cdf[EXTTX_SIZES - 2][AV1_INTRA_MODES][6] = {
- 402,432c314
- < },
- < {
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < },
- < {
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087)},
- < },
- ---
- > }
- 435c317
- < static const u16 default_intra_ext_tx1_cdf[EXTTX_SIZES][AV1_INTRA_MODES][4] = {
- ---
- > static const u16 default_intra_ext_tx1_cdf[EXTTX_SIZES - 1][AV1_INTRA_MODES][4] = {
- 480,495c362
- < },
- < {
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < { AOM_CDF5(6554, 13107, 19661, 26214)},
- < },
- ---
- > }
- 498c365
- < static const u16 default_inter_ext_tx_cdf[2][EXTTX_SIZES][EXT_TX_TYPES] = {
- ---
- > static const u16 default_inter0_ext_tx_cdf[EXTTX_SIZES - 2][EXT_TX_TYPES - 1] = {
- 500,515c367,368
- < {
- < AOM_CDF16(4458, 5560, 7695, 9709, 13330, 14789, 17537, 20266,
- < 21504, 22848, 23934, 25474, 27727, 28915, 30631)
- < },
- < {
- < AOM_CDF16(1645, 2573, 4778, 5711, 7807, 8622, 10522, 15357, 17674,
- < 20408, 22517, 25010, 27116, 28856, 30749)
- < },
- < {
- < AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
- < 18432, 20480, 22528, 24576, 26624, 28672, 30720)
- < },
- < {
- < AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
- < 18432, 20480, 22528, 24576, 26624, 28672, 30720)
- < },
- ---
- > AOM_CDF16(4458, 5560, 7695, 9709, 13330, 14789, 17537, 20266,
- > 21504, 22848, 23934, 25474, 27727, 28915, 30631)
- 518,537c371,372
- < {
- < AOM_CDF12(2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845,
- < 24576, 27307, 30037),
- < AOM_CDF2(16384)
- < },
- < {
- < AOM_CDF12(2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845,
- < 24576, 27307, 30037),
- < AOM_CDF2(4167)
- < },
- < {
- < AOM_CDF12(770, 2421, 5225, 12907, 15819, 18927, 21561, 24089,
- < 26595, 28526, 30529),
- < AOM_CDF2(1998)
- < },
- < {
- < AOM_CDF12(2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845,
- < 24576, 27307, 30037),
- < AOM_CDF2(748)
- < },
- ---
- > AOM_CDF16(1645, 2573, 4778, 5711, 7807, 8622, 10522, 15357, 17674,
- > 20408, 22517, 25010, 27116, 28856, 30749)
- 539a375,382
- > static const u16 default_inter1_ext_tx_cdf[11] = {
- > AOM_CDF12(770, 2421, 5225, 12907, 15819, 18927, 21561, 24089,
- > 26595, 28526, 30529),
- > };
- >
- > static const u16 default_inter2_ext_tx_cdf[4] = {
- > AOM_CDF5(16384, 4167, 1998, 748)
- > };
- 593c436
- < static const u16 default_refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(2)] = {
- ---
- > static const u16 default_refmv_cdf[REFMV_MODE_CONTEXTS - 3][CDF_SIZE(2)] = {
- 602c445
- < static const u16 default_inter_compound_mode_cdf[AV1_INTER_MODE_CONTEXTS]
- ---
- > static const u16 default_inter_compound_mode_cdf[8]
- 614,616c457,458
- < static const u16 default_interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(2)] = {
- < { AOM_CDF2(16384) }, { AOM_CDF2(26887) }, { AOM_CDF2(27597) },
- < { AOM_CDF2(30237) }
- ---
- > static const u16 default_interintra_cdf[BLOCK_SIZE_GROUPS - 1][CDF_SIZE(2)] = {
- > { AOM_CDF2(26887) }, { AOM_CDF2(27597) }, { AOM_CDF2(30237) }
- 619,620c461
- < static const u16 default_interintra_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTERINTRA_MODES)] = {
- < { AOM_CDF4(8192, 16384, 24576) },
- ---
- > static const u16 default_interintra_mode_cdf[BLOCK_SIZE_GROUPS - 1][CDF_SIZE(INTERINTRA_MODES)] = {
- 637,638c478
- < static const u16 default_compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES - 1)] = {
- < { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- ---
- > static const u16 default_compound_type_cdf[BLOCK_SIZES_ALL - 3][CDF_SIZE(COMPOUND_TYPES - 1)] = {
- 870,871c710,819
- < static const u16 default_palette_uv_mode_cdf[PALETTE_UV_MODE_CONTEXTS][CDF_SIZE(2)] = {
- < { AOM_CDF2(32461) }, { AOM_CDF2(21488) }
- ---
- > static const u16 default_palette_size_2_y_color_cdf[ PALETTE_COLOR_CONTEXTS ] = {
- > AOM_CDF2(28710),
- > AOM_CDF2(16384),
- > AOM_CDF2(10553),
- > AOM_CDF2(27036),
- > AOM_CDF2(31603)
- > };
- >
- > static const u16 default_palette_size_3_y_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 2 ] = {
- > { AOM_CDF3(27877, 30490) },
- > { AOM_CDF3(11532, 25697) },
- > { AOM_CDF3(6544, 30234) },
- > { AOM_CDF3(23018, 28072) },
- > { AOM_CDF3(31915, 32385) }
- > };
- >
- > static const u16 default_palette_size_4_y_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 3 ] = {
- > { AOM_CDF4(25572, 28046, 30045) },
- > { AOM_CDF4(9478, 21590, 27256) },
- > { AOM_CDF4(7248, 26837, 29824) },
- > { AOM_CDF4(19167, 24486, 28349) },
- > { AOM_CDF4(31400, 31825, 32250) }
- > };
- >
- > static const u16 default_palette_size_5_y_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 4 ] = {
- > { AOM_CDF5(24779, 26955, 28576, 30282) },
- > { AOM_CDF5(8669, 20364, 24073, 28093) },
- > { AOM_CDF5(4255, 27565, 29377, 31067) },
- > { AOM_CDF5(19864, 23674, 26716, 29530) },
- > { AOM_CDF5(31646, 31893, 32147, 32426) }
- > };
- >
- > static const u16 default_palette_size_6_y_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 5 ] = {
- > { AOM_CDF6(23132, 25407, 26970, 28435, 30073) },
- > { AOM_CDF6(7443, 17242, 20717, 24762, 27982) },
- > { AOM_CDF6(6300, 24862, 26944, 28784, 30671) },
- > { AOM_CDF6(18916, 22895, 25267, 27435, 29652) },
- > { AOM_CDF6(31270, 31550, 31808, 32059, 32353) }
- > };
- >
- > static const u16 default_palette_size_7_y_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 6 ] = {
- > { AOM_CDF7(23105, 25199, 26464, 27684, 28931, 30318) },
- > { AOM_CDF7(6950, 15447, 18952, 22681, 25567, 28563) },
- > { AOM_CDF7(7560, 23474, 25490, 27203, 28921, 30708) },
- > { AOM_CDF7(18544, 22373, 24457, 26195, 28119, 30045) },
- > { AOM_CDF7(31198, 31451, 31670, 31882, 32123, 32391) }
- > };
- >
- > static const u16 default_palette_size_8_y_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 7 ] = {
- > { AOM_CDF8(21689, 23883, 25163, 26352, 27506, 28827, 30195) },
- > { AOM_CDF8(6892, 15385, 17840, 21606, 24287, 26753, 29204) },
- > { AOM_CDF8(5651, 23182, 25042, 26518, 27982, 29392, 30900) },
- > { AOM_CDF8(19349, 22578, 24418, 25994, 27524, 29031, 30448) },
- > { AOM_CDF8(31028, 31270, 31504, 31705, 31927, 32153, 32392) }
- > };
- >
- > static const u16 default_palette_size_2_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 1 ] = {
- > { AOM_CDF2(29089) },
- > { AOM_CDF2(16384) },
- > { AOM_CDF2(8713) },
- > { AOM_CDF2(29257) },
- > { AOM_CDF2(31610) }
- > };
- >
- > static const u16 default_palette_size_3_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 2 ] = {
- > { AOM_CDF3(25257, 29145) },
- > { AOM_CDF3(12287, 27293) },
- > { AOM_CDF3(7033, 27960) },
- > { AOM_CDF3(20145, 25405) },
- > { AOM_CDF3(30608, 31639) }
- > };
- >
- > static const u16 default_palette_size_4_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 3 ] = {
- > { AOM_CDF4(24210, 27175, 29903) },
- > { AOM_CDF4(9888, 22386, 27214) },
- > { AOM_CDF4(5901, 26053, 29293) },
- > { AOM_CDF4(18318, 22152, 28333) },
- > { AOM_CDF4(30459, 31136, 31926) }
- > };
- >
- > static const u16 default_palette_size_5_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 4 ] = {
- > { AOM_CDF5(22980, 25479, 27781, 29986) },
- > { AOM_CDF5(8413, 21408, 24859, 28874) },
- > { AOM_CDF5(2257, 29449, 30594, 31598) },
- > { AOM_CDF5(19189, 21202, 25915, 28620) },
- > { AOM_CDF5(31844, 32044, 32281, 32518) }
- > };
- >
- > static const u16 default_palette_size_6_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 5 ] = {
- > { AOM_CDF6(22217, 24567, 26637, 28683, 30548) },
- > { AOM_CDF6(7307, 16406, 19636, 24632, 28424) },
- > { AOM_CDF6(4441, 25064, 26879, 28942, 30919) },
- > { AOM_CDF6(17210, 20528, 23319, 26750, 29582) },
- > { AOM_CDF6(30674, 30953, 31396, 31735, 32207) }
- > };
- >
- > static const u16 default_palette_size_7_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 6 ] = {
- > { AOM_CDF7(21239, 23168, 25044, 26962, 28705, 30506) },
- > { AOM_CDF7(6545, 15012, 18004, 21817, 25503, 28701) },
- > { AOM_CDF7(3448, 26295, 27437, 28704, 30126, 31442) },
- > { AOM_CDF7(15889, 18323, 21704, 24698, 26976, 29690) },
- > { AOM_CDF7(30988, 31204, 31479, 31734, 31983, 32325) }
- > };
- >
- > static const u16 default_palette_size_8_uv_color_cdf[ PALETTE_COLOR_CONTEXTS ][ 7 ] = {
- > { AOM_CDF8(21442, 23288, 24758, 26246, 27649, 28980, 30563) },
- > { AOM_CDF8(5863, 14933, 17552, 20668, 23683, 26411, 29273) },
- > { AOM_CDF8(3415, 25810, 26877, 27990, 29223, 30394, 31618) },
- > { AOM_CDF8(17965, 20084, 22232, 23974, 26274, 28402, 30390) },
- > { AOM_CDF8(31190, 31329, 31516, 31679, 31825, 32026, 32322) }
- 874,1032c822
- < static const u16 default_palette_y_color_index_cdf[PALETTE_IDX_CONTEXTS][8] = {
- < // Palette sizes 2 & 8
- < {
- < AOM_CDF2(28710),
- < AOM_CDF8(21689, 23883, 25163, 26352, 27506, 28827, 30195)
- < },
- < {
- < AOM_CDF2(16384),
- < AOM_CDF8(6892, 15385, 17840, 21606, 24287, 26753, 29204)
- < },
- < {
- < AOM_CDF2(10553),
- < AOM_CDF8(5651, 23182, 25042, 26518, 27982, 29392, 30900)
- < },
- < {
- < AOM_CDF2(27036),
- < AOM_CDF8(19349, 22578, 24418, 25994, 27524, 29031, 30448)
- < },
- < {
- < AOM_CDF2(31603),
- < AOM_CDF8(31028, 31270, 31504, 31705, 31927, 32153, 32392)
- < },
- < // Palette sizes 3 & 7
- < {
- < AOM_CDF3(27877, 30490),
- < AOM_CDF7(23105, 25199, 26464, 27684, 28931, 30318)
- < },
- < {
- < AOM_CDF3(11532, 25697),
- < AOM_CDF7(6950, 15447, 18952, 22681, 25567, 28563)
- < },
- < {
- < AOM_CDF3(6544, 30234),
- < AOM_CDF7(7560, 23474, 25490, 27203, 28921, 30708)
- < },
- < {
- < AOM_CDF3(23018, 28072),
- < AOM_CDF7(18544, 22373, 24457, 26195, 28119, 30045)
- < },
- < {
- < AOM_CDF3(31915, 32385),
- < AOM_CDF7(31198, 31451, 31670, 31882, 32123, 32391)
- < },
- < // Palette sizes 4 & 6
- < {
- < AOM_CDF4(25572, 28046, 30045),
- < AOM_CDF6(23132, 25407, 26970, 28435, 30073)
- < },
- < {
- < AOM_CDF4(9478, 21590, 27256),
- < AOM_CDF6(7443, 17242, 20717, 24762, 27982)
- < },
- < {
- < AOM_CDF4(7248, 26837, 29824),
- < AOM_CDF6(6300, 24862, 26944, 28784, 30671)
- < },
- < {
- < AOM_CDF4(19167, 24486, 28349),
- < AOM_CDF6(18916, 22895, 25267, 27435, 29652)
- < },
- < {
- < AOM_CDF4(31400, 31825, 32250),
- < AOM_CDF6(31270, 31550, 31808, 32059, 32353)
- < },
- < // Palette size 5
- < {
- < AOM_CDF5(24779, 26955, 28576, 30282),
- < AOM_CDF5(8669, 20364, 24073, 28093)
- < },
- < {
- < AOM_CDF5(4255, 27565, 29377, 31067),
- < AOM_CDF5(19864, 23674, 26716, 29530)
- < },
- < {
- < AOM_CDF5(31646, 31893, 32147, 32426),
- < 0, 0, 0, 0
- < }
- < };
- <
- < static const u16 default_palette_uv_color_index_cdf[PALETTE_IDX_CONTEXTS][8] = {
- < // Palette sizes 2 & 8
- < {
- < AOM_CDF2(29089),
- < AOM_CDF8(21442, 23288, 24758, 26246, 27649, 28980, 30563)
- < },
- < {
- < AOM_CDF2(16384),
- < AOM_CDF8(5863, 14933, 17552, 20668, 23683, 26411, 29273)
- < },
- < {
- < AOM_CDF2(8713),
- < AOM_CDF8(3415, 25810, 26877, 27990, 29223, 30394, 31618)
- < },
- < {
- < AOM_CDF2(29257),
- < AOM_CDF8(17965, 20084, 22232, 23974, 26274, 28402, 30390)
- < },
- < {
- < AOM_CDF2(31610),
- < AOM_CDF8(31190, 31329, 31516, 31679, 31825, 32026, 32322)
- < },
- < // Palette sizes 3 & 7
- < {
- < AOM_CDF3(25257, 29145),
- < AOM_CDF7(21239, 23168, 25044, 26962, 28705, 30506)
- < },
- < {
- < AOM_CDF3(12287, 27293),
- < AOM_CDF7(6545, 15012, 18004, 21817, 25503, 28701)
- < },
- < {
- < AOM_CDF3(7033, 27960),
- < AOM_CDF7(3448, 26295, 27437, 28704, 30126, 31442)
- < },
- < {
- < AOM_CDF3(20145, 25405),
- < AOM_CDF7(15889, 18323, 21704, 24698, 26976, 29690)
- < },
- < {
- < AOM_CDF3(30608, 31639),
- < AOM_CDF7(30988, 31204, 31479, 31734, 31983, 32325)
- < },
- < // Palette sizes 4 & 6
- < {
- < AOM_CDF4(24210, 27175, 29903),
- < AOM_CDF6(22217, 24567, 26637, 28683, 30548)
- < },
- < {
- < AOM_CDF4(9888, 22386, 27214),
- < AOM_CDF6(7307, 16406, 19636, 24632, 28424)
- < },
- < {
- < AOM_CDF4(5901, 26053, 29293),
- < AOM_CDF6(4441, 25064, 26879, 28942, 30919)
- < },
- < {
- < AOM_CDF4(18318, 22152, 28333),
- < AOM_CDF6(17210, 20528, 23319, 26750, 29582)
- < },
- < {
- < AOM_CDF4(30459, 31136, 31926),
- < AOM_CDF6(30674, 30953, 31396, 31735, 32207)
- < },
- < // Palette size 5
- < {
- < AOM_CDF5(22980, 25479, 27781, 29986),
- < AOM_CDF5(8413, 21408, 24859, 28874)
- < },
- < {
- < AOM_CDF5(2257, 29449, 30594, 31598),
- < AOM_CDF5(19189, 21202, 25915, 28620)
- < },
- < {
- < AOM_CDF5(31844, 32044, 32281, 32518),
- < 0, 0, 0, 0
- < }
- < };
- <
- < static const u16 default_txfm_partition_cdf[TXFM_PARTITION_CONTEXTS][CDF_SIZE(2)] = {
- ---
- > static const u16 default_txfm_partition_cdf[TXFM_PARTITION_CONTEXTS - 1][CDF_SIZE(2)] = {
- 1055c845
- < static const u16 default_comp_group_idx_cdfs[COMP_GROUP_IDX_CONTEXTS][CDF_SIZE(2)] = {
- ---
- > static const u16 default_comp_group_idx_cdfs[COMP_GROUP_IDX_CONTEXTS - 1][CDF_SIZE(2)] = {
- 1109,1115c899,904
- < static const u16 default_tx_size_cdf[MAX_TX_CATS]
- < [AV1_TX_SIZE_CONTEXTS][CDF_SIZE(MAX_TX_DEPTH + 1)] = {
- < {
- < { AOM_CDF2(19968)},
- < { AOM_CDF2(19968)},
- < { AOM_CDF2(24320)}
- < },
- ---
- > static const u16 default_tx_size_cdf_0[MAX_TX_CATS - 1] = {
- > AOM_CDF2(19968),
- > AOM_CDF2(19968),
- > AOM_CDF2(24320)
- > };
- > static const u16 default_tx_size_cdf_1[MAX_TX_CATS - 1][AV1_TX_SIZE_CONTEXTS][CDF_SIZE(MAX_TX_DEPTH + 1)] = {
- 2032c1821
- < static const u16 av1_default_eob_multi32_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][8] = {
- ---
- > static const u16 av1_default_eob_multi32_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][5] = {
- 2075c1864
- < static const u16 av1_default_eob_multi64_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][8] = {
- ---
- > static const u16 av1_default_eob_multi64_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][6] = {
- 2118c1907
- < static const u16 av1_default_eob_multi128_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][8] = {
- ---
- > static const u16 av1_default_eob_multi128_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][7] = {
- 2204c1993
- < static const u16 av1_default_eob_multi512_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][16] = {
- ---
- > static const u16 av1_default_eob_multi512_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][1][9] = {
- 2208d1996
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2212d1999
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2218d2004
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2222d2007
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2228d2012
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2232d2015
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2238d2020
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2242d2023
- < { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491)}
- 2247c2028
- < static const u16 av1_default_eob_multi1024_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][16] = {
- ---
- > static const u16 av1_default_eob_multi1024_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][1][10] = {
- 2252,2253d2032
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2258,2259d2036
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2266,2267d2042
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2272,2273d2046
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2280,2281d2052
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2286,2287d2056
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2294,2295d2062
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2300,2301d2066
- < { AOM_CDF11(2979, 5958, 8937, 11916, 14895,
- < 17873, 20852, 23831, 26810, 29789)}
- 2307c2072
- < [TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS][CDF_SIZE(BR_CDF_SIZE) + 1] = {
- ---
- > [TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS][CDF_SIZE(BR_CDF_SIZE)] = {
- 2880c2645
- < [SIG_COEF_CONTEXTS][CDF_SIZE(NUM_BASE_LEVELS + 2) + 1] = {
- ---
- > [SIG_COEF_CONTEXTS][CDF_SIZE(NUM_BASE_LEVELS + 2)] = {
- 4142a3908,3913
- > static const u16 default_segment_id_predicted_cdf[3][1] = {
- > { ICDF(128 * 128) },
- > { ICDF(128 * 128) },
- > { ICDF(128 * 128) }
- > };
- >
- 4181,4185c3952,3956
- < static const u16 default_sign_cdf[] = { ICDF(128 * 128), ICDF(128 * 128)};
- < static const u16 default_class0_hp_cdf[] = { ICDF(160 * 128), ICDF(160 * 128)};
- < static const u16 default_hp_cdf[] = { ICDF(128 * 128), ICDF(128 * 128)};
- < static const u16 default_class0_cdf[] = { ICDF(216 * 128), ICDF(216 * 128)};
- < static const u16 default_bits_cdf[][10] = {
- ---
- > static const u16 default_sign_cdf[2] = { ICDF(128 * 128), ICDF(128 * 128)};
- > static const u16 default_class0_hp_cdf[2] = { ICDF(160 * 128), ICDF(160 * 128)};
- > static const u16 default_hp_cdf[2] = { ICDF(128 * 128), ICDF(128 * 128)};
- > static const u16 default_class0_cdf[2] = { ICDF(216 * 128), ICDF(216 * 128)};
- > static const u16 default_bits_cdf[2][10] = {
- 4209c3980
- < void rockchip_av1_default_coeff_probs(u32 base_qindex, void *ptr)
- ---
- > void avd_av1_default_coeff_probs(u32 base_qindex, void *ptr)
- 4211c3982
- < struct av1cdfs *cdfs = (struct av1cdfs *)ptr;
- ---
- > struct avd_av1_cdfs *cdfs = (struct avd_av1_cdfs *)ptr;
- 4243,4244c4014
- < void rockchip_av1_set_default_cdfs(struct av1cdfs *cdfs,
- < struct mvcdfs *cdfs_ndvc)
- ---
- > void avd_av1_set_default_cdfs(void *ptr) //,
- 4246,4247c4016,4025
- < memcpy(cdfs->partition_cdf, default_partition_cdf,
- < sizeof(cdfs->partition_cdf));
- ---
- > struct avd_av1_cdfs *cdfs = ((struct avd_av1_cdfs*)ptr);
- >
- > memcpy(cdfs->partition_cdf_0, default_partition_cdf_0,
- > sizeof(cdfs->partition_cdf_0));
- > memcpy(cdfs->partition_cdf_1, default_partition_cdf_1,
- > sizeof(cdfs->partition_cdf_1));
- > memcpy(cdfs->partition_cdf_2, default_partition_cdf_2,
- > sizeof(cdfs->partition_cdf_2));
- > memcpy(cdfs->partition_cdf_3, default_partition_cdf_3,
- > sizeof(cdfs->partition_cdf_3));
- 4253,4254c4031,4036
- < memcpy(cdfs->tx_type_inter_cdf, default_inter_ext_tx_cdf,
- < sizeof(cdfs->tx_type_inter_cdf));
- ---
- > memcpy(cdfs->tx_type_inter0_cdf, default_inter0_ext_tx_cdf,
- > sizeof(cdfs->tx_type_inter0_cdf));
- > memcpy(cdfs->tx_type_inter1_cdf, default_inter1_ext_tx_cdf,
- > sizeof(cdfs->tx_type_inter1_cdf));
- > memcpy(cdfs->tx_type_inter2_cdf, default_inter2_ext_tx_cdf,
- > sizeof(cdfs->tx_type_inter2_cdf));
- 4276,4282c4058,4066
- < memcpy(cdfs->tx_size_cdf, default_tx_size_cdf,
- < sizeof(cdfs->tx_size_cdf));
- <
- < memcpy(cdfs->kf_ymode_cdf, default_kf_y_mode_cdf,
- < sizeof(cdfs->kf_ymode_cdf));
- < memcpy(cdfs->uv_mode_cdf, default_uv_mode_cdf,
- < sizeof(cdfs->uv_mode_cdf));
- ---
- > memcpy(cdfs->tx_size_cdf_0, default_tx_size_cdf_0,
- > sizeof(cdfs->tx_size_cdf_0));
- > memcpy(cdfs->tx_size_cdf_1, default_tx_size_cdf_1,
- > sizeof(cdfs->tx_size_cdf_1));
- >
- > memcpy(cdfs->uv_mode_cdf_1, default_uv_mode_cdf_1,
- > sizeof(cdfs->uv_mode_cdf_1));
- > memcpy(cdfs->uv_mode_cdf_2, default_uv_mode_cdf_2,
- > sizeof(cdfs->uv_mode_cdf_2));
- 4310a4095,4096
- > memcpy(cdfs->segment_id_predicted_cdf, default_segment_id_predicted_cdf,
- > sizeof(cdfs->segment_id_predicted_cdf));
- 4313,4348c4099,4120
- < memcpy(cdfs->mv_cdf.joint_cdf, default_joint_cdf,
- < sizeof(cdfs->mv_cdf.joint_cdf));
- < memcpy(cdfs->mv_cdf.sign_cdf, default_sign_cdf,
- < sizeof(cdfs->mv_cdf.sign_cdf));
- < memcpy(cdfs->mv_cdf.clsss_cdf, default_clsss_cdf,
- < sizeof(cdfs->mv_cdf.clsss_cdf));
- < memcpy(cdfs->mv_cdf.clsss0_fp_cdf, default_clsss0_fp_cdf,
- < sizeof(cdfs->mv_cdf.clsss0_fp_cdf));
- < memcpy(cdfs->mv_cdf.fp_cdf, default_fp_cdf,
- < sizeof(cdfs->mv_cdf.fp_cdf));
- < memcpy(cdfs->mv_cdf.class0_hp_cdf, default_class0_hp_cdf,
- < sizeof(cdfs->mv_cdf.class0_hp_cdf));
- < memcpy(cdfs->mv_cdf.hp_cdf, default_hp_cdf,
- < sizeof(cdfs->mv_cdf.hp_cdf));
- < memcpy(cdfs->mv_cdf.class0_cdf, default_class0_cdf,
- < sizeof(cdfs->mv_cdf.class0_cdf));
- < memcpy(cdfs->mv_cdf.bits_cdf, default_bits_cdf,
- < sizeof(cdfs->mv_cdf.bits_cdf));
- <
- < // Intrabc cdfs
- < memcpy(cdfs_ndvc->joint_cdf, default_joint_cdf,
- < sizeof(cdfs_ndvc->joint_cdf));
- < memcpy(cdfs_ndvc->sign_cdf, default_sign_cdf,
- < sizeof(cdfs_ndvc->sign_cdf));
- < memcpy(cdfs_ndvc->clsss_cdf, default_clsss_cdf,
- < sizeof(cdfs_ndvc->clsss_cdf));
- < memcpy(cdfs_ndvc->clsss0_fp_cdf, default_clsss0_fp_cdf,
- < sizeof(cdfs_ndvc->clsss0_fp_cdf));
- < memcpy(cdfs_ndvc->fp_cdf, default_fp_cdf, sizeof(cdfs_ndvc->fp_cdf));
- < memcpy(cdfs_ndvc->class0_hp_cdf, default_class0_hp_cdf,
- < sizeof(cdfs_ndvc->class0_hp_cdf));
- < memcpy(cdfs_ndvc->hp_cdf, default_hp_cdf, sizeof(cdfs_ndvc->hp_cdf));
- < memcpy(cdfs_ndvc->class0_cdf, default_class0_cdf,
- < sizeof(cdfs_ndvc->class0_cdf));
- < memcpy(cdfs_ndvc->bits_cdf, default_bits_cdf,
- < sizeof(cdfs_ndvc->bits_cdf));
- ---
- > for (int i = 0; i < 2; i++) {
- > /* im kinda gonna assume one is regular the other is intrabc */
- > memcpy(cdfs->joint_cdf[i], default_joint_cdf,
- > sizeof(cdfs->joint_cdf[0]));
- > memcpy(cdfs->clsss_cdf[i], default_clsss_cdf,
- > sizeof(cdfs->clsss_cdf[0]));
- > memcpy(cdfs->clsss0_fp_cdf[i], default_clsss0_fp_cdf,
- > sizeof(cdfs->clsss0_fp_cdf[0]));
- > memcpy(cdfs->fp_cdf[i], default_fp_cdf,
- > sizeof(cdfs->fp_cdf[0]));
- >
- > memcpy(cdfs->sign_cdf[i], default_sign_cdf,
- > sizeof(cdfs->sign_cdf[0]));
- > memcpy(cdfs->class0_hp_cdf[i], default_class0_hp_cdf,
- > sizeof(cdfs->class0_hp_cdf[0]));
- > memcpy(cdfs->hp_cdf[i], default_hp_cdf,
- > sizeof(cdfs->hp_cdf[0]));
- > memcpy(cdfs->class0_cdf[i], default_class0_cdf,
- > sizeof(cdfs->class0_cdf[0]));
- > memcpy(cdfs->bits_cdf[i], default_bits_cdf,
- > sizeof(cdfs->bits_cdf[0]));
- > }
- 4368a4141
- >
- 4375,4380c4148,4171
- < memcpy(cdfs->palette_y_color_index_cdf,
- < default_palette_y_color_index_cdf,
- < sizeof(cdfs->palette_y_color_index_cdf));
- < memcpy(cdfs->palette_uv_color_index_cdf,
- < default_palette_uv_color_index_cdf,
- < sizeof(cdfs->palette_uv_color_index_cdf));
- ---
- >
- > #define COPY_PALLETE(s, p) \
- > memcpy(cdfs->palette_size_##s##_##p##_color_cdf, \
- > default_palette_size_##s##_##p##_color_cdf, \
- > sizeof(cdfs->palette_size_##s##_##p##_color_cdf));
- >
- > COPY_PALLETE(2, y);
- > COPY_PALLETE(3, y);
- > COPY_PALLETE(4, y);
- > COPY_PALLETE(5, y);
- > COPY_PALLETE(6, y);
- > COPY_PALLETE(7, y);
- > COPY_PALLETE(8, y);
- >
- > COPY_PALLETE(2, uv);
- > COPY_PALLETE(3, uv);
- > COPY_PALLETE(4, uv);
- > COPY_PALLETE(5, uv);
- > COPY_PALLETE(6, uv);
- > COPY_PALLETE(7, uv);
- > COPY_PALLETE(8, uv);
- >
- > #undef COPY_PALLETE
- >
- 4401,4424c4192,4216
- < void rockchip_av1_get_cdfs(struct hantro_ctx *ctx, u32 ref_idx)
- < {
- < struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
- <
- < av1_dec->cdfs = &av1_dec->cdfs_last[ref_idx];
- < av1_dec->cdfs_ndvc = &av1_dec->cdfs_last_ndvc[ref_idx];
- < }
- <
- < void rockchip_av1_store_cdfs(struct hantro_ctx *ctx,
- < u32 refresh_frame_flags)
- < {
- < struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
- < int i;
- <
- < for (i = 0; i < NUM_REF_FRAMES; i++) {
- < if (refresh_frame_flags & (1 << i)) {
- < if (&av1_dec->cdfs_last[i] != av1_dec->cdfs) {
- < av1_dec->cdfs_last[i] = *av1_dec->cdfs;
- < av1_dec->cdfs_last_ndvc[i] =
- < *av1_dec->cdfs_ndvc;
- < }
- < }
- < }
- < }
- ---
- > /* TODO */
- > /* void rockchip_av1_get_cdfs(struct hantro_ctx *ctx, u32 ref_idx) */
- > /* { */
- > /* struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec; */
- >
- > /* av1_dec->cdfs = &av1_dec->cdfs_last[ref_idx]; */
- > /* av1_dec->cdfs_ndvc = &av1_dec->cdfs_last_ndvc[ref_idx]; */
- > /* } */
- >
- > /* void rockchip_av1_store_cdfs(struct hantro_ctx *ctx, */
- > /* u32 refresh_frame_flags) */
- > /* { */
- > /* struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec; */
- > /* int i; */
- >
- > /* for (i = 0; i < NUM_REF_FRAMES; i++) { */
- > /* if (refresh_frame_flags & (1 << i)) { */
- > /* if (&av1_dec->cdfs_last[i] != av1_dec->cdfs) { */
- > /* av1_dec->cdfs_last[i] = *av1_dec->cdfs; */
- > /* av1_dec->cdfs_last_ndvc[i] = */
- > /* *av1_dec->cdfs_ndvc; */
- > /* } */
- > /* } */
- > /* } */
- > /* } */
Advertisement
Add Comment
Please, Sign In to add comment