Changeset 950110ee in mainline for uspace/srv/audio/hound/audio_source.c

Timestamp:

2012-07-17T07:33:43Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ea6c838

Parents:

389ef25

Message:

hound: convert format while mixing.

Still no resampling.

File:

• uspace/srv/audio/hound/audio_source.c (modified) (2 diffs)

uspace/srv/audio/hound/audio_source.c

@@ -120 +120 @@
                 return ENOTSUP;
         }
+        const size_t src_frame_size = audio_format_frame_size(&source->format);
+        const size_t dst_frames = size / audio_format_frame_size(f);
+
         if (source->available_data.position == NULL ||
             source->available_data.size == 0) {
                 int ret = EOVERFLOW; /* In fact this is underflow... */
                 if (source->update_available_data)
-                        ret = source->update_available_data(source, size);
+                        ret = source->update_available_data(source,
+                            dst_frames * src_frame_size);
                 if (ret != EOK) {
                         log_debug("No data to add to %p(%zu)", buffer, size);
@@ -131 +135 @@
         }
 
-        const size_t real_size = min(size, source->available_data.size);
-        const int ret =
-            audio_format_mix(buffer, source->available_data.position, real_size, f);
+        const int ret = audio_format_convert_and_mix(buffer, size,
+               source->available_data.position, source->available_data.size,
+               &source->format, f);
         if (ret != EOK) {
-                log_debug("Mixing failed %p <= %p, %zu",
-                    buffer, source->available_data.position, real_size);
+                log_debug("Mixing failed %p <= %p, frames: %zu",
+                    buffer, source->available_data.position, dst_frames);
                 return ret;
         }
 
-        source->available_data.position += real_size;
-        source->available_data.size -= real_size;
-
-//      log_verbose("Mixing successful %p <= %p, %zu",
-//          buffer, source->available_data.position, real_size);
-
-        buffer += real_size;
-        size -= real_size;
-
-        //TODO update data again
-        if (size)
-                log_warning("not enough data");
-
+        source->available_data.position += (dst_frames * src_frame_size);
+        source->available_data.size -= (dst_frames * src_frame_size);
         return EOK;
 }