Changeset 57e8b3b in mainline for uspace/app

Timestamp:

2012-07-15T15:25:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5cd5079

Parents:

2cc5c835

Message:

Add frame count to event report.

This enables applications to detect underruns.

Location:

uspace/app

Files:

• dplay/dplay.c (modified) (3 diffs)
• drec/drec.c (modified) (3 diffs)

uspace/app/dplay/dplay.c

@@ -51 +51 @@
 
 #define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/pcm"
-#define SUBBUFFERS 2
+#define BUFFER_PARTS 2
 
 typedef struct {
@@ -85 +85 @@
         async_answer_0(iid, EOK);
         playback_t *pb = arg;
-        const size_t buffer_part = pb->buffer.size / SUBBUFFERS;
+        const size_t buffer_part = pb->buffer.size / BUFFER_PARTS;
         while (1) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 switch(IPC_GET_IMETHOD(call)) {
-                case PCM_EVENT_PLAYBACK_DONE:
-                        printf("+");
+                case PCM_EVENT_FRAMES_PLAYED:
+                        printf("%u frames\n", IPC_GET_ARG1(call));
                         async_answer_0(callid, EOK);
                         break;
                 case PCM_EVENT_PLAYBACK_TERMINATED:
-                        printf("\nPlayback terminated\n");
+                        printf("Playback terminated\n");
                         fibril_mutex_lock(&pb->mutex);
                         pb->playing = false;
@@ -136 +136 @@
         printf("Buffer data ready.\n");
         fibril_mutex_lock(&pb->mutex);
+        const unsigned frames = pb->buffer.size /
+            (BUFFER_PARTS * channels * pcm_sample_format_size(format));
         int ret = audio_pcm_start_playback(pb->device,
-            SUBBUFFERS, channels, sampling_rate, format);
+            frames, channels, sampling_rate, format);
         if (ret != EOK) {
                 fibril_mutex_unlock(&pb->mutex);

uspace/app/drec/drec.c

@@ -52 +52 @@
 
 #define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/pcm"
-#define SUBBUFFERS 2
+#define BUFFER_PARTS 2
 
 const unsigned sampling_rate = 44100, channels = 2, sample_size = 16;
@@ -84 +84 @@
         async_answer_0(iid, EOK);
         record_t *rec = arg;
-        const size_t buffer_part = rec->buffer.size / SUBBUFFERS;
+        const size_t buffer_part = rec->buffer.size / BUFFER_PARTS;
         while (1) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 switch(IPC_GET_IMETHOD(call)) {
-                case PCM_EVENT_RECORDING_DONE:
-                        printf("+");
+                case PCM_EVENT_FRAMES_RECORDED:
+                        printf("%u frames\n", IPC_GET_ARG1(call));
                         async_answer_0(callid, EOK);
                         break;
                 case PCM_EVENT_RECORDING_TERMINATED:
-                        printf("\nRecording terminated\n");
+                        printf("Recording terminated\n");
                         return;
                 default:
@@ -122 +122 @@
         printf("Recording: %dHz, %s, %d channel(s).\n",
             sampling_rate, pcm_sample_format_str(format), channels);
+        const unsigned frames = rec->buffer.size /
+            (BUFFER_PARTS * channels * pcm_sample_format_size(format));
         int ret = audio_pcm_start_record(rec->device,
-            SUBBUFFERS, channels, sampling_rate, format);
+            frames, channels, sampling_rate, format);
         if (ret != EOK) {
                 printf("Failed to start recording: %s.\n", str_error(ret));