From b0dbc25fd2ddb9992ae05225f3e4e49a2893593f Mon Sep 17 00:00:00 2001 From: Ella Pietraroia Date: Fri, 7 Feb 2020 10:05:07 +1030 Subject: [PATCH] filter: benchmark: chaning descriptions --- filter/filter_test.go | 3 +++ filter/tests.go | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/filter/filter_test.go b/filter/filter_test.go index dfa21cd5..ff7bde4b 100644 --- a/filter/filter_test.go +++ b/filter/filter_test.go @@ -22,11 +22,14 @@ LICENSE in gpl.txt. If not, see http://www.gnu.org/licenses. */ +<<<<<<< HEAD <<<<<<< HEAD ======= // 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 +======= +>>>>>>> 03d46b19... filter: benchmark: chaning descriptions package filter import ( diff --git a/filter/tests.go b/filter/tests.go index e40a697b..51697e9c 100644 --- a/filter/tests.go +++ b/filter/tests.go @@ -1,14 +1,24 @@ /* DESCRIPTION +<<<<<<< HEAD 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 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 Ella Pietraroia LICENSE +<<<<<<< HEAD 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 under the terms of the GNU General Public License as published by the