mirror of https://bitbucket.org/ausocean/av.git
updating remote
This commit is contained in:
parent
77ed186529
commit
d718534f0f
|
@ -29,7 +29,7 @@ package generator
|
|||
import (
|
||||
"bitbucket.org/ausocean/av/flv"
|
||||
//"../flv"
|
||||
_ "fmt"
|
||||
_"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
@ -110,10 +110,14 @@ func (g *flvGenerator) GenHeader() {
|
|||
func (g *flvGenerator) getNextTimestamp() (timestamp uint32) {
|
||||
if g.firstTag {
|
||||
g.startTime = time.Now()
|
||||
firstTage = false
|
||||
g.firstTag = false
|
||||
timestamp = 0
|
||||
return
|
||||
}
|
||||
timestamp = g.currentTimestamp
|
||||
g.currentTimestamp += uint32(time.Now().sub(g.startTime).Seconds()*float64(1000))
|
||||
//timestamp = g.currentTimestamp
|
||||
//g.currentTimestamp += 40
|
||||
timestamp = uint32(time.Now().Sub(g.startTime).Seconds()*float64(1000))
|
||||
//fmt.Printf("timestamp: %v", timestamp)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -461,7 +461,7 @@ func (r *revidInst) setupInputForRaspivid() error {
|
|||
"-o", "-",
|
||||
"-n",
|
||||
"-t", r.config.Timeout,
|
||||
"-b", "10000",
|
||||
"-b", "500000",
|
||||
//"-qp", r.config.Quantization,
|
||||
"-w", r.config.Width,
|
||||
"-h", r.config.Height,
|
||||
|
|
|
@ -188,7 +188,8 @@ func TestRaspividToRtmp(t *testing.T){
|
|||
return
|
||||
}
|
||||
revidInst.Start()
|
||||
time.Sleep(240*time.Second)
|
||||
time.Sleep(43200*time.Second)
|
||||
revidInst.Stop()
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -26,9 +26,9 @@ LICENSE
|
|||
*/
|
||||
package rtmp
|
||||
|
||||
// #cgo CFLAGS: -I/home/saxon/Desktop/AusOcean/av/rtmp/
|
||||
// #cgo CFLAGS: -I/home/saxon/Desktop/AusOcean/av/rtmp/rtmp_c/librtmp
|
||||
// #cgo LDFLAGS: /home/saxon/Desktop/AusOcean/av/rtmp/rtmp_c/librtmp/librtmp.a
|
||||
// #cgo CFLAGS: -I/home/pi/go/src/bitbucket.org/AusOcean/av/rtmp/
|
||||
// #cgo CFLAGS: -I/home/pi/go/src/bitbucket.org/ausocean/av/rtmp/rtmp_c/librtmp
|
||||
// #cgo LDFLAGS: /home/pi/go/src/bitbucket.org/ausocean/av/rtmp/rtmp_c/librtmp/librtmp.a
|
||||
// #cgo LDFLAGS: -lssl -lcrypto -lz
|
||||
// #include <RTMPWrapper.h>
|
||||
import "C"
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1 @@
|
|||
librtmp.so.1
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue