summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shekhar <ashekhar@codeaurora.org>2013-03-20 21:51:24 (GMT)
committerSteve Kondik <shade@chemlab.org>2014-05-06 08:03:58 (GMT)
commitee2f2d2b265e9db9da24cd97be0864989f96f3f2 (patch)
tree7264d00ef557573d6a999807a2ba1313b86904fe
parentd0198b18feacbb9e51719086ae1e9b0998bb26ec (diff)
downloadandroid_external_sonivox-ee2f2d2b265e9db9da24cd97be0864989f96f3f2.zip
android_external_sonivox-ee2f2d2b265e9db9da24cd97be0864989f96f3f2.tar.gz
android_external_sonivox-ee2f2d2b265e9db9da24cd97be0864989f96f3f2.tar.bz2
-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
-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 e8dc463..1ca359e 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -595,8 +595,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;