diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp
index cfcd8b4..16e7df5 100644
--- a/media/libnbaio/NBAIO.cpp
+++ b/media/libnbaio/NBAIO.cpp
@@ -24,8 +24,7 @@
 
 size_t Format_frameSize(const NBAIO_Format& format)
 {
-    // FIXME The sample format is hard-coded to AUDIO_FORMAT_PCM_16_BIT
-    return Format_channelCount(format) * sizeof(short);
+    return format.mFrameSize;
 }
 
 int Format_frameBitShift(const NBAIO_Format& format)