@@ -111,10 +111,6 @@ struct sel_test_state {
111111 struct processing_module * mod ;
112112 struct comp_buffer * sink ;
113113 struct comp_buffer * source ;
114- struct input_stream_buffer * input ;
115- struct output_stream_buffer * output ;
116- size_t size ;
117- uint32_t channels ;
118114 void (* verify )(struct processing_module * mod , struct audio_stream * sink ,
119115 struct audio_stream * source );
120116};
@@ -171,7 +167,6 @@ static int setup(void **state)
171167 /* allocate new sink buffer */
172168 size = parameters -> frames * get_frame_bytes (parameters -> sink_format ,
173169 parameters -> out_channels ) * parameters -> buffer_size_ms ;
174- sel_state -> size = size ;
175170 sel_state -> sink = create_test_sink (dev , 0 , parameters -> sink_format ,
176171 parameters -> out_channels , size );
177172
@@ -182,11 +177,6 @@ static int setup(void **state)
182177 sel_state -> source = create_test_source (dev , 0 , parameters -> source_format ,
183178 parameters -> in_channels , size );
184179
185- sel_state -> input = test_malloc (sizeof (struct input_stream_buffer ));
186- sel_state -> input -> data = & sel_state -> source -> stream ;
187- sel_state -> output = test_malloc (sizeof (struct output_stream_buffer ));
188- sel_state -> output -> data = & sel_state -> sink -> stream ;
189-
190180 /* assigns verification function */
191181 sel_state -> verify = parameters -> verify ;
192182
@@ -205,8 +195,6 @@ static int teardown(void **state)
205195 test_free (cd );
206196 test_free (sel_state -> mod -> dev );
207197 test_free (sel_state -> mod );
208- test_free (sel_state -> input );
209- test_free (sel_state -> output );
210198 free_test_sink (sel_state -> sink );
211199 free_test_source (sel_state -> source );
212200 test_free (sel_state );
@@ -418,6 +406,9 @@ static void verify_s32le_4ch_to_4ch(struct processing_module *mod,
418406static void test_audio_sel (void * * state )
419407{
420408 struct sel_test_state * sel_state = * state ;
409+ struct sof_source * source = audio_buffer_get_source (& sel_state -> source -> audio_buffer );
410+ struct sof_sink * sink = audio_buffer_get_sink (& sel_state -> sink -> audio_buffer );
411+ int ret ;
421412#if CONFIG_IPC_MAJOR_3
422413 struct comp_data * cd = comp_get_drvdata (sel_state -> dev );
423414#else
@@ -447,17 +438,14 @@ static void test_audio_sel(void **state)
447438 }
448439
449440#if CONFIG_IPC_MAJOR_3
450- cd -> sel_func (sel_state -> dev , & sel_state -> sink -> stream , & sel_state -> source -> stream ,
451- sel_state -> dev -> frames );
441+ ret = cd -> sel_func (sel_state -> dev , sink , source , sel_state -> dev -> frames );
442+ assert_int_equal ( ret , 0 );
452443
453444 sel_state -> verify (sel_state -> dev , & sel_state -> sink -> stream , & sel_state -> source -> stream );
454445
455446#else
456- sel_state -> input -> consumed = 0 ;
457- sel_state -> output -> size = 0 ;
458-
459- cd -> sel_func (mod , sel_state -> input , sel_state -> output ,
460- mod -> dev -> frames );
447+ ret = cd -> sel_func (mod , source , sink , mod -> dev -> frames );
448+ assert_int_equal (ret , 0 );
461449
462450 sel_state -> verify (mod , & sel_state -> sink -> stream , & sel_state -> source -> stream );
463451#endif
0 commit comments