Imported Upstream version 0.103

parent d48734ff
......@@ -4,12 +4,11 @@ Charles 'Buck' Krasic <krasic@acm.org>
Contributors:
James Bowman <jamesb@excamera.com>
Scott F. Johnston <scott@fleetingimage.com>
Stefan Lucke <Stefan.Lucke@snafu.de>
Stefan Lucke <stefan@lucke.in-berlin.de>
Daniel Kobras <kobras@tat.physik.uni-tuebingen.de>
Peter Schlaile <udbz@rz.uni-karlsruhe.de>
Arne Schirmacher <arne@schirmacher.de>
Thom van Os <thom@vanos.com>
Andreas Wacker <andreas100@methodstudios.com>
Artur Zaprzala <zybi@users.sourceforge.net>
Dan Dennedy <dan@dennedy.org>
Dan Dennedy <dan@dennedy.org>
This diff is collapsed.
......@@ -3,16 +3,16 @@
* Charles 'Buck' Krasic <krasic@acm.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
......
This diff is collapsed.
SUBDIRS = libdv playdv encodedv
SUBDIRS = libdv encodedv @PLAYDV_SUBDIR@
AUX_DIST = $(ac_aux_dir)/config.guess \
$(ac_aux_dir)/config.sub \
$(ac_aux_dir)/install-sh \
$(ac_aux_dir)/ltconfig \
$(ac_aux_dir)/ltmain.sh \
$(ac_aux_dir)/missing \
$(ac_aux_dir)/depcomp \
$(ac_aux_dir)/mkinstalldirs
$(ac_aux_dir)/depcomp
EXTRA_DIST = bootstrap COPYRIGHT README.encoder README.dvconnect \
@PACKAGE@.spec @PACKAGE@.spec.in @PACKAGE@.pc @PACKAGE@.pc.in
@PACKAGE@.spec @PACKAGE@.spec.in @PACKAGE@.pc @PACKAGE@.pc.in \
Makefile.in aclocal.m4 configure config.h.in \
install-sh depcomp missing config.guess config.sub \
ltmain.sh libtool
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
stamp-h.in config.log config.status $(AUX_DIST)
......@@ -21,7 +22,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libdv.pc
rpm: dist
rpm -ta @PACKAGE@-@VERSION@.tar.gz
rpmbuild -ta @PACKAGE@-@VERSION@.tar.gz
dist-hook:
(cd $(distdir) && if [ ! -d $(ac_aux_dir); then mkdir $(ac_aux_dir); fi)
......
This diff is collapsed.
......@@ -7,33 +7,25 @@ LibDV now uses the GNU "Autotools" for building.
BUILDING from CVS checkout
==========================
The CVS repository does not contain files generated by the autotools,
so you need to run the bootstrap script*:
Starting with version 0.98, the libdv CVS repository does include the
configure script generated by the autotools. Hopefully, this will
ease the pain for people who are not inclined to modify their machines
installation just to build libdv.
./bootstrap
If you do have such desire, you can still bootstrap the build
with*:
You can ignore the following error messages:
autoreconf -i
automake: configure.in: installing `config/install-sh'
error while copying
You should check for any fatal errors, noting that you can expect some
warnings which are harmless.
automake: configure.in: installing `config/mkinstalldirs'
error while copying
automake: configure.in: installing `config/missing'
error while copying
To build the libdv library and the example player:
After that, you can do this to build the library and the example
player:
./configure --enable-maintainer-mode
./configure
make
The maintainer-mode is if you are on a system that has recent
autotools installed, and you wish to make changes to the build
scripts.
The makefile generated by the autotools is very large, so the more
useful targets don't jump out at you. Here are a few.
......@@ -56,29 +48,17 @@ the working directory state to be like it as after a CVS checkout:
make maintainer-clean
* The autotools book (http://sources.redhat.com/autobook/) recommends
"bootstrap" instead of autogen.sh.
* Since libdv 0.103, the boostrap file is considered obsolete.
Autoconf now includes the program autoreconf that can serve the
same role.
NTSC Setup/Pedestal
===================
The decoder's add_ntsc_setup option should only be used
by North American NTSC users when viewing the video on your computer
monitor. It should never be used when transcoding, image processing,
or rendering.
The encoder's rem_ntsc_setup (rem=remove) should be used
only in the rare case that an image has had 7.5 IRE setup artificially
added. During post-production, accounting for setup should be avoided.
It is the responsibility of the analog output of your DV equipment to
add setup where appropriate. If your DV equipment lacks this option,
then use a processing amplifier.
These options--both for decoding
and encoding--are always ignored for PAL video.
For more information see Adam Wilt's DV FAQ:
This option has been disabled in libdv due to improper usage.
If you are still curious about this topic, see Adam Wilt's DV FAQ:
http://www.adamwilt.com/DV-FAQ-tech.html#Setup
......
This diff is collapsed.
#! /bin/bash
#set -x
DIE=0
package=libdv
srcfile=libdv/dv.c
......@@ -7,10 +9,10 @@ srcfile=libdv/dv.c
# Local settings for autotools, set them
# as appropriate for your system.
export AUTOCONF=autoconf-2.53
export AUTOHEADER=autoheader-2.53
export AUTOMAKE=automake-1.5
export ACLOCAL=aclocal-1.5
export AUTOCONF=autoconf
export AUTOHEADER=autoheader
export AUTOMAKE=automake
export ACLOCAL=aclocal
export LIBTOOLIZE=libtoolize
export LIBTOOL=libtool
......@@ -27,8 +29,8 @@ function autoconf_version_msg() {
autoconf_version_msg
}
autoconf_major=`$AUTOCONF --version | head -n 1 | sed 's/^[^0-9]*//' | sed 's/\([0-9]*\).\([0-9]*\)/\1/'`
autoconf_minor=`$AUTOCONF --version | head -n 1 | sed 's/^[^0-9]*//' | sed 's/\([0-9]*\).\([0-9]*\)/\2/'`
autoconf_major=`$AUTOCONF --version | head -n 1 | sed 's/^[^0-9]*//' | sed 's/\([0-9]*\).\([0-9]*\)\([a-z]*\)/\1/'`
autoconf_minor=`$AUTOCONF --version | head -n 1 | sed 's/^[^0-9]*//' | sed 's/\([0-9]*\).\([0-9]*\)\([a-z]*\)/\2/'`
if [ $autoconf_major -le 2 ]; then
if [ $autoconf_major -lt 2 ]; then
......@@ -71,7 +73,7 @@ function libtool_version_msg () {
libtool_version_msg
}
libtool_version=`$LIBTOOL --version | sed 's/^.* \([0-9\.]*\) .*$/\1/'`
libtool_version=`$LIBTOOL --version | head -n 1 | sed 's/^.* \([0-9\.]*\) .*$/\1/'`
libtool_major=`echo $libtool_version | cut -d. -f1`
libtool_minor=`echo $libtool_version | cut -d. -f2`
if [ $libtool_major -le 1 ]; then
......
This diff is collapsed.
......@@ -9,6 +9,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
......@@ -18,13 +21,16 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define as 1 if you have gtk */
#undef HAVE_GTK
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
/* Define to 1 if you have the `popt' library (-lpopt). */
/* Define if you have the 'popt' library */
#undef HAVE_LIBPOPT
/* Define if you have the `Xv' library (-lXv). */
......@@ -33,6 +39,9 @@
/* Define to 1 if you have the <linux/videodev.h> header file. */
#undef HAVE_LINUX_VIDEODEV_H
/* Define to 1 if you have the <machine/endian.h> header file. */
#undef HAVE_MACHINE_ENDIAN_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
......@@ -105,9 +114,11 @@
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define as `__inline' if that's what the C compiler calls it, or to nothing
if it is not supported. */
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,10 +4,11 @@ dnl AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
RPM_RELEASE=1
AM_INIT_AUTOMAKE(libdv, 0.9.5)
AC_CANONICAL_HOST
AM_MAINTAINER_MODE
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(libdv, 0.103)
dnl AM_MAINTAINER_MODE
AC_LIBTOOL_PICMODE(no)
dnl Checks for programs.
......@@ -39,6 +40,9 @@ AH_TEMPLATE([DEBUG],
AH_TEMPLATE([HAVE_SDL],
[Define as 1 if you have libsdl])
AH_TEMPLATE([HAVE_GTK],
[Define as 1 if you have gtk])
AH_TEMPLATE([HAVE_LIBXV],
[Define if you have the `Xv' library (-lXv).])
......@@ -65,6 +69,14 @@ AC_ARG_ENABLE(sdl,
fi
])
use_gtk=:
AC_ARG_ENABLE(gtk,
[ --disable-gtk disable use of gtk for display],
[ if test "$enableval" = "no"; then
use_gtk=false
fi
])
use_xv=:
AC_ARG_ENABLE(xv,
[ --disable-xv disable use of XVideo extension for display],
......@@ -139,11 +151,11 @@ AM_CONDITIONAL(HOST_X86, $arch_x86)
dnl Checks for libraries.
REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
PKG_CHECK_MODULES(GTK,$REQUIRES)
if $use_gtk; then
REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
PKG_CHECK_MODULES(GTK,$REQUIRES)
fi
dnl pass-thru to .pc files
AC_SUBST(REQUIRES)
dnl used in Makefile.am
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
......@@ -154,37 +166,75 @@ if $use_sdl; then
AM_PATH_SDL(1.1.6,
[
AC_DEFINE(HAVE_SDL)
LIBS="$LIBS $SDL_LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
])
fi
if $use_xv; then
AC_CHECK_LIB(Xv,XvQueryAdaptors,
[AC_DEFINE(HAVE_LIBXV)
AC_SUBST(XV_LIB)
XV_LIB='-lXv'],
AC_MSG_ERROR(Could not find Xv Lib),
$GTK_LIBS)
if $use_gtk; then
AM_PATH_GTK(1.2.4,
[
AC_DEFINE(HAVE_GTK)
])
fi
if [ $use_gtk && $use_xv ]; then
AC_CHECK_LIB(Xv, XvQueryAdaptors,
[AC_DEFINE(HAVE_LIBXV)
AC_SUBST(XV_LIB)
XV_LIB='-lXv'
],
[AC_MSG_ERROR([Could not find Xv Lib])],
$GTK_LIBS
)
fi
if $use_gtk; then
PLAYDV_SUBDIR='playdv'
else
PLAYDV_SUBDIR=''
fi
AC_SUBST(PLAYDV_SUBDIR)
dnl *********************************************************************
dnl Check for the pthread lib
dnl
AC_SUBST(PTHREAD_LIBS)
AC_CHECK_LIB(pthread, pthread_create, [ PTHREAD_LIBS="-lpthread" ],,)
OS_ARCH=`uname -s | sed -e 's|/|_|g'`
# FreeBSD and OpenBSD have neither -lpthread nor integrated pthreads in libc.
# Instead -pthread is used to the compiler/linker to get pthreads working right.
if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
CFLAGS="$CFLAGS -pthread"
CXXFLAGS="$CXXFLAGS -pthread"
fi
AC_CHECK_LIB(m, sqrt)
dnl Don't bother with popt on non-gcc build, because we make heavy use of
dnl gcc struct initialization extension in our popt code. (Could be fixed)
REQUIRES_NOPKGCONFIG=""
if test "$GCC" = "yes"; then
AC_CHECK_LIB(popt, poptGetContext,,
AC_CHECK_LIB(popt, poptGetContext,
[
POPT_LIB="-lpopt"
AC_DEFINE(HAVE_LIBPOPT, 1, [Define if you have the 'popt' library])
],
[
AC_MSG_WARN(playdv needs the popt package for command line parsing.
AC_MSG_WARN(playdv needs the popt package for command line parsing.
The source archive for popt is available at:
ftp://ftp.redhat.com/pub/redhat/code/popt)
])
fi
AC_SUBST(POPT_LIB)
AC_SUBST(REQUIRES_NOPKGCONFIG)
dnl Checks for header files.
AC_PATH_X
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h)
AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \
endian.h machine/endian.h inttypes.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......@@ -200,4 +250,5 @@ AC_CHECK_FUNCS(gettimeofday)
AC_SUBST(ac_aux_dir)
AC_SUBST(RPM_RELEASE)
AC_OUTPUT(Makefile libdv.spec libdv.pc libdv/Makefile playdv/Makefile encodedv/Makefile)
AC_CONFIG_FILES(Makefile libdv.spec libdv.pc libdv/Makefile playdv/Makefile encodedv/Makefile)
AC_OUTPUT
This diff is collapsed.
man_MANS = encodedv.1
man_MANS = encodedv.1 dvconnect.1 dubdv.1
EXTRA_DIST = $(man_MANS)
......@@ -9,15 +9,15 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
CLEANFILES =
bin_PROGRAMS= encodedv
bin_PROGRAMS= encodedv dvconnect dubdv
noinst_PROGRAMS= insert_audio fix_headers scan_packet_headers steal_header ppmqscale dvconnect dvavi
noinst_PROGRAMS= fix_headers scan_packet_headers steal_header ppmqscale dvavi
encodedv_SOURCES= encodedv.c
encodedv_LDADD= ../libdv/libdv.la
encodedv_LDADD= ../libdv/libdv.la $(POPT_LIB)
insert_audio_SOURCES = insert_audio.c
insert_audio_LDADD= ../libdv/libdv.la
dubdv_SOURCES = insert_audio.c
dubdv_LDADD= ../libdv/libdv.la $(POPT_LIB)
fix_headers_SOURCES = fix_headers.c
fix_headers_LDADD= ../libdv/libdv.la
......@@ -29,7 +29,7 @@ steal_header_SOURCES = steal_header.c
ppmqscale_SOURCES = ppmqscale.c
dvconnect_SOURCES = dvconnect.c
dvconnect_LDADD = -lpthread
dvconnect_LDADD = $(PTHREAD_LIBS) $(POPT_LIB)
dvavi_SOURCES = dvavi.c
dvavi_LDADD= ../libdv/libdv.la
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
.\" encodedv - encode a series of images to a digital video stream
.\" Copyright (c) 2001 James Bowman, Peter Schlaile, Daniel Kobras
.\" Copyright (c) 2001-2004 James Bowman, Peter Schlaile, Daniel Kobras
.\"
.\" This manual page is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
......@@ -87,7 +87,6 @@ Choose audio-input-filter: [>none<, wav, dsp]
.TP
\fB\-o\fR, \fB\-\-output\fR=\fIfilter-name\fR
Choose output-filter: [>raw<]
Hint for Arne Schirmacher to add AVI support ;-)
.TP
\fB\-q\fR, \fB\-\-static\-qno\fR=\fItable-no\fR
Static qno tables for quantisation on 2 VLC passes.
......@@ -114,7 +113,7 @@ Show help message.
\fB\-\-usage\fR
Display brief usage message.
.SH "SEE ALSO"
.BR playdv (1).
.BR playdv (1), dvconnect (1), dubdv (1), encodedv (1).
.SH AVAILABILITY
See http://libdv.sourceforge.net/ for the latest version.
.SH AUTHORS
......
This diff is collapsed.
......@@ -7,23 +7,23 @@
* codec.
*
* libdv is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your
* under the terms of the GNU Lesser Public License as published by
* the Free Software Foundation; either version 2.1, or (at your
* option) any later version.
*
* libdv is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
* Lesser Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Make; see the file COPYING. If not, write to
* You should have received a copy of the GNU Lesser Public License
* along with libdv; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
* The libdv homepage is http://libdv.sourceforge.net/.
*/
#include <libdv/dv_types.h>
#include "libdv/dv_types.h"
#include <stdio.h>
#include <stdlib.h>
......@@ -66,7 +66,7 @@ int main(int argc, const char** argv)
}
while (read_frame(stdin, frame_buf, &isPAL)) {
write_meta_data(frame_buf, frame_count++, isPAL, wide, &t);
_dv_write_meta_data(frame_buf, frame_count++, isPAL, wide, &t);
fwrite(frame_buf, 1, isPAL ? 144000 : 120000, stdout);
}
return 0;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment