summaryrefslogtreecommitdiffstats
path: root/arm-wt-22k/lib_src/eas_mdls.c
diff options
context:
space:
mode:
authorAmit Shekhar <ashekhar@codeaurora.org>2013-03-20 21:51:24 (GMT)
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 09:24:01 (GMT)
commit9d1d7d671d54a94fef6de75a20d8ba829a151e9d (patch)
tree9d36ada850453782e06a64228b054b5aa1d043f6 /arm-wt-22k/lib_src/eas_mdls.c
parent9cf7e8775823c4e136a9841d41dcdb5fe4f98173 (diff)
downloadandroid_external_sonivox-9d1d7d671d54a94fef6de75a20d8ba829a151e9d.zip
android_external_sonivox-9d1d7d671d54a94fef6de75a20d8ba829a151e9d.tar.gz
android_external_sonivox-9d1d7d671d54a94fef6de75a20d8ba829a151e9d.tar.bz2
audio: Miscellaneous fixes in external/sonivox
Support for mxmf file playback -mxmf files couldn't be played. -Added a condition check, in DLSParser(), to warn user if artCount is 0 and to use default articulations. CRs-Fixed: 465437 Change-Id: I42b1634c65e3779ee7924913cc17020bde9cc38d midi decoder lib state is not updated on midiplayer stop - On EAS_Pause() STREAM_FLAGS_PAUSE is added to streamFlags, but EAS_State() returns SUCCESS before checking for streamFlags and updating midiplayers state. - Fix is to check for streamFlags for STREAM_FLAGS_PAUSE and update midiplayers state before returning SUCCESS. CRs-Fixed: 633774 Change-Id: Ie8845633f27f05c4917045dcf7cc2b3219c13ef6
Diffstat (limited to 'arm-wt-22k/lib_src/eas_mdls.c')
-rw-r--r--arm-wt-22k/lib_src/eas_mdls.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c
index b08e24e..a510b80 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -603,8 +603,14 @@ EAS_RESULT DLSParser (EAS_HW_DATA_HANDLE hwInstData, EAS_FILE_HANDLE fileHandle,
return EAS_ERROR_FILE_FORMAT;
}
- /* limit check */
- if ((dls.artCount == 0) || (dls.artCount > DLS_MAX_ART_COUNT))
+ /* limit check - warn user if artCount is 0 and use default articulations */
+ if ( dls.artCount == 0 )
+ {
+ { /* dpp: EAS_ReportEx(_EAS_SEVERITY_WARNING, "DLS file contains 0 #articulations, using default.\n"); */ }
+ }
+
+ /* limit check */
+ if ( dls.artCount > DLS_MAX_ART_COUNT )
{
{ /* dpp: EAS_ReportEx(_EAS_SEVERITY_ERROR, "DLS file contains invalid #articulations [%u]\n", dls.regionCount); */ }
return EAS_ERROR_FILE_FORMAT;