|
@@ -225,8 +225,17 @@ class Quality
|
|
|
if($match_ratio)
|
|
|
{
|
|
|
$result = [];
|
|
|
+ $compare = false;
|
|
|
foreach ($qualities as $quality)
|
|
|
{
|
|
|
+ if($compare == false)
|
|
|
+ {
|
|
|
+ if($quality == $cur_quality) {
|
|
|
+ $compare = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if($compare == false) continue;
|
|
|
+
|
|
|
$per_secs = $this->mSpeeds[$quality]['per_secs'];
|
|
|
$left_time -= $per_secs;
|
|
|
if($left_time > 0) {
|
|
@@ -247,6 +256,7 @@ class Quality
|
|
|
{
|
|
|
$per_secs = $this->mSpeeds[$quality]['per_secs'];
|
|
|
$qsecs = $this->mRatioCtl->seconds($mchid, $quality);
|
|
|
+ Log::record("left_time={$left_time} quality={$quality} secs={$qsecs}",Log::DEBUG);
|
|
|
if($qsecs == false) continue;
|
|
|
|
|
|
if($left_time - $qsecs > 0) {
|
|
@@ -260,6 +270,10 @@ class Quality
|
|
|
else {
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
+ if($quality == $cur_quality) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
$result = array_reverse($result);
|
|
|
|