matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix comparison between different length mode enum types

Browse Source
This commit is contained in:
Srivats P 2021-08-15 18:16:09 +05:30
parent 98f2e9fa6c
commit 226b6cf35c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/streambase.cpp
View File

@ -217,18 +217,18 @@ quint16 StreamBase::frameLen(int streamIndex) const
// Decide a frame length based on length mode // Decide a frame length based on length mode
switch(lenMode()) switch(lenMode())
{ {
case OstProto::StreamCore::e_fl_fixed: case e_fl_fixed:
pktLen = mCore->frame_len(); pktLen = mCore->frame_len();
break; break;
case OstProto::StreamCore::e_fl_inc: case e_fl_inc:
pktLen = frameLenMin() + (streamIndex % pktLen = frameLenMin() + (streamIndex %
(frameLenMax() - frameLenMin() + 1)); (frameLenMax() - frameLenMin() + 1));
break; break;
case OstProto::StreamCore::e_fl_dec: case e_fl_dec:
pktLen = frameLenMax() - (streamIndex % pktLen = frameLenMax() - (streamIndex %
(frameLenMax() - frameLenMin() + 1)); (frameLenMax() - frameLenMin() + 1));
break; break;
case OstProto::StreamCore::e_fl_random: case e_fl_random:
//! \todo (MED) This 'random' sequence is same across iterations //! \todo (MED) This 'random' sequence is same across iterations
pktLen = 64; // to avoid the 'maybe used uninitialized' warning pktLen = 64; // to avoid the 'maybe used uninitialized' warning
qsrand(reinterpret_cast<ulong>(this)); qsrand(reinterpret_cast<ulong>(this));
@ -463,11 +463,11 @@ int StreamBase::frameSizeVariableCount() const
switch(lenMode()) switch(lenMode())
{ {
case OstProto::StreamCore::e_fl_fixed: case e_fl_fixed:
break; break;
case OstProto::StreamCore::e_fl_inc: case e_fl_inc:
case OstProto::StreamCore::e_fl_dec: case e_fl_dec:
case OstProto::StreamCore::e_fl_random: case e_fl_random:
count = qMin(frameLenMax() - frameLenMin() + 1, frameCount()); count = qMin(frameLenMax() - frameLenMin() + 1, frameCount());
break; break;
default: default: