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

filter: benchmark: chaning descriptions

This commit is contained in:
Ella Pietraroia 2020-02-07 10:05:07 +10:30
parent 73454cb9bc
commit b0dbc25fd2
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
filter/filter_test.go
View File

@ -22,11 +22,14 @@ LICENSE
in gpl.txt. If not, see http://www.gnu.org/licenses. in gpl.txt. If not, see http://www.gnu.org/licenses.
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
======= =======
// To make a new file for testing please go to test repository test/test-data/av/input/motion-detection/byte_saver.go. // To make a new file for testing please go to test repository test/test-data/av/input/motion-detection/byte_saver.go.
>>>>>>> 749cfa17... filter: benchmarks: tidying up code >>>>>>> 749cfa17... filter: benchmarks: tidying up code
=======
>>>>>>> 03d46b19... filter: benchmark: chaning descriptions
package filter package filter
import ( import (

10
filter/tests.go
View File

@ -1,14 +1,24 @@
/* /*
DESCRIPTION DESCRIPTION
<<<<<<< HEAD
tests.go contains 15 JPEG frames in hex used for testing in filter_test.go. tests.go contains 15 JPEG frames in hex used for testing in filter_test.go.
These are used to test the benchmarking for the filters found in this These are used to test the benchmarking for the filters found in this
folder, the output of the filters can be found in testout/test_outFILTER.mjpeg folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
=======
tests.go contains JPEG frames used for testing in jpeg_test.go.
These are used to test the benchmarking for the filters found in this
folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
>>>>>>> 03d46b19... filter: benchmark: chaning descriptions
AUTHOR AUTHOR
Ella Pietraroia <ella@ausocean.org> Ella Pietraroia <ella@ausocean.org>
LICENSE LICENSE
<<<<<<< HEAD
Copyright (C) 2020 the Australian Ocean Lab (AusOcean) Copyright (C) 2020 the Australian Ocean Lab (AusOcean)
=======
Copyright (C) 2019 the Australian Ocean Lab (AusOcean)
>>>>>>> 03d46b19... filter: benchmark: chaning descriptions
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