From f4901fa43864df6a734ae4a2009869ace772a5d1 Mon Sep 17 00:00:00 2001 From: Rohit Consul Date: Fri, 31 Jul 2015 13:47:44 -0700 Subject: [PATCH] v_vscaler: Added multiple pixel per clock support - IP updated to add multiple pixel/clk support. - Added default filter coefficient table for 6/8/10/12 taps - Added API to load default coefficients or allow user to load externally defined coefficients - Peformed code cleanup to remove coefficient generation logic (scaler to use fixed coefficients) Signed-off-by: Rohit Consul Reviewed-by: Andrei Simion --- .../drivers/v_vscaler/data/v_vscaler.mdd | 34 +- .../drivers/v_vscaler/src/xv_vscaler_coeff.c | 328 ++++++++++++++++++ .../drivers/v_vscaler/src/xv_vscaler_l2.c | 267 +++++--------- .../drivers/v_vscaler/src/xv_vscaler_l2.h | 49 +-- 4 files changed, 460 insertions(+), 218 deletions(-) create mode 100644 XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_coeff.c diff --git a/XilinxProcessorIPLib/drivers/v_vscaler/data/v_vscaler.mdd b/XilinxProcessorIPLib/drivers/v_vscaler/data/v_vscaler.mdd index 593326cf..7caf1545 100755 --- a/XilinxProcessorIPLib/drivers/v_vscaler/data/v_vscaler.mdd +++ b/XilinxProcessorIPLib/drivers/v_vscaler/data/v_vscaler.mdd @@ -1,9 +1,33 @@ -# ============================================================== -# File generated by Vivado(TM) HLS - High-Level Synthesis from C, C++ and SystemC -# Version: 2015.1 -# Copyright (C) 2015 Xilinx Inc. All rights reserved. +############################################################################## # -# ============================================================== +# Copyright (C) 2015 Xilinx, Inc. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"),to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# Use of the Software is limited solely to applications: +# (a) running on a Xilinx device, or +# (b) that interact with a Xilinx device through a bus or interconnect. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# XILINX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# Except as contained in this notice, the name of the Xilinx shall not be used +# in advertising or otherwise to promote the sale, use or other dealings in +# this Software without prior written authorization from Xilinx. +############################################################################### OPTION psf_version = 2.1; diff --git a/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_coeff.c b/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_coeff.c new file mode 100644 index 00000000..0bdc6ed7 --- /dev/null +++ b/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_coeff.c @@ -0,0 +1,328 @@ +/****************************************************************************** + * + * Copyright (C) 2015 Xilinx, Inc. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * Use of the Software is limited solely to applications: + * (a) running on a Xilinx device, or + * (b) that interact with a Xilinx device through a bus or interconnect. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * XILINX CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Except as contained in this notice, the name of the Xilinx shall not be used + * in advertising or otherwise to promote the sale, use or other dealings in + * this Software without prior written authorization from Xilinx. + * +******************************************************************************/ +/*****************************************************************************/ +/** +* +* @file xv_vscaler_coeff.c +* @addtogroup v_vscaler_v1_0 +* @{ +* @details +* +* This file provides the default fixed coefficient sets for supported taps +* +* 
+* MODIFICATION HISTORY:
+*
+* Ver   Who    Date     Changes
+* ----- ---- -------- -------------------------------------------------------
+* 1.00  rco   07/31/15   Initial Release
+
+*
+* +******************************************************************************/ +#include "xv_vscaler_l2.h" + +// Fixed 64 phase, 6 tap filter +const short XV_vscaler_fixedcoeff_taps6[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_6] = +{ + { -132, 236, 3824, 236, -132, 64, }, + { -116, 184, 3816, 292, -144, 64, }, + { -100, 132, 3812, 348, -160, 64, }, + { -88, 84, 3808, 404, -176, 64, }, + { -72, 36, 3796, 464, -192, 64, }, + { -60, -8, 3780, 524, -208, 68, }, + { -48, -52, 3768, 588, -228, 68, }, + { -32, -96, 3748, 652, -244, 68, }, + { -20, -136, 3724, 716, -260, 72, }, + { -8, -172, 3696, 784, -276, 72, }, + { 0, -208, 3676, 848, -292, 72, }, + { 12, -244, 3640, 920, -308, 76, }, + { 20, -276, 3612, 988, -324, 76, }, + { 32, -304, 3568, 1060, -340, 80, }, + { 40, -332, 3532, 1132, -356, 80, }, + { 48, -360, 3492, 1204, -372, 84, }, + { 56, -384, 3448, 1276, -388, 88, }, + { 64, -408, 3404, 1352, -404, 88, }, + { 72, -428, 3348, 1428, -416, 92, }, + { 76, -448, 3308, 1500, -432, 92, }, + { 84, -464, 3248, 1576, -444, 96, }, + { 88, -480, 3200, 1652, -460, 96, }, + { 92, -492, 3140, 1728, -472, 100, }, + { 96, -504, 3080, 1804, -484, 104, }, + { 100, -516, 3020, 1880, -492, 104, }, + { 104, -524, 2956, 1960, -504, 104, }, + { 104, -532, 2892, 2036, -512, 108, }, + { 108, -540, 2832, 2108, -520, 108, }, + { 108, -544, 2764, 2184, -528, 112, }, + { 112, -544, 2688, 2260, -532, 112, }, + { 112, -548, 2624, 2336, -540, 112, }, + { 112, -548, 2556, 2408, -544, 112, }, + { 112, -544, 2480, 2480, -544, 112, }, + { 112, -544, 2408, 2556, -548, 112, }, + { 112, -540, 2336, 2624, -548, 112, }, + { 112, -532, 2260, 2688, -544, 112, }, + { 112, -528, 2184, 2764, -544, 108, }, + { 108, -520, 2108, 2832, -540, 108, }, + { 108, -512, 2036, 2892, -532, 104, }, + { 104, -504, 1960, 2956, -524, 104, }, + { 104, -492, 1880, 3020, -516, 100, }, + { 104, -484, 1804, 3080, -504, 96, }, + { 100, -472, 1728, 3140, -492, 92, }, + { 96, -460, 1652, 3200, -480, 88, }, + { 96, -444, 1576, 3248, -464, 84, }, + { 92, -432, 1500, 3308, -448, 76, }, + { 92, -416, 1428, 3348, -428, 72, }, + { 88, -404, 1352, 3404, -408, 64, }, + { 88, -388, 1276, 3448, -384, 56, }, + { 84, -372, 1204, 3492, -360, 48, }, + { 80, -356, 1132, 3532, -332, 40, }, + { 80, -340, 1060, 3568, -304, 32, }, + { 76, -324, 988, 3612, -276, 20, }, + { 76, -308, 920, 3640, -244, 12, }, + { 72, -292, 848, 3676, -208, 0, }, + { 72, -276, 784, 3696, -172, -8, }, + { 72, -260, 716, 3724, -136, -20, }, + { 68, -244, 652, 3748, -96, -32, }, + { 68, -228, 588, 3768, -52, -48, }, + { 68, -208, 524, 3780, -8, -60, }, + { 64, -192, 464, 3796, 36, -72, }, + { 64, -176, 404, 3808, 84, -88, }, + { 64, -160, 348, 3812, 132, -100, }, + { 64, -144, 292, 3816, 184, -116, } +}; + +// Fixed 64 phase, 8 tap filter +const short XV_vscaler_fixedcoeff_taps8[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_8] = +{ + {-5, 309, 1023, 1445, 1034, 317, -3, -24, }, + {-6, 300, 1011, 1445, 1045, 326, -1, -24, }, + {-7, 291, 1000, 1444, 1056, 336, 0, -24, }, + {-9, 282, 988, 1444, 1067, 345, 2, -24, }, + {-10, 274, 977, 1443, 1078, 354, 4, -24, }, + {-11, 266, 965, 1441, 1089, 364, 6, -24, }, + {-12, 258, 953, 1440, 1100, 373, 8, -24, }, + {-13, 250, 942, 1438, 1110, 383, 10, -24, }, + {-14, 242, 930, 1437, 1121, 393, 12, -24, }, + {-15, 234, 918, 1434, 1131, 403, 14, -24, }, + {-16, 226, 906, 1432, 1142, 413, 17, -24, }, + {-17, 219, 894, 1430, 1152, 423, 19, -24, }, + {-17, 211, 882, 1427, 1162, 433, 22, -24, }, + {-18, 204, 870, 1424, 1172, 443, 24, -24, }, + {-19, 197, 858, 1420, 1182, 454, 27, -24, }, + {-19, 190, 846, 1417, 1191, 464, 30, -24, }, + {-20, 183, 834, 1413, 1201, 475, 33, -24, }, + {-20, 176, 822, 1409, 1210, 486, 36, -24, }, + {-21, 170, 810, 1405, 1220, 497, 39, -24, }, + {-21, 163, 798, 1401, 1229, 507, 42, -24, }, + {-22, 157, 786, 1396, 1238, 518, 46, -24, }, + {-22, 151, 774, 1392, 1247, 529, 49, -24, }, + {-22, 144, 762, 1387, 1255, 540, 53, -24, }, + {-23, 139, 750, 1382, 1264, 552, 57, -24, }, + {-23, 133, 738, 1376, 1272, 563, 60, -24, }, + {-23, 127, 726, 1371, 1280, 574, 64, -24, }, + {-23, 121, 714, 1365, 1288, 586, 69, -24, }, + {-23, 116, 703, 1359, 1296, 597, 73, -24, }, + {-24, 111, 691, 1353, 1304, 609, 77, -24, }, + {-24, 105, 679, 1346, 1312, 620, 81, -24, }, + {-24, 100, 667, 1340, 1319, 632, 86, -24, }, + {-24, 96, 655, 1333, 1326, 644, 91, -24, }, + {-24, 91, 644, 1326, 1333, 655, 96, -24, }, + {-24, 86, 632, 1319, 1340, 667, 100, -24, }, + {-24, 81, 620, 1312, 1346, 679, 105, -24, }, + {-24, 77, 609, 1304, 1353, 691, 111, -24, }, + {-24, 73, 597, 1296, 1359, 703, 116, -23, }, + {-24, 69, 586, 1288, 1365, 714, 121, -23, }, + {-24, 64, 574, 1280, 1371, 726, 127, -23, }, + {-24, 60, 563, 1272, 1376, 738, 133, -23, }, + {-24, 57, 552, 1264, 1382, 750, 139, -23, }, + {-24, 53, 540, 1255, 1387, 762, 144, -22, }, + {-24, 49, 529, 1247, 1392, 774, 151, -22, }, + {-24, 46, 518, 1238, 1396, 786, 157, -22, }, + {-24, 42, 507, 1229, 1401, 798, 163, -21, }, + {-24, 39, 497, 1220, 1405, 810, 170, -21, }, + {-24, 36, 486, 1210, 1409, 822, 176, -20, }, + {-24, 33, 475, 1201, 1413, 834, 183, -20, }, + {-24, 30, 464, 1191, 1417, 846, 190, -19, }, + {-24, 27, 454, 1182, 1420, 858, 197, -19, }, + {-24, 24, 443, 1172, 1424, 870, 204, -18, }, + {-24, 22, 433, 1162, 1427, 882, 211, -17, }, + {-24, 19, 423, 1152, 1430, 894, 219, -17, }, + {-24, 17, 413, 1142, 1432, 906, 226, -16, }, + {-24, 14, 403, 1131, 1434, 918, 234, -15, }, + {-24, 12, 393, 1121, 1437, 930, 242, -14, }, + {-24, 10, 383, 1110, 1438, 942, 250, -13, }, + {-24, 8, 373, 1100, 1440, 953, 258, -12, }, + {-24, 6, 364, 1089, 1441, 965, 266, -11, }, + {-24, 4, 354, 1078, 1443, 977, 274, -10, }, + {-24, 2, 345, 1067, 1444, 988, 282, -9, }, + {-24, 0, 336, 1056, 1444, 1000, 291, -7, }, + {-24, -1, 326, 1045, 1445, 1011, 300, -6, }, + {-24, -3, 317, 1034, 1445, 1023, 309, -5, }, +}; + +// Fixed 64 phase, 10 tap filter +const short XV_vscaler_fixedcoeff_taps10[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_10] = +{ + {59, 224, 507, 790, 911, 793, 512, 227, 61, 13, }, + {58, 220, 502, 786, 911, 797, 516, 231, 62, 13, }, + {56, 216, 497, 783, 911, 800, 521, 235, 64, 13, }, + {55, 213, 492, 779, 910, 804, 526, 238, 65, 13, }, + {54, 209, 487, 775, 910, 807, 531, 242, 67, 14, }, + {52, 206, 482, 772, 910, 810, 536, 246, 69, 14, }, + {51, 202, 477, 768, 909, 813, 541, 250, 70, 14, }, + {50, 199, 473, 764, 909, 817, 545, 254, 72, 14, }, + {48, 195, 468, 760, 908, 820, 550, 258, 74, 15, }, + {47, 192, 463, 756, 908, 823, 555, 262, 76, 15, }, + {46, 188, 458, 752, 907, 826, 560, 266, 78, 15, }, + {45, 185, 453, 748, 906, 829, 565, 270, 79, 16, }, + {44, 182, 448, 744, 906, 832, 569, 274, 81, 16, }, + {42, 179, 444, 740, 905, 835, 574, 278, 83, 16, }, + {41, 175, 439, 736, 904, 837, 579, 282, 85, 17, }, + {40, 172, 434, 732, 903, 840, 584, 286, 87, 17, }, + {39, 169, 429, 728, 902, 843, 589, 290, 89, 18, }, + {38, 166, 425, 724, 901, 846, 593, 294, 91, 18, }, + {37, 163, 420, 720, 900, 848, 598, 298, 93, 18, }, + {36, 160, 415, 716, 899, 851, 603, 302, 95, 19, }, + {35, 157, 410, 711, 897, 854, 608, 307, 98, 19, }, + {34, 154, 406, 707, 896, 856, 612, 311, 100, 20, }, + {33, 151, 401, 703, 895, 859, 617, 315, 102, 20, }, + {33, 148, 396, 698, 893, 861, 622, 320, 104, 21, }, + {32, 145, 392, 694, 892, 863, 626, 324, 107, 21, }, + {31, 142, 387, 690, 890, 866, 631, 328, 109, 22, }, + {30, 140, 382, 685, 889, 868, 636, 333, 111, 23, }, + {29, 137, 378, 681, 887, 870, 640, 337, 114, 23, }, + {28, 134, 373, 677, 886, 872, 645, 342, 116, 24, }, + {28, 131, 369, 672, 884, 874, 649, 346, 119, 24, }, + {27, 129, 364, 668, 882, 876, 654, 350, 121, 25, }, + {26, 126, 359, 663, 880, 878, 659, 355, 124, 26, }, + {26, 124, 355, 659, 878, 880, 663, 359, 126, 26, }, + {25, 121, 350, 654, 876, 882, 668, 364, 129, 27, }, + {24, 119, 346, 649, 874, 884, 672, 369, 131, 28, }, + {24, 116, 342, 645, 872, 886, 677, 373, 134, 28, }, + {23, 114, 337, 640, 870, 887, 681, 378, 137, 29, }, + {23, 111, 333, 636, 868, 889, 685, 382, 140, 30, }, + {22, 109, 328, 631, 866, 890, 690, 387, 142, 31, }, + {21, 107, 324, 626, 863, 892, 694, 392, 145, 32, }, + {21, 104, 320, 622, 861, 893, 698, 396, 148, 33, }, + {20, 102, 315, 617, 859, 895, 703, 401, 151, 33, }, + {20, 100, 311, 612, 856, 896, 707, 406, 154, 34, }, + {19, 98, 307, 608, 854, 897, 711, 410, 157, 35, }, + {19, 95, 302, 603, 851, 899, 716, 415, 160, 36, }, + {18, 93, 298, 598, 848, 900, 720, 420, 163, 37, }, + {18, 91, 294, 593, 846, 901, 724, 425, 166, 38, }, + {18, 89, 290, 589, 843, 902, 728, 429, 169, 39, }, + {17, 87, 286, 584, 840, 903, 732, 434, 172, 40, }, + {17, 85, 282, 579, 837, 904, 736, 439, 175, 41, }, + {16, 83, 278, 574, 835, 905, 740, 444, 179, 42, }, + {16, 81, 274, 569, 832, 906, 744, 448, 182, 44, }, + {16, 79, 270, 565, 829, 906, 748, 453, 185, 45, }, + {15, 78, 266, 560, 826, 907, 752, 458, 188, 46, }, + {15, 76, 262, 555, 823, 908, 756, 463, 192, 47, }, + {15, 74, 258, 550, 820, 908, 760, 468, 195, 48, }, + {14, 72, 254, 545, 817, 909, 764, 473, 199, 50, }, + {14, 70, 250, 541, 813, 909, 768, 477, 202, 51, }, + {14, 69, 246, 536, 810, 910, 772, 482, 206, 52, }, + {14, 67, 242, 531, 807, 910, 775, 487, 209, 54, }, + {13, 65, 238, 526, 804, 910, 779, 492, 213, 55, }, + {13, 64, 235, 521, 800, 911, 783, 497, 216, 56, }, + {13, 62, 231, 516, 797, 911, 786, 502, 220, 58, }, + {13, 61, 227, 512, 793, 911, 790, 507, 224, 59, }, +}; + +// Fixed 64 phase, 12 tap filter +const short XV_vscaler_fixedcoeff_taps12[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_12] = +{ + {48, 143, 307, 504, 667, 730, 669, 507, 310, 145, 49, 18, }, + {47, 141, 304, 501, 665, 730, 670, 510, 313, 147, 50, 18, }, + {46, 138, 301, 498, 663, 730, 672, 513, 316, 149, 51, 18, }, + {45, 136, 298, 495, 661, 730, 674, 516, 319, 151, 52, 18, }, + {44, 134, 295, 492, 659, 730, 676, 519, 322, 153, 53, 18, }, + {44, 132, 292, 489, 657, 730, 677, 522, 325, 155, 54, 18, }, + {43, 130, 289, 486, 655, 729, 679, 525, 328, 157, 55, 19, }, + {42, 129, 287, 483, 653, 729, 681, 528, 331, 160, 56, 19, }, + {41, 127, 284, 480, 651, 729, 683, 531, 334, 162, 57, 19, }, + {40, 125, 281, 477, 648, 729, 684, 534, 337, 164, 58, 19, }, + {40, 123, 278, 474, 646, 728, 686, 537, 340, 166, 59, 20, }, + {39, 121, 275, 471, 644, 728, 687, 539, 343, 169, 60, 20, }, + {38, 119, 272, 468, 642, 727, 689, 542, 346, 171, 61, 20, }, + {37, 117, 269, 465, 640, 727, 690, 545, 349, 173, 62, 20, }, + {37, 115, 266, 461, 638, 727, 692, 548, 353, 175, 63, 21, }, + {36, 114, 264, 458, 635, 726, 693, 551, 356, 178, 65, 21, }, + {35, 112, 261, 455, 633, 726, 695, 554, 359, 180, 66, 21, }, + {35, 110, 258, 452, 631, 725, 696, 556, 362, 183, 67, 21, }, + {34, 108, 255, 449, 628, 724, 698, 559, 365, 185, 68, 22, }, + {33, 107, 252, 446, 626, 724, 699, 562, 368, 187, 69, 22, }, + {33, 105, 250, 443, 624, 723, 700, 565, 371, 190, 71, 22, }, + {32, 103, 247, 440, 621, 723, 702, 567, 374, 192, 72, 23, }, + {32, 101, 244, 437, 619, 722, 703, 570, 377, 195, 73, 23, }, + {31, 100, 241, 433, 617, 721, 704, 573, 380, 197, 75, 23, }, + {31, 98, 239, 430, 614, 720, 705, 576, 383, 200, 76, 24, }, + {30, 97, 236, 427, 612, 720, 707, 578, 387, 202, 77, 24, }, + {29, 95, 233, 424, 609, 719, 708, 581, 390, 205, 79, 24, }, + {29, 93, 231, 421, 607, 718, 709, 584, 393, 207, 80, 25, }, + {28, 92, 228, 418, 604, 717, 710, 586, 396, 210, 81, 25, }, + {28, 90, 225, 415, 602, 716, 711, 589, 399, 212, 83, 26, }, + {27, 89, 223, 412, 599, 715, 712, 591, 402, 215, 84, 26, }, + {27, 87, 220, 408, 597, 714, 713, 594, 405, 217, 86, 27, }, + {27, 86, 217, 405, 594, 713, 714, 597, 408, 220, 87, 27, }, + {26, 84, 215, 402, 591, 712, 715, 599, 412, 223, 89, 27, }, + {26, 83, 212, 399, 589, 711, 716, 602, 415, 225, 90, 28, }, + {25, 81, 210, 396, 586, 710, 717, 604, 418, 228, 92, 28, }, + {25, 80, 207, 393, 584, 709, 718, 607, 421, 231, 93, 29, }, + {24, 79, 205, 390, 581, 708, 719, 609, 424, 233, 95, 29, }, + {24, 77, 202, 387, 578, 707, 720, 612, 427, 236, 97, 30, }, + {24, 76, 200, 383, 576, 705, 720, 614, 430, 239, 98, 31, }, + {23, 75, 197, 380, 573, 704, 721, 617, 433, 241, 100, 31, }, + {23, 73, 195, 377, 570, 703, 722, 619, 437, 244, 101, 32, }, + {23, 72, 192, 374, 567, 702, 723, 621, 440, 247, 103, 32, }, + {22, 71, 190, 371, 565, 700, 723, 624, 443, 250, 105, 33, }, + {22, 69, 187, 368, 562, 699, 724, 626, 446, 252, 107, 33, }, + {22, 68, 185, 365, 559, 698, 724, 628, 449, 255, 108, 34, }, + {21, 67, 183, 362, 556, 696, 725, 631, 452, 258, 110, 35, }, + {21, 66, 180, 359, 554, 695, 726, 633, 455, 261, 112, 35, }, + {21, 65, 178, 356, 551, 693, 726, 635, 458, 264, 114, 36, }, + {21, 63, 175, 353, 548, 692, 727, 638, 461, 266, 115, 37, }, + {20, 62, 173, 349, 545, 690, 727, 640, 465, 269, 117, 37, }, + {20, 61, 171, 346, 542, 689, 727, 642, 468, 272, 119, 38, }, + {20, 60, 169, 343, 539, 687, 728, 644, 471, 275, 121, 39, }, + {20, 59, 166, 340, 537, 686, 728, 646, 474, 278, 123, 40, }, + {19, 58, 164, 337, 534, 684, 729, 648, 477, 281, 125, 40, }, + {19, 57, 162, 334, 531, 683, 729, 651, 480, 284, 127, 41, }, + {19, 56, 160, 331, 528, 681, 729, 653, 483, 287, 129, 42, }, + {19, 55, 157, 328, 525, 679, 729, 655, 486, 289, 130, 43, }, + {18, 54, 155, 325, 522, 677, 730, 657, 489, 292, 132, 44, }, + {18, 53, 153, 322, 519, 676, 730, 659, 492, 295, 134, 44, }, + {18, 52, 151, 319, 516, 674, 730, 661, 495, 298, 136, 45, }, + {18, 51, 149, 316, 513, 672, 730, 663, 498, 301, 138, 46, }, + {18, 50, 147, 313, 510, 670, 730, 665, 501, 304, 141, 47, }, + {18, 49, 145, 310, 507, 669, 730, 667, 504, 307, 143, 48, }, +}; diff --git a/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.c b/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.c index a4a21fae..ae3446e7 100644 --- a/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.c +++ b/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.c @@ -54,34 +54,24 @@ ******************************************************************************/ /***************************** Include Files *********************************/ -#include #include "xv_vscaler_l2.h" /************************** Constant Definitions *****************************/ -#define PI (3.14159265358979) #define STEP_PRECISION (65536) // 2^16 -#define COEFF_PRECISION (4096) // 2^12 -#define COEFF_QUANT (4096) /* Mask definitions for Low and high 16 bits in a 32 bit number */ -#define XMASK_LOW_16BITS (0x0000FFFF) -#define XMASK_HIGH_16BITS (0xFFFF0000) +#define XVSC_MASK_LOW_16BITS (0x0000FFFF) +#define XVSC_MASK_HIGH_16BITS (0xFFFF0000) /**************************** Type Definitions *******************************/ /**************************** Local Global *******************************/ -static float SincCoeffs[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_MAX_V_TAPS]; -static float TempCoeffs[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_MAX_V_TAPS]; -static float WinCoeffs[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_MAX_V_TAPS]; -static float NormCoeffs[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_MAX_V_TAPS]; +const short XV_vscaler_fixedcoeff_taps6[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_6]; +const short XV_vscaler_fixedcoeff_taps8[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_8]; +const short XV_vscaler_fixedcoeff_taps10[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_10]; +const short XV_vscaler_fixedcoeff_taps12[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_TAPS_12]; /************************** Function Prototypes ******************************/ -static float hamming( int x, int taps); -static float sinc(float x); -static void XV_VScalerGetCoeff(XV_vscaler *pVsc, - XV_vscaler_l2 *pVscL2Data, - u32 HeightIn, - u32 HeightOut); static void XV_VScalerSetCoeff(XV_vscaler *pVsc, XV_vscaler_l2 *pVscL2Data); @@ -120,35 +110,58 @@ void XV_VScalerStop(XV_vscaler *InstancePtr) /*****************************************************************************/ /** -* This function applies the hamming filter on specified pixel position +* This function loads default filter coefficients in the scaler coefficient +* storage based on the selected TAP configuration * -* @param x is the pixel coordinate in horizontal direction -* @param taps is the number of taps available to the scaler +* @param InstancePtr is a pointer to the core instance to be worked on. +* @param pVscL2Data is a pointer to the core instance layer 2 data. * -* @return hamming filter result +* @return None * ******************************************************************************/ -static float hamming( int x, int taps) +void XV_VScalerLoadDefaultCoeff(XV_vscaler *InstancePtr, + XV_vscaler_l2 *pVscL2Data) { - //0.54 + 0.46 * cos(pi * x / filter_size); 0.54 - 0.46 * cos(2*pi * x / filter_size) - return (float) (0.54 + (0.46*cos((PI*x)/(taps+1)))); -} + const short *coeff; + u16 numTaps, numPhases; -/*****************************************************************************/ -/** -* This function applies the SIN function to specified pixel position -* -* @param x is the pixel coordinate in horizontal direction -* -* @return Sine function result -* -******************************************************************************/ -static float sinc(float x) -{ - if (x==0) - return 1; + /* + * validates input arguments + */ + Xil_AssertVoid(InstancePtr != NULL); + Xil_AssertVoid(pVscL2Data != NULL); - return (float) sin(x*PI)/(float)(x*PI); + numTaps = InstancePtr->Config.NumTaps; + numPhases = (1<Config.PhaseShift); + + switch(numTaps) + { + case XV_VSCALER_TAPS_6: + coeff = &XV_vscaler_fixedcoeff_taps6[0][0]; + break; + + case XV_VSCALER_TAPS_8: + coeff = &XV_vscaler_fixedcoeff_taps8[0][0]; + break; + + case XV_VSCALER_TAPS_10: + coeff = &XV_vscaler_fixedcoeff_taps10[0][0]; + break; + + case XV_VSCALER_TAPS_12: + coeff = &XV_vscaler_fixedcoeff_taps12[0][0]; + break; + + default: + xil_printf("ERR: V-Scaler %d Taps Not Supported",numTaps); + return; + } + + XV_VScalerLoadUsrCoeff(InstancePtr, + pVscL2Data, + numPhases, + numTaps, + coeff); } /*****************************************************************************/ @@ -158,23 +171,42 @@ static float sinc(float x) * * @param InstancePtr is a pointer to the core instance to be worked on. * @param pVscL2Data is a pointer to the core instance layer 2 data. -* @param VCoeff is the user defined filter coefficients +* @param num_phases is the number of phases in coefficient table +* @param num_taps is the number of taps in coefficient table +* @param Coeff is a pointer to user defined filter coefficients table +* +* @return None +* ******************************************************************************/ -void XV_VscalerLoadUsrCoeffients(XV_vscaler *InstancePtr, - XV_vscaler_l2 *pVscL2Data, - u16 num_phases, - u16 num_taps, - const short *Coeff) +void XV_VScalerLoadUsrCoeff(XV_vscaler *InstancePtr, + XV_vscaler_l2 *pVscL2Data, + u16 num_phases, + u16 num_taps, + const short *Coeff) { int i,j, pad, offset; /* - * Assert validates the input arguments + * validate input arguments */ Xil_AssertVoid(InstancePtr != NULL); Xil_AssertVoid(pVscL2Data != NULL); Xil_AssertVoid(num_taps <= InstancePtr->Config.NumTaps); - Xil_AssertVoid(num_phases <= (1<Config.PhaseShift)); + Xil_AssertVoid(num_phases == (1<Config.PhaseShift)); + Xil_AssertVoid(Coeff != NULL); + + switch(num_taps) + { + case XV_VSCALER_TAPS_6: + case XV_VSCALER_TAPS_8: + case XV_VSCALER_TAPS_10: + case XV_VSCALER_TAPS_12: + break; + + default: + xil_printf("\r\nERR: V Scaler %d TAPS not supported. (Select from 8/10/12/16)\r\n"); + return; + } //determine if coefficient needs padding (effective vs. max taps) pad = XV_VSCALER_MAX_V_TAPS - InstancePtr->Config.NumTaps; @@ -210,126 +242,6 @@ void XV_VscalerLoadUsrCoeffients(XV_vscaler *InstancePtr, pVscL2Data->UseExtCoeff = TRUE; } -/*****************************************************************************/ -/** -* This function computes the filter coefficients based on scaling ratio and -* stores them into the layer 2 data storage -* -* @param InstancePtr is a pointer to the core instance to be worked on. -* @param pVscL2Data is a pointer to the core instance layer 2 data. -* @param HeightIn is the input frame height -* @param HeightOut is the scaled frame height -* -* @return None -* -******************************************************************************/ -static void XV_VScalerGetCoeff(XV_vscaler *pVsc, - XV_vscaler_l2 *pVscL2Data, - u32 HeightIn, - u32 HeightOut) -{ - int num_phases = (1<Config.PhaseShift); - int num_taps = pVsc->Config.NumTaps; - int center_tap = num_taps/2; - int i,j, pad, offset; - float x, fc; - float sum[XV_VSCALER_MAX_V_PHASES]; - float cos_win[XV_VSCALER_MAX_V_TAPS]; - - if(HeightIn < HeightOut) - { - fc = (float)HeightIn/(float)HeightOut; - } - else - { - fc = (float)HeightOut/(float)HeightIn; - } - - //determine if coefficient needs padding (effective vs. max taps) - pad = XV_VSCALER_MAX_V_TAPS - num_taps; - offset = ((pad) ? (pad>>1) : 0); - - for(i=0; iFilterSel) - { - case XV_VFILT_LANCZOS: - //Window is a sinc function instead of cosine function - // if using lanczos2 or lanczos3 kernel - // lanczos(x) = sinc(x) * sinc(x / filter_size); - - for (i = 0; i < num_phases; i++) - { - for (j = 0; j < num_taps; j++) - { - x = TempCoeffs[i][j]; - WinCoeffs[i][j] = SincCoeffs[i][j] * sinc((fc*x)/num_taps); - } - } - break; - - case XV_VFILT_WINDOWED_SINC: - for (j = 1; j <= num_taps; j++) - { - cos_win[j-1] = hamming(j, num_taps); - } - - for (i = 0; i < num_phases; i++) - { - for (j = 0; j < num_taps; j++) - { - WinCoeffs[i][j] = SincCoeffs[i][j] * cos_win[j]; - } - } - break; - } - - // normalize to unity and quantize - for (i = 0; i < num_phases; i++) - { - sum[i] = 0; - for (j = 0; j < num_taps; j++) - { - sum[i] += WinCoeffs[i][j]; - } - } - - for (i = 0; i < num_phases; i++) - { - for (j = 0; j < num_taps; j++) - { - NormCoeffs[i][j] = WinCoeffs[i][j]/sum[i]; - pVscL2Data->coeff[i][j+offset] = (short) ((NormCoeffs[i][j] * COEFF_QUANT) + 0.5); - } - } - - if(pad) //effective taps < max_taps - { - for (i = 0; i < num_phases; i++) - { - //pad left - for (j = 0; j < offset; j++) - { - pVscL2Data->coeff[i][j] = 0; - } - //pad right - for (j = (num_taps+offset); j < XV_VSCALER_MAX_V_TAPS; j++) - { - pVscL2Data->coeff[i][j] = 0; - } - } - } -} - - /*****************************************************************************/ /** * This function programs the computed filter coefficients and phase data into @@ -362,7 +274,7 @@ static void XV_VScalerSetCoeff(XV_vscaler *pVsc, for(j=0; j < num_taps; j++) { rdIndx = j*2+offset; - val = (pVscL2Data->coeff[i][rdIndx+1] << 16) | (pVscL2Data->coeff[i][rdIndx] & XMASK_LOW_16BITS); + val = (pVscL2Data->coeff[i][rdIndx+1] << 16) | (pVscL2Data->coeff[i][rdIndx] & XVSC_MASK_LOW_16BITS); Xil_Out32(baseAddr+((i*num_taps+j)*4), val); } } @@ -397,29 +309,22 @@ void XV_VScalerSetup(XV_vscaler *InstancePtr, Xil_AssertVoid((WidthIn>0) && (WidthIn<=InstancePtr->Config.MaxWidth)); Xil_AssertVoid((HeightIn>0) && (HeightIn<=InstancePtr->Config.MaxHeight)); Xil_AssertVoid((HeightOut>0) && (HeightOut<=InstancePtr->Config.MaxHeight)); + Xil_AssertVoid((InstancePtr->Config.PixPerClk >= XVIDC_PPC_1) && + (InstancePtr->Config.PixPerClk <= XVIDC_PPC_4)); if(InstancePtr->Config.ScalerType == XV_VSCALER_POLYPHASE) { if(!pVscL2Data->UseExtCoeff) //No predefined coefficients { - /* If user has not selected any filter set default */ - if(pVscL2Data->FilterSel == 0) - { - XV_VScalerSetFilterType(pVscL2Data, XV_VFILT_LANCZOS); - } - - /* Generate coefficients for vertical scaling ratio */ - XV_VScalerGetCoeff(InstancePtr, - pVscL2Data, - HeightIn, - HeightOut); + xil_printf("\r\nERR: V Scaler coefficients not programmed\r\n"); + return; } /* Program coefficients into the IP register bank */ XV_VScalerSetCoeff(InstancePtr, pVscL2Data); } - LineRate = (u32) ((float)((HeightIn * STEP_PRECISION) + (HeightOut/2))/(float)HeightOut); + LineRate = (HeightIn * STEP_PRECISION)/HeightOut; XV_vscaler_Set_HwReg_HeightIn(InstancePtr, HeightIn); XV_vscaler_Set_HwReg_Width(InstancePtr, WidthIn); @@ -493,8 +398,8 @@ void XV_VScalerDbgReportStatus(XV_vscaler *InstancePtr) val = Xil_In32(baseAddr+((i*taps+j)*4)); //coefficients are 12-bits - lsb = (short)(val & XMASK_LOW_16BITS); - msb = (short)((val & XMASK_HIGH_16BITS)>>16); + lsb = (short)(val & XVSC_MASK_LOW_16BITS); + msb = (short)((val & XVSC_MASK_HIGH_16BITS)>>16); xil_printf("%5d %5d ", lsb, msb); } diff --git a/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.h b/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.h index 18bc1102..0fded803 100644 --- a/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.h +++ b/XilinxProcessorIPLib/drivers/v_vscaler/src/xv_vscaler_l2.h @@ -110,25 +110,21 @@ extern "C" { #endif +#include "xvidc.h" #include "xv_vscaler.h" /************************** Constant Definitions *****************************/ /** @name Hw Configuration * @{ - * The following constants define the scaler HW configuration - * TODO: - * Below defined Parameters are static configuration of H Scaler IP - * The tool needs to export these parameters to SDK and the driver will - * be populated with these option settings. i.e. these settings could be - * accessible via instance pointer + * The following constants define the scaler HW MAX configuration * */ - #define XV_VSCALER_MAX_V_TAPS (10) + #define XV_VSCALER_MAX_V_TAPS (12) #define XV_VSCALER_MAX_V_PHASES (64) /**************************** Type Definitions *******************************/ /** - * This typedef contains the Scaler Type + * This typedef eumerates the Scaler Type */ typedef enum { @@ -138,14 +134,15 @@ typedef enum }XV_VSCALER_TYPE; /** - * This typedef contains the type of filters available for scaling operation + * This typedef enumerates the supported taps */ typedef enum { - XV_VFILT_LANCZOS = 0, - XV_VFILT_WINDOWED_SINC -}XV_VFILTER_ID; - + XV_VSCALER_TAPS_6 = 6, + XV_VSCALER_TAPS_8 = 8, + XV_VSCALER_TAPS_10 = 10, + XV_VSCALER_TAPS_12 = 12 +}XV_VSCALER_TAPS; /** * V Scaler Layer 2 data. The user is required to allocate a variable @@ -155,33 +152,21 @@ typedef enum typedef struct { u8 UseExtCoeff; - XV_VFILTER_ID FilterSel; short coeff[XV_VSCALER_MAX_V_PHASES][XV_VSCALER_MAX_V_TAPS]; }XV_vscaler_l2; /************************** Macros Definitions *******************************/ -/*****************************************************************************/ -/** - * This macro selects the filter used for generating coefficients. - * Applicable only for Ployphase Scaler Type - * - * @param pVscL2Data is pointer to the V Scaler Layer 2 structure instance - * @param value is the filter type - * - * @return None - * - *****************************************************************************/ -#define XV_VScalerSetFilterType(pVscL2Data, value) \ - ((pVscL2Data)->FilterSel = value) /************************** Function Prototypes ******************************/ void XV_VScalerStart(XV_vscaler *InstancePtr); void XV_VScalerStop(XV_vscaler *InstancePtr); -void XV_VscalerLoadUsrCoeffients(XV_vscaler *InstancePtr, - XV_vscaler_l2 *pVscL2Data, - u16 num_phases, - u16 num_taps, - const short *Coeff); +void XV_VScalerLoadDefaultCoeff(XV_vscaler *InstancePtr, + XV_vscaler_l2 *pVscL2Data); +void XV_VScalerLoadUsrCoeff(XV_vscaler *InstancePtr, + XV_vscaler_l2 *pVscL2Data, + u16 num_phases, + u16 num_taps, + const short *Coeff); void XV_VScalerSetup(XV_vscaler *InstancePtr, XV_vscaler_l2 *pVscL2Data, u32 WidthIn,