Skip to content

Commit 1cd8de6

Browse files
committed
audio_stream: Rename/redocument audio_stream_set_align
After recent changes, the audio_stream_init_alignment_constants() routine isn't an "init" step anymore, it sets requirements and can be called at any time. Rename it to "audio_stream_set_align()" to better capture its behavior, and rework the documentation to make it clearer how it works. Signed-off-by: Andy Ross <andyross@google.com>
1 parent 726cfc7 commit 1cd8de6

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

src/audio/aria/aria.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static void aria_set_stream_params(struct comp_buffer *buffer,
163163

164164
ipc4_update_buffer_format(buffer, audio_fmt);
165165
#ifndef ARIA_GENERIC
166-
audio_stream_init_alignment_constants(8, 1, &buffer->stream);
166+
audio_stream_set_align(8, 1, &buffer->stream);
167167
#endif
168168
}
169169

src/audio/audio_stream.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void audio_stream_recalc_align(struct audio_stream *stream)
9393
(is_power_of_2(process_size) ? 31 : 32) - clz(process_size);
9494
}
9595

96-
void audio_stream_init_alignment_constants(const uint32_t byte_align,
96+
void audio_stream_set_align(const uint32_t byte_align,
9797
const uint32_t frame_align_req,
9898
struct audio_stream *stream)
9999
{
@@ -139,7 +139,7 @@ static int audio_stream_source_set_alignment_constants(struct sof_source *source
139139
{
140140
struct audio_stream *audio_stream = container_of(source, struct audio_stream, source_api);
141141

142-
audio_stream_init_alignment_constants(byte_align, frame_align_req, audio_stream);
142+
audio_stream_set_align(byte_align, frame_align_req, audio_stream);
143143

144144
return 0;
145145
}
@@ -150,7 +150,7 @@ static int audio_stream_sink_set_alignment_constants(struct sof_sink *sink,
150150
{
151151
struct audio_stream *audio_stream = container_of(sink, struct audio_stream, sink_api);
152152

153-
audio_stream_init_alignment_constants(byte_align, frame_align_req, audio_stream);
153+
audio_stream_set_align(byte_align, frame_align_req, audio_stream);
154154

155155
return 0;
156156
}
@@ -195,7 +195,7 @@ void audio_stream_init(struct audio_stream *audio_stream, void *buff_addr, uint3
195195
audio_stream->addr = buff_addr;
196196
audio_stream->end_addr = (char *)audio_stream->addr + size;
197197

198-
audio_stream_init_alignment_constants(1, 1, audio_stream);
198+
audio_stream_set_align(1, 1, audio_stream);
199199
source_init(audio_stream_get_source(audio_stream), &audio_stream_source_ops,
200200
&audio_stream->runtime_stream_params);
201201
sink_init(audio_stream_get_sink(audio_stream), &audio_stream_sink_ops,

src/audio/eq_fir/eq_fir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ static void eq_fir_set_alignment(struct audio_stream *source,
402402
const uint32_t byte_align = 1;
403403
const uint32_t frame_align_req = 2; /* Process multiples of 2 frames */
404404

405-
audio_stream_init_alignment_constants(byte_align, frame_align_req, source);
406-
audio_stream_init_alignment_constants(byte_align, frame_align_req, sink);
405+
audio_stream_set_align(byte_align, frame_align_req, source);
406+
audio_stream_set_align(byte_align, frame_align_req, sink);
407407
}
408408

409409
static int eq_fir_prepare(struct processing_module *mod,

src/audio/eq_iir/eq_iir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ static void eq_iir_set_alignment(struct audio_stream *source,
174174
const uint32_t byte_align = 8;
175175
const uint32_t frame_align_req = 2;
176176

177-
audio_stream_init_alignment_constants(byte_align, frame_align_req, source);
178-
audio_stream_init_alignment_constants(byte_align, frame_align_req, sink);
177+
audio_stream_set_align(byte_align, frame_align_req, source);
178+
audio_stream_set_align(byte_align, frame_align_req, sink);
179179
}
180180

181181
static int eq_iir_prepare(struct processing_module *mod,

src/audio/mixer/mixer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static inline void mixer_set_frame_alignment(struct audio_stream *source)
205205
/*There is no limit for frame number, so set it as 1*/
206206
const uint32_t frame_align_req = 1;
207207

208-
audio_stream_init_alignment_constants(byte_align, frame_align_req, source);
208+
audio_stream_set_align(byte_align, frame_align_req, source);
209209
#endif
210210
}
211211

src/audio/selector/selector.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,8 @@ static int selector_prepare(struct processing_module *mod,
847847
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
848848
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
849849

850-
audio_stream_init_alignment_constants(4, 1, &sourceb->stream);
851-
audio_stream_init_alignment_constants(4, 1, &sinkb->stream);
850+
audio_stream_set_align(4, 1, &sourceb->stream);
851+
audio_stream_set_align(4, 1, &sinkb->stream);
852852

853853
/* get source data format and period bytes */
854854
cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);

src/audio/tdfb/tdfb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,8 @@ static void tdfb_set_alignment(struct audio_stream *source,
518518
const uint32_t byte_align = 1;
519519
const uint32_t frame_align_req = 2; /* Process multiples of 2 frames */
520520

521-
audio_stream_init_alignment_constants(byte_align, frame_align_req, source);
522-
audio_stream_init_alignment_constants(byte_align, frame_align_req, sink);
521+
audio_stream_set_align(byte_align, frame_align_req, source);
522+
audio_stream_set_align(byte_align, frame_align_req, sink);
523523
}
524524

525525
static int tdfb_prepare(struct processing_module *mod,

src/audio/volume/volume.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,8 +632,8 @@ static void volume_set_alignment(struct audio_stream *source,
632632
/*There is no limit for frame number, so both source and sink set it to be 1*/
633633
const uint32_t frame_align_req = 1;
634634

635-
audio_stream_init_alignment_constants(byte_align, frame_align_req, source);
636-
audio_stream_init_alignment_constants(byte_align, frame_align_req, sink);
635+
audio_stream_set_align(byte_align, frame_align_req, source);
636+
audio_stream_set_align(byte_align, frame_align_req, sink);
637637
#endif
638638
}
639639

src/include/sof/audio/audio_stream.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -338,20 +338,20 @@ static inline uint32_t audio_stream_sample_bytes(const struct audio_stream *buf)
338338
}
339339

340340
/**
341-
* Set align_shift_idx and align_frame_cnt of stream according to byte_align and
342-
* frame_align_req alignment requirement. Once the channel number,frame size
343-
* are determined,the align_frame_cnt and align_shift_idx are determined too.
344-
* these two feature will be used in audio_stream_get_avail_frames_aligned
345-
* to calculate the available frames. it should be called in component prepare
346-
* or param functions only once before stream copy. if someone forgets to call
347-
* this first, there would be unexampled error such as nothing is copied at all.
341+
* @brief Set processing alignment requirements
342+
*
343+
* Sets the sample byte alignment and aligned frame count required for
344+
* processing done on this stream. This function may be called at any
345+
* time, the internal constants are recalculated if the frame/sample
346+
* size changes. @see audio_stream_avail_frames_aligned().
347+
*
348348
* @param byte_align Processing byte alignment requirement.
349-
* @param frame_align_req Processing frames alignment requirement.
349+
* @param frame_align Processing frames alignment requirement.
350350
* @param stream Sink or source stream structure which to be set.
351351
*/
352-
void audio_stream_init_alignment_constants(const uint32_t byte_align,
353-
const uint32_t frame_align_req,
354-
struct audio_stream *stream);
352+
void audio_stream_set_align(const uint32_t byte_align,
353+
const uint32_t frame_align_req,
354+
struct audio_stream *stream);
355355

356356
/**
357357
* Applies parameters to the buffer.

0 commit comments

Comments
 (0)