SPDIF: Fix warnings from static analyser

[android-x86/system-media.git] / audio_utils / spdif / SPDIFEncoder.cpp

diff --git a/audio_utils/spdif/SPDIFEncoder.cpp b/audio_utils/spdif/SPDIFEncoder.cpp
index e49e07d..efcd556 100644 (file)
--- a/audio_utils/spdif/SPDIFEncoder.cpp
+++ b/audio_utils/spdif/SPDIFEncoder.cpp
@@ -34,7 +34,8 @@ static int32_t sEndianDetector = 1;
 #define isLittleEndian()  (*((uint8_t *)&sEndianDetector))
 
 SPDIFEncoder::SPDIFEncoder(audio_format_t format)
-  : mSampleRate(48000)
+  : mFramer(NULL)
+  , mSampleRate(48000)
   , mBurstBuffer(NULL)
   , mBurstBufferSizeBytes(0)
   , mRateMultiplier(1)
@@ -54,11 +55,13 @@ SPDIFEncoder::SPDIFEncoder(audio_format_t format)
             mFramer = new DTSFrameScanner();
             break;
         default:
-            ALOGE("SPDIFEncoder: ERROR invalid audio format = 0x%08X", format);
-            mFramer = NULL;
             break;
     }
 
+    // This a programmer error. Call isFormatSupported() first.
+    LOG_ALWAYS_FATAL_IF((mFramer == NULL),
+        "SPDIFEncoder: invalid audio format = 0x%08X", format);
+
     mBurstBufferSizeBytes = sizeof(uint16_t)
             * SPDIF_ENCODED_CHANNEL_COUNT
             * mFramer->getMaxSampleFramesPerSyncFrame();
@@ -100,6 +103,8 @@ int SPDIFEncoder::getBytesPerOutputFrame()
 
 void SPDIFEncoder::writeBurstBufferShorts(const uint16_t *buffer, size_t numShorts)
 {
+    // avoid static analyser warning
+    LOG_ALWAYS_FATAL_IF((mBurstBuffer == NULL), "mBurstBuffer never allocated");
     mByteCursor = (mByteCursor + 1) & ~1; // round up to even byte
     size_t bytesToWrite = numShorts * sizeof(uint16_t);
     if ((mByteCursor + bytesToWrite) > mBurstBufferSizeBytes) {