sophie/actioncam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed preview streaming (forgot to connect)

Browse source
This commit is contained in:
Jonas Köritz 2019-08-29 14:08:11 +02:00
parent 4f0f595aa0
commit 3006672e43
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -15,10 +15,14 @@ Go Library and command line tool for working with cheap action cameras.
Supplying no additional command will start streaming a preview video stream to your local system. Supplying no additional command will start streaming a preview video stream to your local system.
To view the video use the `camera.sdp` file and open it in a compatible player like VLC. To view the video use the `camera.sdp` file and open it in a compatible player like VLC.
The stream is a RTP stream sent to Port 5220 on localhost containing H.264 data in preview resolution as AVP Type 99. The stream is a RTP stream sent to Port 5220 on localhost containing H.264 data in preview resolution as AVP Type 99. Additionally it is possible to start a crude RTSP-Server that is able to serve a single client.
``` ```
# Start preview streaming via RTP
actioncam <Camera IP> actioncam <Camera IP>
# Start RTSP server and stream preview to connecting
actioncam rtsp <Camera IP>
``` ```
### Shooting a still picture ### Shooting a still picture

6
actioncam.go
View file

@ -46,6 +46,12 @@ func main() {
bufio.NewReader(os.Stdin).ReadBytes('\n') bufio.NewReader(os.Stdin).ReadBytes('\n')
}, },
PreRun: func(cmd *cobra.Command, args []string) {
camera = connectAndLogin(net.ParseIP(args[0]), int(port), username, password, verbose)
},
PostRun: func(cmd *cobra.Command, args []string) {
camera.Disconnect()
},
} }
rootCmd.PersistentFlags().Int16VarP(&port, "port", "P", 6666, "Specify an alternative camera port to connect to") rootCmd.PersistentFlags().Int16VarP(&port, "port", "P", 6666, "Specify an alternative camera port to connect to")

15
rtsp/RTSPServer.go
View file

@ -2,6 +2,7 @@ package rtsp
import ( import (
"bufio" "bufio"
"crypto/md5"
"fmt" "fmt"
"log" "log"
"net" "net"
@ -92,6 +93,8 @@ func (s *Server) handleRequest(packet []string, conn net.Conn) {
} }
} }
session := fmt.Sprintf("%X", md5.Sum([]byte(conn.RemoteAddr().String())))
switch method { switch method {
case "OPTIONS": case "OPTIONS":
writeStatus(conn, 200, "OK") writeStatus(conn, 200, "OK")
@ -119,7 +122,7 @@ func (s *Server) handleRequest(packet []string, conn net.Conn) {
writeStatus(conn, 200, "OK") writeStatus(conn, 200, "OK")
replyCSeq(conn, headers) replyCSeq(conn, headers)
writeHeader(conn, "Transport", headers["Transport"]+";ssrc=0") writeHeader(conn, "Transport", headers["Transport"]+";ssrc=0")
writeHeader(conn, "Session", "1") writeHeader(conn, "Session", session)
conn.Write([]byte("\r\n")) conn.Write([]byte("\r\n"))
case "PLAY": case "PLAY":
@ -128,7 +131,7 @@ func (s *Server) handleRequest(packet []string, conn net.Conn) {
writeStatus(conn, 200, "OK") writeStatus(conn, 200, "OK")
replyCSeq(conn, headers) replyCSeq(conn, headers)
writeHeader(conn, "Session", "1") writeHeader(conn, "Session", session)
writeHeader(conn, "RTP-Info", "url="+request[1]+";seq=0;rtptime=0") writeHeader(conn, "RTP-Info", "url="+request[1]+";seq=0;rtptime=0")
conn.Write([]byte("\r\n")) conn.Write([]byte("\r\n"))
case "TEARDOWN": case "TEARDOWN":
@ -136,6 +139,14 @@ func (s *Server) handleRequest(packet []string, conn net.Conn) {
writeStatus(conn, 200, "OK") writeStatus(conn, 200, "OK")
replyCSeq(conn, headers) replyCSeq(conn, headers)
conn.Write([]byte("\r\n")) conn.Write([]byte("\r\n"))
case "RECORD":
s.camera.StartRecording()
writeStatus(conn, 200, "OK")
replyCSeq(conn, headers)
writeHeader(conn, "Session", session)
conn.Write([]byte("\r\n"))
default: default:
return return
} }