Skip to content

Commit

Permalink
relaxing image comparison factor, modified build process
Browse files Browse the repository at this point in the history
  • Loading branch information
hyades committed Sep 4, 2013
1 parent 18ba417 commit cebbb8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .travis-setup.sh
Expand Up @@ -8,15 +8,14 @@ sudo apt-get install python-gi python3-gi gstreamer1.0-tools gir1.2-gstreamer-1.
sudo apt-get install python-scipy ffmpeg
sudo apt-get build-dep gstreamer1.0
sudo apt-get install autoconf automake autopoint libbz2-dev libdv4-dev libfaac-dev libfaad-dev libgtk-3-dev libmjpegtools-dev libtag1-dev libasound2-dev libtool libvpx-dev libxv-dev libx11-dev libogg-dev libvorbis-dev libopencv-dev libcv-dev libhighgui-dev libv4l-dev pkg-config zlib1g-dev gtk-doc-tools yasm bison flex
mkdir -p /usr/lib/pkgconfig
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
git clone http://git.chromium.org/webm/libvpx.git
cd libvpx
git checkout v1.2.0
./configure --prefix=/usr/local --enable-shared --enable-vp8
make
sudo make install
cd ..
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
git clone git://anongit.freedesktop.org/gstreamer/gstreamer
cd gstreamer
./autogen.sh --prefix=/usr/local
Expand Down
7 changes: 2 additions & 5 deletions python-api/tests/integrationtests/compare.py
Expand Up @@ -73,16 +73,13 @@ def generate_frames(self, directory=REF_FRAME_DIR):
cmd1.split(),
bufsize=-1,
shell=False)
o, e = proc.communicate()
print o
proc.wait()

proc = subprocess.Popen(
cmd2.split(),
bufsize=-1,
shell=False)
o, e = proc.communicate()
print o

proc.wait()


class GenerateReferenceFrames(BaseCompareVideo):
Expand Down
8 changes: 4 additions & 4 deletions python-api/tests/integrationtests/test_controller.py
Expand Up @@ -351,7 +351,7 @@ def verify_output(self, mode, video):
res1, res2 = cmpr.compare()
print "RESULTS", res1, res2
# TODO Experimental Value
if res1 == 0 and res2 == 0:
if res1 <= 0.04 and res2 <= 0.04:
return True
return False

Expand Down Expand Up @@ -455,7 +455,7 @@ def verify_output(self, index, video):
res1, res2 = cmpr.compare()
print "RESULTS", res1, res2
# TODO Experimental Value
if res1 == 0 and res2 == 0:
if res1 <= 0.04 and res2 <= 0.04:
return True
return False

Expand Down Expand Up @@ -562,7 +562,7 @@ def verify_output(self, index, video):
res1, res2 = cmpr.compare()
print "RESULTS", res1, res2
# TODO Experimental Value
if res1 == 0 and res2 == 0:
if res1 <= 0.04 and res2 <= 0.04:
return True
return False

Expand Down Expand Up @@ -623,7 +623,7 @@ def verify_output(self, index, video):
res1, res2 = cmpr.compare()
print "RESULTS", res1, res2
# TODO Experimental Value
if res1 == 0 and res2 == 0:
if res1 <= 0.04 and res2 <= 0.04:
return True
return False

Expand Down

0 comments on commit cebbb8a

Please sign in to comment.