@@ -5826,31 +5826,28 @@ need_yuv_scaler_stage(const struct ia_css_pipe *pipe)
5826
5826
* Later, merge this with ia_css_pipe_create_cas_scaler_desc
5827
5827
*/
5828
5828
static int ia_css_pipe_create_cas_scaler_desc_single_output (
5829
- struct ia_css_frame_info * cas_scaler_in_info ,
5830
- struct ia_css_frame_info * cas_scaler_out_info ,
5831
- struct ia_css_frame_info * cas_scaler_vf_info ,
5829
+ struct ia_css_frame_info * in_info ,
5830
+ struct ia_css_frame_info * out_info ,
5831
+ struct ia_css_frame_info * vf_info ,
5832
5832
struct ia_css_cas_binary_descr * descr )
5833
5833
{
5834
5834
unsigned int i ;
5835
5835
unsigned int hor_ds_factor = 0 , ver_ds_factor = 0 ;
5836
5836
int err = 0 ;
5837
5837
struct ia_css_frame_info tmp_in_info ;
5838
-
5839
5838
unsigned int max_scale_factor_per_stage = MAX_PREFERRED_YUV_DS_PER_STEP ;
5840
5839
5841
- assert (cas_scaler_in_info );
5842
- assert (cas_scaler_out_info );
5840
+ assert (in_info );
5841
+ assert (out_info );
5843
5842
5844
5843
ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE_PRIVATE ,
5845
5844
"ia_css_pipe_create_cas_scaler_desc() enter:\n" );
5846
5845
5847
5846
/* We assume that this function is used only for single output port case. */
5848
5847
descr -> num_output_stage = 1 ;
5849
5848
5850
- hor_ds_factor = CEIL_DIV (cas_scaler_in_info -> res .width ,
5851
- cas_scaler_out_info -> res .width );
5852
- ver_ds_factor = CEIL_DIV (cas_scaler_in_info -> res .height ,
5853
- cas_scaler_out_info -> res .height );
5849
+ hor_ds_factor = CEIL_DIV (in_info -> res .width , out_info -> res .width );
5850
+ ver_ds_factor = CEIL_DIV (in_info -> res .height , out_info -> res .height );
5854
5851
/* use the same horizontal and vertical downscaling factor for simplicity */
5855
5852
assert (hor_ds_factor == ver_ds_factor );
5856
5853
@@ -5895,30 +5892,29 @@ static int ia_css_pipe_create_cas_scaler_desc_single_output(
5895
5892
goto ERR ;
5896
5893
}
5897
5894
5898
- tmp_in_info = * cas_scaler_in_info ;
5895
+ tmp_in_info = * in_info ;
5899
5896
for (i = 0 ; i < descr -> num_stage ; i ++ ) {
5900
5897
descr -> in_info [i ] = tmp_in_info ;
5901
- if ((tmp_in_info .res .width / max_scale_factor_per_stage ) <=
5902
- cas_scaler_out_info -> res .width ) {
5898
+ if ((tmp_in_info .res .width / max_scale_factor_per_stage ) <= out_info -> res .width ) {
5903
5899
descr -> is_output_stage [i ] = true;
5904
5900
if ((descr -> num_output_stage > 1 ) && (i != (descr -> num_stage - 1 ))) {
5905
- descr -> internal_out_info [i ].res .width = cas_scaler_out_info -> res .width ;
5906
- descr -> internal_out_info [i ].res .height = cas_scaler_out_info -> res .height ;
5907
- descr -> internal_out_info [i ].padded_width = cas_scaler_out_info -> padded_width ;
5901
+ descr -> internal_out_info [i ].res .width = out_info -> res .width ;
5902
+ descr -> internal_out_info [i ].res .height = out_info -> res .height ;
5903
+ descr -> internal_out_info [i ].padded_width = out_info -> padded_width ;
5908
5904
descr -> internal_out_info [i ].format = IA_CSS_FRAME_FORMAT_YUV420 ;
5909
5905
} else {
5910
5906
assert (i == (descr -> num_stage - 1 ));
5911
5907
descr -> internal_out_info [i ].res .width = 0 ;
5912
5908
descr -> internal_out_info [i ].res .height = 0 ;
5913
5909
}
5914
- descr -> out_info [i ].res .width = cas_scaler_out_info -> res .width ;
5915
- descr -> out_info [i ].res .height = cas_scaler_out_info -> res .height ;
5916
- descr -> out_info [i ].padded_width = cas_scaler_out_info -> padded_width ;
5917
- descr -> out_info [i ].format = cas_scaler_out_info -> format ;
5918
- if (cas_scaler_vf_info ) {
5919
- descr -> vf_info [i ].res .width = cas_scaler_vf_info -> res .width ;
5920
- descr -> vf_info [i ].res .height = cas_scaler_vf_info -> res .height ;
5921
- descr -> vf_info [i ].padded_width = cas_scaler_vf_info -> padded_width ;
5910
+ descr -> out_info [i ].res .width = out_info -> res .width ;
5911
+ descr -> out_info [i ].res .height = out_info -> res .height ;
5912
+ descr -> out_info [i ].padded_width = out_info -> padded_width ;
5913
+ descr -> out_info [i ].format = out_info -> format ;
5914
+ if (vf_info ) {
5915
+ descr -> vf_info [i ].res .width = vf_info -> res .width ;
5916
+ descr -> vf_info [i ].res .height = vf_info -> res .height ;
5917
+ descr -> vf_info [i ].padded_width = vf_info -> padded_width ;
5922
5918
ia_css_frame_info_set_format (& descr -> vf_info [i ], IA_CSS_FRAME_FORMAT_YUV_LINE );
5923
5919
} else {
5924
5920
descr -> vf_info [i ].res .width = 0 ;
0 commit comments