Changeset 3545c56 in mainline

Timestamp:

2013-04-06T15:53:38Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2c0b348

Parents:

7e706a3

Message:

hound: readability cleanup

File:

• uspace/srv/audio/hound/audio_data.c (modified) (1 diff)

uspace/srv/audio/hound/audio_data.c

@@ -210 +210 @@
                     audio_data_link_available_frames(alink);
                 const size_t copy_frames = min(available_frames, needed_frames);
-                const size_t copy_size = copy_frames * dst_frame_size;
+                const size_t dst_copy_size = copy_frames * dst_frame_size;
+                const size_t src_copy_size = copy_frames * src_frame_size;
+
+                assert(src_copy_size <= audio_data_link_remain_size(alink));
 
                 /* Copy audio data */
-                pcm_format_convert_and_mix(data, copy_size,
-                    audio_data_link_start(alink),
-                    audio_data_link_remain_size(alink),
+                pcm_format_convert_and_mix(data, dst_copy_size,
+                    audio_data_link_start(alink), src_copy_size,
                     &alink->adata->format, f);
 
                 /* Update values */
-                copied_size += copy_size;
                 needed_frames -= copy_frames;
-                data += copy_size;
-                alink->position += (copy_frames * src_frame_size);
-                pipe->bytes -= (copy_frames * src_frame_size);
+                copied_size += dst_copy_size;
+                data += dst_copy_size;
+                alink->position += src_copy_size;
+                pipe->bytes -= src_copy_size;
                 pipe->frames -= copy_frames;
                 if (audio_data_link_remain_size(alink) == 0) {