diff --git a/revid/cmd/h264-file-to-flv-file/main.go b/revid/cmd/h264-file-to-flv-file/main.go deleted file mode 100644 index 880b0c51..00000000 --- a/revid/cmd/h264-file-to-flv-file/main.go +++ /dev/null @@ -1,61 +0,0 @@ -/* -NAME - main.go - -DESCRIPTION - See Readme.md - -AUTHOR - Saxon Nelson-Milton - -LICENSE - main.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 h264FileToFlvFileTest - -import ( - "testing" - "time" -) - -const ( - runDuration = 30 * time.Second - inputFile = "betterInput.h264" - outputFile = "saxonOut.flv" - frameRate = "25" -) - -// Test h264 inputfile to flv output files -func TestFlvOutputFile(t *testing.T) { - config := Config{ - Input: File, - InputFileName: inputFile, - InputCodec: H264, - Output: File, - OutputFileName: outputFile, - Packetization: Flv, - FrameRate: frameRate, - } - revidInst, err := NewRevidInstance(config) - if err != nil { - t.Errorf("Should not of have got an error!: %v\n", err.Error()) - return - } - revidInst.Start() - time.Sleep(runDuration) - revidInst.Stop() -} diff --git a/revid/cmd/h264-file-to-mpegts-file/main.go b/revid/cmd/h264-file-to-mpegts-file/main.go deleted file mode 100644 index 5300cab7..00000000 --- a/revid/cmd/h264-file-to-mpegts-file/main.go +++ /dev/null @@ -1,56 +0,0 @@ -/* -NAME - main.go - -DESCRIPTION - See Readme.md - -AUTHOR - Saxon Nelson-Milton - -LICENSE - main.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 fileToMpegTsTest - -import ( - "testing" - "time" -) - -const ( - runDuration = 100 * time.Second - inputFile = "testInput.h264" - outputFile = "output/TestFileAsInput.ts" -) - -func main(t *testing.T) { - config := Config{ - Input: File, - InputFileName: inputFile, - Output: File, - OutputFileName: outputFile, - } - revidInst, err := NewRevidInstance(config) - if err != nil { - t.Errorf("Should not have got error!: %v\n", err.Error()) - return - } - revidInst.Start() - time.Sleep(runDuration) - revidInst.Stop() -} diff --git a/revid/cmd/h264-raspivid-to-flv-rtmp/main.go b/revid/cmd/h264-raspivid-to-flv-rtmp/main.go deleted file mode 100644 index fabeb7e7..00000000 --- a/revid/cmd/h264-raspivid-to-flv-rtmp/main.go +++ /dev/null @@ -1,64 +0,0 @@ -/* -NAME - main.go - -DESCRIPTION - See Readme.md - -AUTHOR - Saxon Nelson-Milton - -LICENSE - main.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 raspividH264ToFlvRtmpTest - -import ( - "testing" - "time" - - "bitbucket.org/ausocean/test" -) - -const ( - rtmpUrl = "rtmp://a.rtmp.youtube.com/live2/w44c-mkuu-aezg-ceb1" - bitrate = "500000" - frameRate = "25" - runDuration = 43200 * time.Second -) - -// Test revidInst with a Raspivid h264 input -func TestRaspividToRtmp(t *testing.T) { - config := Config{ - Input: Raspivid, - Output: Rtmp, - RtmpMethod: LibRtmp, - QuantizationMode: QuantizationOff, - RtmpUrl: rtmpUrl, - Bitrate: bitrate, - Packetization: Flv, - FrameRate: frameRate, - } - revidInst, err := NewRevid(config) - if err != nil { - t.Errorf("Should not have got an error!") - return - } - revidInst.Start() - time.Sleep(runDuration) - revidInst.Stop() -} diff --git a/revid/cmd/h264-raspivid-to-mpegts-file/main.go b/revid/cmd/h264-raspivid-to-mpegts-file/main.go deleted file mode 100644 index 86c0b36a..00000000 --- a/revid/cmd/h264-raspivid-to-mpegts-file/main.go +++ /dev/null @@ -1,61 +0,0 @@ -/* -NAME - main.go - -DESCRIPTION - See Readme.md - -AUTHOR - Saxon Nelson-Milton - -LICENSE - main.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 raspividToMpegTsTest - -import ( - "testing" - "time" -) - -const ( - outputFile = "output/TestRaspividOutput.ts" - width = "1280" - height = "720" - frameRate = "25" - runDuration = 100 * time.Second -) - -// Test revidInst with a Raspivid h264 input -func TestRaspividH264Input(t *testing.T) { - config := Config{ - Input: Raspivid, - Output: File, - OutputFileName: outputFile, - Width: width, - Height: height, - FrameRate: frameRate, - } - revidInst, err := NewRevidInstance(config) - if err != nil { - t.Errorf("Should not have got an error!") - return - } - revidInst.Start() - time.Sleep(runDuration) - revidInst.Stop() -} diff --git a/revid/cmd/h264-raspivid-to-mpegts-http/main.go b/revid/cmd/h264-raspivid-to-mpegts-http/main.go deleted file mode 100644 index 7bf2e5b9..00000000 --- a/revid/cmd/h264-raspivid-to-mpegts-http/main.go +++ /dev/null @@ -1,37 +0,0 @@ -/* -NAME - main.go - -DESCRIPTION - See Readme.md - -AUTHOR - Saxon Nelson-Milton - -LICENSE - main.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). -*/ - -// TODO: create test case for raspivid h264 to mpegts http endpoint testing - -package raspividH264ToMpegTsHttpTest - -/* -import ( - "testing" - "time" -) -*/ diff --git a/revid/cmd/mjpeg-raspivid-to-jpeg-file/main.go b/revid/cmd/mjpeg-raspivid-to-jpeg-file/main.go deleted file mode 100644 index 25f24ba9..00000000 --- a/revid/cmd/mjpeg-raspivid-to-jpeg-file/main.go +++ /dev/null @@ -1,64 +0,0 @@ -/* -NAME - main.go - -DESCRIPTION - See Readme.md - -AUTHOR - Saxon Nelson-Milton - -LICENSE - main.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 raspividToMjpegTest - -import ( - "testing" - "time" -) - -const ( - outputFile = "output/TestMjpeg.mjpeg" - width = "1280" - bitrate = "10000000" - height = "720" - frameRate = "25" - runDuration = 20 * time.Second -) - -// Test revidInst with a raspivid mjpeg input -func TestRaspividMJPEGInput(t *testing.T) { - config := Config{ - Input: Raspivid, - InputCodec: Mjpeg, - Output: File, - OutputFileName: outputFile, - Width: width, - Bitrate: bitrate, - Height: height, - FrameRate: frameRate, - } - revidInst, err := NewRevidInstance(config) - if err != nil { - t.Errorf("Should not of have got an error!: %v\n", err.Error()) - return - } - revidInst.Start() - time.Sleep(runDuration) - revidInst.Stop() -} diff --git a/rtmp/rtmp.go b/rtmp/rtmp.go index e0bda31c..37c435d0 100644 --- a/rtmp/rtmp.go +++ b/rtmp/rtmp.go @@ -30,7 +30,7 @@ package rtmp /* #cgo CFLAGS: -I/usr/local/include/librtmp -#cgo LDFLAGS: -L/usr/local/lib -lrtmp +#cgo LDFLAGS: -lrtmp -Wl,-rpath=/usr/local/lib #include #include