Changeset 0e4c5f0 in mainline for uspace/app

Timestamp:

2015-03-18T18:34:40Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ac235711

Parents:

795e2bf

Message:

hdaudio capture support. wavplay fixes to recording code.

Location:

uspace/app/wavplay

Files:

• drec.c (modified) (4 diffs)
• main.c (modified) (1 diff)
• wave.c (modified) (2 diffs)

uspace/app/wavplay/drec.c

@@ -47 +47 @@
 
 
-#define BUFFER_PARTS   2
+#define BUFFER_PARTS   16
 
 /** Recording format */
@@ -103 +103 @@
                         printf("Recording terminated\n");
                         record = false;
+                        break;
                 case PCM_EVENT_FRAMES_CAPTURED:
                         printf("%" PRIun " frames\n", IPC_GET_ARG1(call));
-                        async_answer_0(callid, EOK);
                         break;
                 default:
@@ -111 +111 @@
                         async_answer_0(callid, ENOTSUP);
                         continue;
-
+                }
+
+                if (!record) {
+                        async_answer_0(callid, EOK);
+                        break;
                 }
 
@@ -156 +160 @@
         printf("\n");
         audio_pcm_stop_capture(rec->device);
+        /* XXX Control returns even before we can be sure callbacks finished */
+        printf("Delay before playback termination\n");
+        async_usleep(1000000);
+        printf("Terminate playback\n");
 }
 

uspace/app/wavplay/main.c

@@ -308 +308 @@
                         if (direct) {
                                 drecord(device, file);
+                                continue;
                         } else {
                                 printf("Indirect recording is not supported "

uspace/app/wavplay/wave.c

@@ -116 +116 @@
                 *channels = uint16_t_le2host(header->channels);
         if (format) {
-                const unsigned size = uint32_t_le2host(header->sample_size);
+                const unsigned size = uint16_t_le2host(header->sample_size);
                 switch (size) {
                 case 8: *format = PCM_SAMPLE_UINT8; break;
@@ -157 +157 @@
         header->channels = host2uint32_t_le(format.channels);
         header->sample_size =
-            host2uint32_t_le(pcm_sample_format_size(format.sample_format));
+            host2uint16_t_le(pcm_sample_format_size(format.sample_format) * 8);
 }
 /**