From 617e23cee63ec3e77cc0ec7eade2c78060a3f15c Mon Sep 17 00:00:00 2001 From: "braveyao@webrtc.org" Date: Mon, 20 Aug 2012 03:58:41 +0000 Subject: [PATCH] In AVI file header, 'cbSize' might be omitted for PCM audio types. BUG = issue 671 TEST = Manual test Review URL: https://webrtc-codereview.appspot.com/705012 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2641 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/media_file/source/avi_file.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/media_file/source/avi_file.cc b/src/modules/media_file/source/avi_file.cc index 862922838..3b6d778fc 100644 --- a/src/modules/media_file/source/avi_file.cc +++ b/src/modules/media_file/source/avi_file.cc @@ -1651,7 +1651,9 @@ WebRtc_Word32 AviFile::ReadAVIAudioStreamHeader(WebRtc_Word32 endpos) _bytesRead += GetLE32(_audioFormatHeader.nAvgBytesPerSec); _bytesRead += GetLE16(_audioFormatHeader.nBlockAlign); _bytesRead += GetLE16(_audioFormatHeader.wBitsPerSample); - _bytesRead += GetLE16(_audioFormatHeader.cbSize); + if (chunksize > 0x10) { + _bytesRead += GetLE16(_audioFormatHeader.cbSize); + } const WebRtc_UWord32 diffRead = chunksize - (_bytesRead - startRead); if (diffRead > 0)