Changeset 67fbd5e in mainline for uspace/app/wavplay/wave.c

Timestamp:

2013-09-13T00:47:39Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1c5f6f8

Parents:

11d41be5 (diff), 99c2c69e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

wavplay: Minor improvements

• include error string in error messages
• be more verbose about the parsed format
• accept more wav file header formats

File:

• uspace/app/wavplay/wave.c (modified) (2 diffs)

uspace/app/wavplay/wave.c

@@ -81 +81 @@
         }
 
-        if (uint16_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+        if (uint32_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+                //TODO subchunk 1 sizes other than 16 are allowed ( 18, 40)
+                //http://www-mmsp.ece.mcgill.ca/documents/AudioFormats/WAVE/WAVE.html
                 if (error)
                         *error = "invalid subchunk1 size";
-                return EINVAL;
+//              return EINVAL;
         }
 
@@ -94 +96 @@
 
         if (str_lcmp(header->subchunk2_id, SUBCHUNK2_ID, 4) != 0) {
+                //TODO basedd on subchunk1 size, we might be reading wrong
+                //offset
                 if (error)
                         *error = "invalid subchunk2 id";
-                return EINVAL;
+//              return EINVAL;
         }
 
 
+        //TODO data and data_size are incorrect in extended wav formats
+        //pcm params are OK
         if (data)
                 *data = header->data;