mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in kortschak/av/gardening/fs (pull request #19) 

all: cleaning up file names and cmd locations
This commit is contained in:
kortschak 2018-05-31 10:14:22 +00:00 committed by Alan Noble
parent 51e2c5c4d6 baf19f1dc5
commit 12c458b415
15 changed files with 47 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,2 +1,9 @@
deps:
@cd rtmp; $(MAKE) all
@echo "\n\nNow run sudo make install-deps\n"
install-deps:
@cd rtmp; $(MAKE) install
all: all:
go build RevidCLI.go go build -o RevidCLI ./cmd/revid-cli

0
basicDriver.go → cmd/basic-driver/main.go
View File

0
RevidCLI.go → cmd/revid-cli/main.go
View File

8
flv/audioTag.go → flv/audio_tag.go
View File

@ -1,15 +1,15 @@
/* /*
NAME NAME
audioTag.go audio_tag.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
AUTHORS AUTHORS
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
audioTag.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) audio_tag.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package flv package flv

8
flv/FLV.go → flv/flv.go
View File

@ -1,15 +1,15 @@
/* /*
NAME NAME
FLV.go flv.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
AUTHORS AUTHORS
Saxon A. Nelson-Milton <saxon@ausocean.org> Saxon A. Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
FLV.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) flv.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package flv package flv

8
flv/videoTag.go → flv/video_tag.go
View File

@ -1,15 +1,15 @@
/* /*
NAME NAME
videoTag.go video_tag.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
AUTHORS AUTHORS
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
videoTag.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) video_tag.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package flv package flv

6
generator/FLVGenerator.go → generator/flv_generator.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
FLVGenerator.go flv_generator.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
FLVGenerator.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) flv_generator.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package generator package generator

6
generator/Generator.go → generator/generator.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
Generator.go generator.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
Generator.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) generator.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package generator package generator

11
generator/MPEGTSGenerator.go → generator/mpegts_generator.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
MPEGTSGenerator.go mpegts_generator.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
MPEGTSGenerator.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) mpegts_generator.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,17 +22,14 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package generator package generator
import ( import (
"bitbucket.org/ausocean/av/mpegts" "bitbucket.org/ausocean/av/mpegts"
"bitbucket.org/ausocean/av/pes" "bitbucket.org/ausocean/av/pes"
/* )
"../mpegts"
"../pes"
*/)
const mpegtsPacketSize = 184 const mpegtsPacketSize = 184

29
generator/tsgenerator_test.go
View File

@ -1,29 +0,0 @@
/*
NAME
RtpToTsConverter.go - provides utilities for the conversion of Rtp packets
to equivalent MpegTs packets.
DESCRIPTION
See Readme.md
AUTHOR
Saxon Nelson-Milton <saxon.milton@gmail.com>
LICENSE
RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
It is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses).
*/
package generator

6
parser/H264Parser.go → parser/h264.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
H264Parser.go h264.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
H264Parser.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) h264.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package parser package parser

10
parser/MJPEGParser.go → parser/mjpeg.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
MJPEGParser.go mjpeg.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org> Saxon Nelson-Milton <saxon@ausocean.org>
LICENSE LICENSE
MJPEGParser.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) mjpeg.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,14 +22,12 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package parser package parser
const ( const frameStartCode = 0xD8
frameStartCode = 0xD8
)
type mjpegParser struct { type mjpegParser struct {
inputBuffer []byte inputBuffer []byte

10
parser/Parser.go → parser/parser.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
Parser.go parser.go
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon.milton@gmail.com> Saxon Nelson-Milton <saxon.milton@gmail.com>
LICENSE LICENSE
RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) parser.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licensesx).
*/ */
package parser package parser
@ -33,9 +33,7 @@ import (
) )
// h264 consts // h264 consts
const ( const acceptedLength = 1000
acceptedLength = 1000
)
var ( var (
Info *log.Logger Info *log.Logger

15
pes/Pes.go → pes/pes.go
View File

@ -1,6 +1,6 @@
/* /*
NAME NAME
PES.go - pes.go -
DESCRIPTION DESCRIPTION
See Readme.md See Readme.md
@ -8,7 +8,7 @@ AUTHOR
Saxon A. Nelson-Milton <saxon.milton@gmail.com> Saxon A. Nelson-Milton <saxon.milton@gmail.com>
LICENSE LICENSE
PES.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean) pes.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
It is free software: you can redistribute it and/or modify them It is free software: you can redistribute it and/or modify them
under the terms of the GNU General Public License as published by the under the terms of the GNU General Public License as published by the
@ -21,19 +21,14 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package pes package pes
import ( import "bitbucket.org/ausocean/av/tools"
"bitbucket.org/ausocean/av/tools"
//"../tools"
)
const ( const maxPesSize = 10000
maxPesSize = 10000
)
/* /*
The below data struct encapsulates the fields of an PES packet. Below is The below data struct encapsulates the fields of an PES packet. Below is

2
pes/pes_test.go
View File

@ -23,7 +23,7 @@ LICENSE
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses). along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
package pes package pes