Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes from Mr-Dave Master #29

Closed
wants to merge 44 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
048791e
Merge tosiara/rtsp branch (commit 46cfcf31d, 2014/05/21)
Jun 14, 2014
976fe42
Removed compiler warnings and small bug fix for webhttpd.c
Jun 14, 2014
b6f8c44
RTSP and Configure revisions
Jun 14, 2014
fe8c801
Plug memory leaks in RTSP
Jun 14, 2014
0ba3f6c
Undo changes from code editor and other unnecessary changes
Jun 15, 2014
8060fd2
Remove conf files
Jun 15, 2014
d11348b
Call to netcam_shutdown_rtsp moved.
Jun 16, 2014
87d271e
Regession fix for memory leaks and reconnection.
Jun 18, 2014
ca413db
Added support for libav V53
Jun 20, 2014
9d07be5
Added support for libav V53
Jun 20, 2014
225804c
RTSP fully functional with Libav packages(0.8 and 0.9) in addition to…
Jun 21, 2014
abfd68a
Updated configure
Jun 24, 2014
4a8f8de
Remove some files that should not be in source tree
tosiara Jun 24, 2014
68cb3fe
Restored 0644 permissions for some files
tosiara Jun 24, 2014
6c8ab87
Updated CHANGELOG with credits for some previous commits
tosiara Jun 24, 2014
e459e30
Merge pull request #9 from tosiara/rtsp-mr-dave
Mr-Dave Jun 25, 2014
cdfcdc2
Additional validations for successful connection and clean up messages
Jun 27, 2014
7c3164c
Isolate RTSP and revise configure
Jun 28, 2014
05f915c
Merge branch 'master' into unstable
Jun 28, 2014
b9b4ef6
New configure and isolation of RTSP
Jun 28, 2014
51aa406
Merge pull request #1 from Mr-Dave/unstable
tosiara Jun 30, 2014
4d8b57f
Additional validations on rtsp start
Jul 4, 2014
42403e6
Merge Mr-Dave ustable branch into local rtsp-mr-dave
tosiara Jul 4, 2014
546727b
Implement init of AV libraries from bcl fork and clean up
Jul 5, 2014
b993616
Merge with unstable
Jul 5, 2014
8b12669
Gray image upon disconnection
bsb002-flash-tester Jul 7, 2014
eeafdf7
Add grey picture on rtsp disconnect by Mr-Dave https://github.com/Mr-…
tosiara Jul 8, 2014
e85feb0
Add config option for transport from Hyberbolic2346 commit 423ef7bb
bsb002-flash-tester Jul 9, 2014
e9abd61
Revised motion-dist
bsb002-flash-tester Jul 12, 2014
eb8e2e2
Merge pull request #4 from tosiara/mr-dave-pull-request
tosiara Jul 23, 2014
c6a7bae
Removed motion-dist.conf, it is autogenerated upon configure
tosiara Jul 23, 2014
259f959
Whitespace fix
tosiara Jul 23, 2014
1184a9c
Whitespace fix
tosiara Jul 23, 2014
250b2e4
Whitespace fix (finnaly INSTALL is done)
tosiara Jul 23, 2014
3528e65
Whitespace fix
tosiara Jul 23, 2014
0dfdbec
Whitespace fix
tosiara Jul 23, 2014
7a55468
Whitespace fix
tosiara Jul 23, 2014
02ff965
Whitespace fix
tosiara Jul 23, 2014
646fb10
Whitespace fix
tosiara Jul 23, 2014
8f4d2cc
Whitespace fix
tosiara Jul 23, 2014
3aeaef7
Whitespace fix
tosiara Jul 23, 2014
de38cbc
Merge pull request #18 from tosiara/rtsp-mr-dave
Mr-Dave Jul 23, 2014
de77c45
RTSP rotate/resize/non YUV420/MJPEG. Now requires libswscale-dev
Aug 11, 2014
815923d
Add git commit number to version number
Mr-Dave Sep 4, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added support for libav V53
  • Loading branch information
