Merge pull request #353 from l0g1n/fix

[opt] hevc: 增强兼容性，当从seq header中解析vps,sps,pps失败时，尝试使用annexb解析

pkg/hevc/hevc.go

@@ -251,7 +251,44 @@ func ParseVpsSpsPpsFromSeqHeaderWithoutMalloc(payload []byte) (vps, sps, pps []b
 		return nil, nil, nil, nazaerrors.Wrap(base.ErrHevc)
 	}
 
-	return parseVpsSpsPpsFromRecord(payload)
+	vps, sps, pps, err = parseVpsSpsPpsFromRecord(payload)
+	if err != nil {
+		vps, sps, pps, err = parseVpsSpsPpsAnnexbFromRecord(payload)
+	}
+
+	return
+}
+
+func parseVpsSpsPpsAnnexbFromRecord(payload []byte) (vps, sps, pps []byte, err error) {
+	for i := 0; i < len(payload)-4; {
+		start := bytes.Index(payload[i:], NaluStartCode4)
+		if start == -1 {
+			break
+		}
+		i += start
+		var end int
+		if endIdx := bytes.Index(payload[i+4:], NaluStartCode4); endIdx != -1 {
+			end = endIdx + 4
+		} else {
+			end = len(payload) - i
+		}
+		nal := payload[i+4 : i+end]
+		typ := ParseNaluType(nal[0])
+		switch typ {
+		case NaluTypeVps:
+			vps = append(vps, nal...)
+		case NaluTypeSps:
+			sps = append(sps, nal...)
+		case NaluTypePps:
+			pps = append(pps, nal...)
+		}
+		i += end
+	}
+
+	if len(vps) == 0 || len(sps) == 0 || len(pps) == 0 {
+		return nil, nil, nil, nazaerrors.Wrap(base.ErrHevc)
+	}
+	return
 }
 
 func parseVpsSpsPpsFromRecord(payload []byte) (vps, sps, pps []byte, err error) {