Rewrite FLV/RTMP clients
This commit is contained in:
@@ -53,11 +53,8 @@ func handleHTTP(url string) (core.Producer, error) {
|
||||
return multipart.NewClient(res)
|
||||
|
||||
case "video/x-flv":
|
||||
var client *flv.Client
|
||||
if client, err = flv.NewClient(res.Body); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = client.Describe(); err != nil {
|
||||
client, err := flv.Open(res.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client.URL = url
|
||||
|
||||
@@ -23,9 +23,6 @@ func streamsHandle(url string) (core.Producer, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = client.Describe(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return client, nil
|
||||
}
|
||||
|
||||
@@ -42,17 +39,12 @@ func apiHandle(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
client, err := flv.NewClient(r.Body)
|
||||
client, err := flv.Open(r.Body)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
if err = client.Describe(); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
stream.AddProducer(client)
|
||||
|
||||
if err = client.Start(); err != nil && err != io.EOF {
|
||||
|
||||
Reference in New Issue
Block a user