Dave committed Jun 20, 2014
commit ca413db53cdd3a97ce7a409822f8b401fadb968b
12 changes: 9 additions & 3 deletions CHANGELOG
100644 → 100755
Original file line number Diff line number Diff line change
@@ -60,9 +60,15 @@ Features
* Revised INSTALL with samples(Mr-Dave)
* Revisions for RTSP and code standard.(Mr-Dave)
* Plugged most(?) memory leaks in RTSP. (Mr-Dave)
* Undo changes caused by code editor and other unnecessary changes
* Moved call to netcam_shutdown_rtsp into netcam_cleanup where it belongs.
* Regession fix for memory leaks and reconnection
* Undo changes caused by code editor and other unnecessary changes (Mr-Dave)
* Moved call to netcam_shutdown_rtsp into netcam_cleanup where it belongs. (Mr-Dave)
* Regession fix for memory leaks and reconnection (Mr-Dave)
* Eliminated requirement to manually build FFMPEG for RTSP support. (Mr-Dave)
* Revised RTSP to support version 53 of libavformat (Mr-Dave)
* Revised FFMPEG.c to eliminate warnings and functions no longer supported by Libav/FFMPEG(Mr-Dave)
* Revised INSTALL to have sample PI configure option.(Mr-Dave)
* Revised configure.ac to generate compiler flag AVFMT_V53.(Mr-Dave)
* Revised INSTALL to indicate standard APT packages for RTSP (Mr-Dave)


Bugfixes
72 changes: 36 additions & 36 deletions INSTALL
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
Required Packages:
sudo apt-get install autoconf automake build-essential libjpeg-turbo8-dev libzip-dev

