Changeset da41cc2d in mainline

Timestamp:

2013-09-04T00:09:06Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7f84430

Parents:

60efa35

Message:

wavplay: Allow extended wav formats.

we might get data start and size wrong, but the format is correct and it will
play OK.

File:

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

uspace/app/wavplay/wave.c

@@ -82 +82 @@
 
         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;