From 33edffc248c8271df85349e72dedc847e90a8004 Mon Sep 17 00:00:00 2001 From: qydysky Date: Wed, 31 Mar 2021 10:26:38 +0800 Subject: [PATCH] =?utf8?q?=E6=BD=9C=E5=9C=A8=E6=B8=85=E6=99=B0=E5=BA=A6bug?= =?utf8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- F/api.go | 7 ++++++- Reply/F.go | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/F/api.go b/F/api.go index 22467a5..a5fa5c3 100644 --- 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 94a18d6..cf28b50 100644 --- 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} -- 2.39.2