diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-06-04 22:33:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 22:33:58 +0000 |
| commit | a433608d3230a3986671801a1bc41dda06e4627f (patch) | |
| tree | 625ee9efedac1010d9af3b4bb184ee4fb4f6e874 | |
| parent | bf3152158263633892ed730237388ce850cf4f1d (diff) | |
| parent | 0d4d82daff89115d5a6318c53f94f22fa36a862b (diff) | |
| download | android_frameworks_wilhelm-a433608d3230a3986671801a1bc41dda06e4627f.tar.gz android_frameworks_wilhelm-a433608d3230a3986671801a1bc41dda06e4627f.tar.bz2 android_frameworks_wilhelm-a433608d3230a3986671801a1bc41dda06e4627f.zip | |
Merge "Compare raw pointers to NULL" into mnc-dev
| -rw-r--r-- | src/data.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -425,20 +425,20 @@ static SLresult checkDataFormat(const char *name, void *pFormat, DataFormat *pDa // check the container bit depth switch (pDataFormat->mPCM.containerSize) { case 8: - if (df_representation && + if (df_representation != NULL && *df_representation != SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT) { result = SL_RESULT_PARAMETER_INVALID; } break; case 16: case 24: - if (df_representation && + if (df_representation != NULL && *df_representation != SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT) { result = SL_RESULT_PARAMETER_INVALID; } break; case 32: - if (df_representation + if (df_representation != NULL && *df_representation != SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT && *df_representation != SL_ANDROID_PCM_REPRESENTATION_FLOAT) { result = SL_RESULT_PARAMETER_INVALID; |