Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Final push
  • Loading branch information
vasanthkalingeri committed Aug 24, 2015
1 parent f8f0172 commit c99a97f
Show file tree
Hide file tree
Showing 81 changed files with 23,275 additions and 78 deletions.
4 changes: 2 additions & 2 deletions data/2015-04-28_0635_US_KABC_Jimmy_Kimmel_Live.txt
@@ -1,7 +1,7 @@
00:00:00 - 00:11:22 = unclassified
00:11:22 - 00:11:52 = ad by Horizon
00:11:52 - 00:12:07 = ad by
00:12:07 - 00:12:37 = ad by Cuero
00:11:52 - 00:12:07 = ad by Cuero
00:12:07 - 00:12:37 = ad by Macy's
00:12:37 - 00:12:53 = ad by Expedia
00:12:53 - 00:13:07 = ad by Lipton
00:13:07 - 00:13:22 = ad by breathe right
Expand Down
41 changes: 28 additions & 13 deletions dependencies.sh
Expand Up @@ -10,38 +10,50 @@
# django >= 1.6.1

echo "Installing ffmpeg"
sudo add-apt-repository ppa:mc3man/trusty-media
sudo apt-get update
sudo apt-get install ffmpeg gstreamer0.10-ffmpeg
sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev
sudo apt-get install build-essential libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config libfaac-dev libopenjpeg-dev libx264-dev libvpx-dev
mkdir software
cd software
wget http://ffmpeg.org/releases/ffmpeg-2.7.2.tar.bz2
cd ..
mkdir src
cd src
tar xvjf ../software/ffmpeg-2.7.2.tar.bz2
cd ffmpeg-2.7.2
./configure --enable-gpl --enable-postproc --enable-swscale --enable-avfilter --enable-libmp3lame --enable-libvorbis --enable-libtheora --enable-libx264 --enable-libspeex --enable-shared --enable-pthreads --enable-libopenjpeg --enable-libfaac --enable-nonfree --enable-libvpx
sudo make -j 2
sudo make install
sudo ldconfig

echo "Installing python-pip"
sudo apt-get install python-pip

echo "Installing OpenCV"
sudo apt-get install python-opencv

echo "Insatlling numpy"
#sudo apt-get install python-numpy
sudo pip install numpy;

echo "Installing scipy"
sudo apt-get install python-scipy
sudo pip install scipy;

echo "Installing pyaudio"
#For x86, change amd64 to x86 and it works
wget https://people.csail.mit.edu/hubert/pyaudio/packages/python-pyaudio_0.2.8-1_amd64.deb;
sudo dpkg -i python-pyaudio_0.2.8-1_amd64.deb

echo "Installing matplotlib"
sudo apt-get install python-matplotlib
sudo pip install matplotlib;

echo "Installing pydub"
cd /home/vasanth/packages/pydub-0.14.0
sudo python setup.py install
sudo pip install pydub;

echo "Installing mysql"
sudo apt-get install mysql-server
sudo apt-get install mysql-client
sudo apt-get install python-dev libmysqlclient-dev

echo "Installing django"
sudo apt-get install python-django
sudo pip install django;

echo "Installing mysqldb"
sudo apt-get install python-mysql
Expand All @@ -51,11 +63,14 @@ git clone https://github.com/vasanthkalingeri/dejavu.git
cd dejavu
sudo python setup.py install

echo "Installing apache"
sudo apt-get install apache2 libapache2-mod-wsgi
echo "Installing nginx"
sudo apt-get install nginx

echo "Installing gunicorn"
pip install gunicorn

#When port audio has trouble installing run the following
#Download the .deb package of portaudio, the following is for amd64
#Download the .deb package of portaudio, the following is for amd64, change it to x86 if required.

#wget libportaudio-ocaml_0.2.0-1+b2_amd64.deb
#sudo dpkg -i libportaudio-ocaml_0.2.0-1+b2_amd64.deb
Expand Down
13 changes: 13 additions & 0 deletions nginx_conf_debian_server
@@ -0,0 +1,13 @@
server {
listen 89;
access_log /root/access.log;
error_log /root/error.log;
location /static {
root /var/www/CommercialDetection/src/web/output/;
}

location / {
proxy_pass http://127.0.0.1:8000;
}
}

14 changes: 0 additions & 14 deletions server_apache_config

This file was deleted.

48 changes: 0 additions & 48 deletions src/config.ini

This file was deleted.

4 changes: 3 additions & 1 deletion src/web/manage.py
Expand Up @@ -6,5 +6,7 @@
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "web.settings")

from django.core.management import execute_from_command_line

execute_from_command_line(sys.argv)


Binary file modified src/web/output/views.pyc 100755 → 100644
Binary file not shown.
1 change: 1 addition & 0 deletions src/web/start_server.sh
@@ -0,0 +1 @@
gunicorn -D web.wsgi:application --bind=127.0.0.1:8000

0 comments on commit c99a97f

Please sign in to comment.