Skip to content
Browse files

Merge pull request #4461 from fritsch/activeae-coverity

AE: coverity changes
  • Loading branch information...
2 parents c0ed440 + b32bcf7 commit ca7361f184402b1475f434603d898c444aca88de @jmarshallnz jmarshallnz committed
Showing with 4 additions and 2 deletions.
  1. +2 −0 xbmc/cores/AudioEngine/AESinkFactory.cpp
  2. +2 −2 xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
View
2 xbmc/cores/AudioEngine/AESinkFactory.cpp
@@ -247,8 +247,10 @@ void CAESinkFactory::EnumerateEx(AESinkInfoList &list, bool force)
info.m_sinkName = "ALSA";
CAESinkALSA::EnumerateDevicesEx(info.m_deviceInfoList, force);
if(!info.m_deviceInfoList.empty())
+ {
list.push_back(info);
return;
+ }
#endif
info.m_deviceInfoList.clear();
View
4 xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
@@ -473,7 +473,7 @@ unsigned int CAEStreamInfo::SyncDTS(uint8_t *data, unsigned int size)
break;
}
dtsBlocks = (((data[5] & 0x7) << 4) | ((data[6] & 0x3C) >> 2)) + 1;
- m_fsize = ((((data[6] & 0x3 << 8) | data[7]) << 4) | ((data[8] & 0x3C) >> 2)) + 1;
+ m_fsize = (((((data[6] & 0x3) << 8) | data[7]) << 4) | ((data[8] & 0x3C) >> 2)) + 1;
amode = ((data[8] & 0x3) << 4) | ((data[9] & 0xF0) >> 4);
sfreq = data[9] & 0xF;
lfe = (data[12] & 0x18) >> 3;
@@ -489,7 +489,7 @@ unsigned int CAEStreamInfo::SyncDTS(uint8_t *data, unsigned int size)
break;
}
dtsBlocks = (((data[4] & 0x7) << 4) | ((data[7] & 0x3C) >> 2)) + 1;
- m_fsize = ((((data[7] & 0x3 << 8) | data[6]) << 4) | ((data[9] & 0x3C) >> 2)) + 1;
+ m_fsize = (((((data[7] & 0x3) << 8) | data[6]) << 4) | ((data[9] & 0x3C) >> 2)) + 1;
amode = ((data[9] & 0x3) << 4) | ((data[8] & 0xF0) >> 4);
sfreq = data[8] & 0xF;
lfe = (data[13] & 0x18) >> 3;

0 comments on commit ca7361f

Please sign in to comment.
Something went wrong with that request. Please try again.