Skip to contentSkip to conversation

media: staging/intel-ipu3: css: simplify expression

PATCH Superseded Deepak R Varma 3 participants 4 messages Mar 13, 2020 – Mar 17, 2020

Subsystems (3)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: staging/intel-ipu3: css: simplify expression

An array index computed inside square brackets leading to complexity and code line exceeding 80 character. Add new variable to compute array index separately and use it as an index during assignment.

---
 drivers/staging/media/ipu3/ipu3-css-params.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/ipu3-css-params.c +3 -2
index 4533dacad4be..4b15e767bf32 100644
@@ -50,12 +50,13 @@ imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width,
 	int exponent = imgu_css_scaler_get_exp(output_width, input_width);
 	int mantissa = (1 << exponent) * output_width;
 	unsigned int phase_step;
+	int phase_taps = 0;
 
 	if (input_width == output_width) {
 		for (phase = 0; phase < IMGU_SCALER_PHASES; phase++) {
+			phase_taps = phase * IMGU_SCALER_FILTER_TAPS;
 			for (tap = 0; tap < taps; tap++) {
-				coeff_lut[phase * IMGU_SCALER_FILTER_TAPS + tap]
-					= 0;
+				coeff_lut[phase_taps + tap] = 0;
 			}
 		}
 
Signature · 1 line
2.17.1
#1 lore raw

Hi Deepak,

Quoted 14 lines · Deepak R Varma

An array index computed inside square brackets leading to complexity and code line exceeding 80 character. Add new variable to compute array index separately and use it as an index during assignment.

---
 drivers/staging/media/ipu3/ipu3-css-params.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/ipu3-css-params.c +0 -0
index 4533dacad4be..4b15e767bf32 100644

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 53

Quoted 4 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -0
@@ -50,12 +50,13 @@ imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width,
 	int exponent = imgu_css_scaler_get_exp(output_width, input_width);
 	int mantissa = (1 << exponent) * output_width;
 	unsigned int phase_step;
+	int phase_taps = 0;

No need to initialized it to zero.

Also, it seems phase_taps can't be negative, so you can use unsigned int

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 57

Quoted 4 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -0
 	if (input_width == output_width) {
 		for (phase = 0; phase < IMGU_SCALER_PHASES; phase++) {
+			phase_taps = phase * IMGU_SCALER_FILTER_TAPS;

You can also declare it here:
+ unsigned int offset = phase * IMGU_SCALER_FILTER_TAPS;

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width,

Quoted 8 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -2
 			for (tap = 0; tap < taps; tap++) {
-				coeff_lut[phase * IMGU_SCALER_FILTER_TAPS + tap]
-					= 0;
+				coeff_lut[phase_taps + tap] = 0;
 			}
 		}
 
 

Regards
Helen

#2 lore raw
Quoted 5 lines · On Fri, 13 Mar 2020 15:21:28 -0300 Helen Koike <[email protected]> wrote:

Hi Deepak,

Quoted 2 lines · Deepak R Varma

An array index computed inside square brackets leading to complexity and code line exceeding 80 character. Add new variable to compute

The first statement isn't really a statement ("leads" instead of "leading"?)

Quoted 22 lines
Quoted 12 lines

array index separately and use it as an index during assignment.

---
 drivers/staging/media/ipu3/ipu3-css-params.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/ipu3-css-params.c +0 -0
index 4533dacad4be..4b15e767bf32 100644

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 53

Quoted 4 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -0
@@ -50,12 +50,13 @@ imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width,
 	int exponent = imgu_css_scaler_get_exp(output_width, input_width);
 	int mantissa = (1 << exponent) * output_width;
 	unsigned int phase_step;
+	int phase_taps = 0;  

No need to initialized it to zero.

Also, it seems phase_taps can't be negative, so you can use unsigned int

Quoted 1 line
Quoted 8 lines

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 57

Quoted 3 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -0
 	if (input_width == output_width) {
 		for (phase = 0; phase < IMGU_SCALER_PHASES; phase++) {
+			phase_taps = phase * IMGU_SCALER_FILTER_TAPS;  

You can also declare it here:
+ unsigned int offset = phase * IMGU_SCALER_FILTER_TAPS;

Quoted 1 line

for (tap = 0; tap < taps; tap++) {

Also, at that point, you should extend this to the loop for input_width != output_width below, for consistency.

Quoted 3 lines
Quoted 3 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -2
-				coeff_lut[phase * IMGU_SCALER_FILTER_TAPS + tap]
-					= 0;
+				coeff_lut[phase_taps + tap] = 0;
Signature · 1 line
Stefano
#3 lore raw
Quoted 41 lines · On Tue, 17 Mar 2020 02:05:58 +0100 Stefano Brivio <[email protected]> wrote:
Quoted 5 lines · On Fri, 13 Mar 2020 15:21:28 -0300 Helen Koike <[email protected]> wrote:

Hi Deepak,

Quoted 2 lines · Deepak R Varma

An array index computed inside square brackets leading to complexity and code line exceeding 80 character. Add new variable to compute

The first statement isn't really a statement ("leads" instead of "leading"?)

Quoted 29 lines
Quoted 12 lines

array index separately and use it as an index during assignment.

---
 drivers/staging/media/ipu3/ipu3-css-params.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/ipu3/ipu3-css-params.c +0 -0
index 4533dacad4be..4b15e767bf32 100644

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 53

Quoted 4 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -0
@@ -50,12 +50,13 @@ imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width,
 	int exponent = imgu_css_scaler_get_exp(output_width, input_width);
 	int mantissa = (1 << exponent) * output_width;
 	unsigned int phase_step;
+	int phase_taps = 0;    

No need to initialized it to zero.

Also, it seems phase_taps can't be negative, so you can use unsigned int

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 57

Quoted 4 lines
drivers/staging/media/ipu3/ipu3-css-params.c +1 -0
 	if (input_width == output_width) {
 		for (phase = 0; phase < IMGU_SCALER_PHASES; phase++) {
+			phase_taps = phase * IMGU_SCALER_FILTER_TAPS;    

You can also declare it here:
+ unsigned int offset = phase * IMGU_SCALER_FILTER_TAPS;

Quoted 4 lines
Quoted 1 line

drivers/staging/media/ipu3/ipu3-css-params.c imgu_css_scaler_setup_lut(unsigned int taps, unsigned int input_width, · line 58

Quoted 1 line
drivers/staging/media/ipu3/ipu3-css-params.c +0 -0
 			for (tap = 0; tap < taps; tap++) {  

Also, at that point, you should extend this to the loop for input_width != output_width below, for consistency.

Sorry, I missed v2 and v3 of this, never mind.

Signature · 1 line
Stefano