<html><head></head><body>Hi,<br><br>I see nothing wrong per se, with the 2 updated patches. But I'd tended to use the moving of documentation as an opportunity to clean up and improve it. This is skipped :/<br><br><div class="gmail_quote">Le 27 juillet 2020 17:28:55 GMT+03:00, Marvin Scholz <epirat07@gmail.com> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">Overall the patchset looks good to me now.<br><br>Any other opinions?<br><br>On 23 Jul 2020, at 15:18, Kartik Ohri wrote:<br><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"> Move documentation for VLC API methods aout_ChannelReorder,<br> aout_Interleave and aout_Deinterleave from<br> src/audio_output/common.c to include/vlc_aout.h.<hr> include/vlc_aout.h | 33 +++++++++++++++++++++++++++++++++<br> src/audio_output/common.c | 31 -------------------------------<br> 2 files changed, 33 insertions(+), 31 deletions(-)<br><br> diff --git a/include/vlc_aout.h b/include/vlc_aout.h<br> index 49527f30fb..0125b059ee 100644<br> --- a/include/vlc_aout.h<br> +++ b/include/vlc_aout.h<br> @@ -336,11 +336,44 @@ static const uint32_t pi_vlc_chan_order_wg4[] =<br> */<br> VLC_API unsigned aout_CheckChannelReorder( const uint32_t *, const <br> uint32_t *,<br> uint32_t mask, uint8_t <br> *table );<br> +<br> +/**<br> + * Reorders audio samples within a block of linear audio interleaved <br> samples.<br> + * \param ptr start address of the block of samples<br> + * \param bytes size of the block in bytes (must be a multiple of the <br> product<br> + * of the channels count and the sample size)<br> + * \param channels channels count (also length of the chans_table <br> table)<br> + * \param chans_table permutation table to reorder the channels<br> + * (usually computed by <br> aout_CheckChannelReorder())<br> + * \param fourcc sample format (must be a linear sample format)<br> + * \note The samples must be naturally aligned in memory.<br> + */<br> VLC_API void aout_ChannelReorder(void *, size_t, uint8_t, const <br> uint8_t *, vlc_fourcc_t);<br><br> +/**<br> + * Interleaves audio samples within a block of samples.<br> + * \param dst destination buffer for interleaved samples<br> + * \param srcv source buffers (one per plane) of uninterleaved <br> samples<br> + * \param samples number of samples (per channel/per plane)<br> + * \param chans channels/planes count<br> + * \param fourcc sample format (must be a linear sample format)<br> + * \note The samples must be naturally aligned in memory.<br> + * \warning Destination and source buffers MUST NOT overlap.<br> + */<br> VLC_API void aout_Interleave(void *dst, const void *const *planes,<br> unsigned samples, unsigned channels,<br> vlc_fourcc_t fourcc);<br> +<br> +/**<br> + * Deinterleaves audio samples within a block of samples.<br> + * \param dst destination buffer for planar samples<br> + * \param src source buffer with interleaved samples<br> + * \param samples number of samples (per channel/per plane)<br> + * \param chans channels/planes count<br> + * \param fourcc sample format (must be a linear sample format)<br> + * \note The samples must be naturally aligned in memory.<br> + * \warning Destination and source buffers MUST NOT overlap.<br> + */<br> VLC_API void aout_Deinterleave(void *dst, const void *src, unsigned <br> samples,<br> unsigned channels, vlc_fourcc_t fourcc);<br><br> diff --git a/src/audio_output/common.c b/src/audio_output/common.c<br> index 9ed3a82546..64a7f683a1 100644<br> --- a/src/audio_output/common.c<br> +++ b/src/audio_output/common.c<br> @@ -286,17 +286,6 @@ unsigned aout_CheckChannelReorder( const uint32_t <br> *chans_in,<br> return 0;<br> }<br><br> -/**<br> - * Reorders audio samples within a block of linear audio interleaved <br> samples.<br> - * \param ptr start address of the block of samples<br> - * \param bytes size of the block in bytes (must be a multiple of the <br> product<br> - * of the channels count and the sample size)<br> - * \param channels channels count (also length of the chans_table <br> table)<br> - * \param chans_table permutation table to reorder the channels<br> - * (usually computed by <br> aout_CheckChannelReorder())<br> - * \param fourcc sample format (must be a linear sample format)<br> - * \note The samples must be naturally aligned in memory.<br> - */<br> void aout_ChannelReorder( void *ptr, size_t bytes, uint8_t channels,<br> const uint8_t *restrict chans_table, <br> vlc_fourcc_t fourcc )<br> {<br> @@ -353,16 +342,6 @@ do { \<br> }<br> }<br><br> -/**<br> - * Interleaves audio samples within a block of samples.<br> - * \param dst destination buffer for interleaved samples<br> - * \param srcv source buffers (one per plane) of uninterleaved <br> samples<br> - * \param samples number of samples (per channel/per plane)<br> - * \param chans channels/planes count<br> - * \param fourcc sample format (must be a linear sample format)<br> - * \note The samples must be naturally aligned in memory.<br> - * \warning Destination and source buffers MUST NOT overlap.<br> - */<br> void aout_Interleave( void *restrict dst, const void *const *srcv,<br> unsigned samples, unsigned chans, vlc_fourcc_t <br> fourcc )<br> {<br> @@ -389,16 +368,6 @@ do { \<br> #undef INTERLEAVE_TYPE<br> }<br><br> -/**<br> - * Deinterleaves audio samples within a block of samples.<br> - * \param dst destination buffer for planar samples<br> - * \param src source buffer with interleaved samples<br> - * \param samples number of samples (per channel/per plane)<br> - * \param chans channels/planes count<br> - * \param fourcc sample format (must be a linear sample format)<br> - * \note The samples must be naturally aligned in memory.<br> - * \warning Destination and source buffers MUST NOT overlap.<br> - */<br> void aout_Deinterleave( void *restrict dst, const void *restrict src,<br> unsigned samples, unsigned chans, vlc_fourcc_t <br> fourcc )<br> {<br> -- <br> 2.25.1<hr> vlc-devel mailing list<br> To unsubscribe or modify your subscription options:<br> <a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a><br></blockquote><hr>vlc-devel mailing list<br>To unsubscribe or modify your subscription options:<br><a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a></pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>