Obtain source code (via git)
sudo apt-get install git
cd ~
git clone {https://github.com/your favorite fork}

To rebuild the motion configure file use
autoreconf

Optional: With FFMPEG support:
Build FFMPEG via their instructions

Change to location of the motion source code
cd ~/motion

Configure with manually built ffmpeg which installs to ~/bin and ~/ffmpeg_build
Basic
./configure --with-ffmpeg=$HOME/ffmpeg_build --with-ffmpeg-headers=$HOME/ffmpeg_build/include

With extra libraries for ffmpeg IMPORTANT NOTE: Your libraries will vary depending upon your build of FFMPEG
./configure --with-ffmpeg=$HOME/ffmpeg_build --with-ffmpeg-headers=$HOME/ffmpeg_build/include --with-ffmpeg-libs=" -lavformat -lswscale -lavcodec -lavutil -lfdk-aac -lswresample -lm -lopus -lz -lva -lvpx -lx264 -lmp3lame -lbz2 -ldl -lvorbisenc -lvorbis -ltheoraenc -ltheoradec "

With extra libraries for ffmpeg and install to ~/motion_build
./configure --prefix=$HOME/motion_build --with-ffmpeg=$HOME/ffmpeg_build --with-ffmpeg-headers=$HOME/ffmpeg_build/include --with-ffmpeg-libs=" -lavformat -lswscale -lavcodec -lavutil -lfdk-aac -lswresample -lm -lopus -lz -lva -lvpx -lx264 -lmp3lame -lbz2 -ldl -lvorbisenc -lvorbis -ltheoraenc -ltheoradec "

With APT versions of ffmpeg libraries
sudo apt-get install libavformat-dev libavcodec-dev

Without any FFMPEG support or just any installed version of FFMPEG
./configure

Once configured type:
make
make install
Required Packages:
sudo apt-get install autoconf automake build-essential libtool libjpeg8-dev libzip-dev
Obtain source code (via git)
sudo apt-get install git
cd ~
git clone {https://github.com/your favorite fork}
To rebuild the motion configure file use
autoreconf
Optional: With FFMPEG support:
Build FFMPEG via their instructions
Configure with manually built ffmpeg which currently installs to ~/bin and ~/ffmpeg_build
Basic
./configure --with-ffmpeg=$HOME/ffmpeg_build --with-ffmpeg-headers=$HOME/ffmpeg_build/include
With extra libraries for ffmpeg IMPORTANT NOTE: Your libraries will vary depending upon your build of FFMPEG
./configure --with-ffmpeg=$HOME/ffmpeg_build --with-ffmpeg-headers=$HOME/ffmpeg_build/include --with-ffmpeg-libs=" -lavformat -lswscale -lavcodec -lavutil -lfdk-aac -lswresample -lm -lopus -lz -lva -lvpx -lx264 -lmp3lame -lbz2 -ldl -lvorbisenc -lvorbis -ltheoraenc -ltheoradec "
With extra libraries for ffmpeg and install to ~/motion_build
./configure --prefix=$HOME/motion_build --with-ffmpeg=$HOME/ffmpeg_build --with-ffmpeg-headers=$HOME/ffmpeg_build/include --with-ffmpeg-libs=" -lavformat -lswscale -lavcodec -lavutil -lfdk-aac -lswresample -lm -lopus -lz -lva -lvpx -lx264 -lmp3lame -lbz2 -ldl -lvorbisenc -lvorbis -ltheoraenc -ltheoradec "
With LIBAV APT versions of libraries
sudo apt-get install libavformat-dev libavcodec-dev libavutil-dev libav-tools
Without any LIBAV/FFMPEG support or the installed version of libavcodec/libavformat
./configure
Sample PI configuration with LIBAV
./configure --with-ffmpeg=/usr/lib/arm-linux-gnueabihf --with-ffmpeg-headers=/usr/include
Once configured type:
make
make install
34 changes: 31 additions & 3 deletions configure.ac
100644 → 100755
Original file line number Diff line number Diff line change
@@ -441,6 +441,11 @@ else if test "${FFMPEG_DIR}" = "yes"; then
FFMPEG_OK="found"
FFMPEG_LIB="/usr/lib/x86_64-linux-gnu"
FFMPEG_DIR="/usr"
elif test -f /usr/lib/i386-linux-gnu/libavcodec.a -o -f /usr/lib/i386-linux-gnu/libavcodec.so && test /usr/lib/i386-linux-gnu/libavformat.a -o -f /usr/lib/i386-linux-gnu/libavformat.so ; then
AC_MSG_RESULT(found in /usr/lib/i386-linux-gnu)
FFMPEG_OK="found"
FFMPEG_LIB="/usr/lib/i386-linux-gnu"
FFMPEG_DIR="/usr"
else
AC_MSG_RESULT(not found)
echo ""
@@ -551,7 +556,7 @@ if test "${FFMPEG_OK}" = "found"; then
FFMPEG_OBJ="ffmpeg.o"
AC_SUBST(FFMPEG_OBJ)

AC_MSG_CHECKING(avformat)
AC_MSG_CHECKING(avformat version 55)
AC_RUN_IFELSE([AC_LANG_SOURCE([
[
#include <${AVFORMAT_DIR}>
@@ -560,15 +565,38 @@ if test "${FFMPEG_OK}" = "found"; then
return 0;
}
]])],
[AC_MSG_RESULT(version previous to 55)],
[
AC_MSG_RESULT(no)
AC_MSG_CHECKING(avformat version 53)
AC_RUN_IFELSE([AC_LANG_SOURCE([
[
#include <${AVFORMAT_DIR}>
int main(void){
if (LIBAVFORMAT_VERSION_MAJOR = 53) return -1;
return 0;
}
]])],
[AC_MSG_RESULT(no)],
[
AC_MSG_RESULT(version 55 or higher)
AC_MSG_RESULT(yes)
TEMP_CFLAGS="${TEMP_CFLAGS} -DAVFMT_V53"
RTPS_OBJ="netcam_rtsp.o"
AC_SUBST(RTPS_OBJ)
]
)
],
[
AC_MSG_RESULT( yes version 55 or higher)
TEMP_CFLAGS="${TEMP_CFLAGS} -DFFMPEG_V55"
RTPS_OBJ="netcam_rtsp.o"
AC_SUBST(RTPS_OBJ)
]
)





AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
saved_CFLAGS=$CFLAGS
saved_LIBS=$LIBS
Loading