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
commit 12c458b415
15 changed files with 47 additions and 81 deletions

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:
go build RevidCLI.go
go build -o RevidCLI ./cmd/revid-cli

View File

@ -1,6 +1,6 @@
/*
NAME
audioTag.go
audio_tag.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHORS
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package flv

View File

@ -1,6 +1,6 @@
/*
NAME
FLV.go
flv.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHORS
Saxon A. Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package flv

View File

@ -1,6 +1,6 @@
/*
NAME
videoTag.go
video_tag.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHORS
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package flv

View File

@ -1,6 +1,6 @@
/*
NAME
FLVGenerator.go
flv_generator.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package generator

View File

@ -1,6 +1,6 @@
/*
NAME
Generator.go
generator.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package generator

View File

@ -1,6 +1,6 @@
/*
NAME
MPEGTSGenerator.go
mpegts_generator.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,17 +22,14 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package generator
import (
"bitbucket.org/ausocean/av/mpegts"
"bitbucket.org/ausocean/av/pes"
/*
"../mpegts"
"../pes"
*/)
)
const mpegtsPacketSize = 184

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

View File

@ -1,6 +1,6 @@
/*
NAME
H264Parser.go
h264.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package parser

View File

@ -1,6 +1,6 @@
/*
NAME
MJPEGParser.go
mjpeg.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org>
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
under the terms of the GNU General Public License as published by the
@ -22,14 +22,12 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package parser
const (
frameStartCode = 0xD8
)
const frameStartCode = 0xD8
type mjpegParser struct {
inputBuffer []byte

View File

@ -1,6 +1,6 @@
/*
NAME
Parser.go
parser.go
DESCRIPTION
See Readme.md
@ -9,7 +9,7 @@ AUTHOR
Saxon Nelson-Milton <saxon.milton@gmail.com>
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
under the terms of the GNU General Public License as published by the
@ -22,7 +22,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licensesx).
*/
package parser
@ -33,9 +33,7 @@ import (
)
// h264 consts
const (
acceptedLength = 1000
)
const acceptedLength = 1000
var (
Info *log.Logger

View File

@ -1,6 +1,6 @@
/*
NAME
PES.go -
pes.go -
DESCRIPTION
See Readme.md
@ -8,7 +8,7 @@ AUTHOR
Saxon A. Nelson-Milton <saxon.milton@gmail.com>
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
under the terms of the GNU General Public License as published by the
@ -21,19 +21,14 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package pes
import (
"bitbucket.org/ausocean/av/tools"
//"../tools"
)
import "bitbucket.org/ausocean/av/tools"
const (
maxPesSize = 10000
)
const maxPesSize = 10000
/*
The below data struct encapsulates the fields of an PES packet. Below is

View File

@ -23,7 +23,7 @@ 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).
along with revid in gpl.txt. If not, see http://www.gnu.org/licenses.
*/
package pes