潜在清晰度bug修复

diff --git a/F/api.go b/F/api.go
index 22467a5d9b046e1bd7954f61c85f54c425c9c3fc..a5fa5c304eeb6e2e532566d142f293a32fdd66df 100644 (file)
--- a/F/api.go
+++ b/F/api.go
@@ -600,7 +600,12 @@ func getRoomPlayInfoByQn() (missKey []string) {
                                }
                        }
                }
-               apilog.L(`I: `,c.AcceptQn[c.Live_qn])
+               if s,ok := c.AcceptQn[c.Live_qn];!ok{
+                       apilog.L(`W: `, `未知清晰度`, c.Live_qn)
+               } else {
+                       apilog.L(`I: `, s)
+
+               }
 
        }
        return

diff --git a/Reply/F.go b/Reply/F.go
index 94a18d6807d4df98dcdc5b3045e4ab7415e54462..cf28b504753d666eb4e436ceb5d60a7f15d62738 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -221,7 +221,22 @@ func Saveflvf(){
        qn, ok := c.K_v.LoadV("flv直播流清晰度").(float64)
        if !ok || qn < 0 {return}
 
-       c.Live_qn = int(qn)
+       {
+               AcceptQn := []int{}
+               for k,_ := range c.AcceptQn {
+                       if k <= int(qn) {AcceptQn = append(AcceptQn, k)}
+               }
+               MaxQn := 0
+               for i:=0; len(AcceptQn)>i; i+=1{
+                       if AcceptQn[i] > MaxQn {
+                               MaxQn = AcceptQn[i]
+                       }
+               }
+               if MaxQn == 0 {
+                       l.L(`W: `,"使用默认清晰度")
+               }
+               c.Live_qn = MaxQn
+       }
 
        if saveflv.cancel.Islive() {return}
 
@@ -229,7 +244,7 @@ func Saveflvf(){
        for {
                F.Get(`Liveing`)
                if !c.Liveing {break}
-               
+
                F.Get(`Live`)
                if len(c.Live)==0 {break}