[SCM] bs1770gain/master: Imported Upstream version 0.4.4
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Tue Jun 23 20:51:56 UTC 2015
The following commit has been merged in the master branch:
commit 54cfe88b501eb01a1df3f2a644c51577251ce796
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Tue Jun 23 16:31:41 2015 +0200
Imported Upstream version 0.4.4
diff --git a/bs1770gain/Makefile.am b/bs1770gain/Makefile.am
index a6e430f..a91ec5d 100755
--- a/bs1770gain/Makefile.am
+++ b/bs1770gain/Makefile.am
@@ -9,6 +9,7 @@ CFLAGS+=-Wextra
CFLAGS+=-Wstrict-prototypes
#CFLAGS+=-Wmissing-declarations
#CFLAGS+=-Wmissing-prototypes
+CFLAGS+=-Wno-unused-variable
CPPFLAGS+=-I$(top_srcdir)/libpbutil
CPPFLAGS+=-I$(top_srcdir)/lib1770-2
@@ -31,7 +32,8 @@ BS1770GAIN_TOOLS_ALL=@BS1770GAIN_TOOLS_ALL@
BS1770GAIN_TOOLS_INSTALL=@BS1770GAIN_TOOLS_INSTALL@
BS1770GAIN_TOOLS_UNINSTALL=@BS1770GAIN_TOOLS_UNINSTALL@
-bin_PROGRAMS=bs1770gain
+bin_PROGRAMS=
+bin_PROGRAMS+=bs1770gain
bs1770gain_SOURCES=
bs1770gain_SOURCES+=bs1770gain.c
bs1770gain_LDADD=
@@ -40,6 +42,15 @@ bs1770gain_LDADD+=$(top_builddir)/libffsox-2/libffsox_2.a
bs1770gain_LDADD+=$(top_builddir)/lib1770-2/lib1770_2.a
bs1770gain_LDADD+=$(top_builddir)/libpbutil/libpbutil.a
bs1770gain_LDADD+=-lm
+#bin_PROGRAMS+=bs1770hello
+#bs1770hello_SOURCES=
+#bs1770hello_SOURCES+=bs1770hello.c
+#bs1770hello_LDADD=
+#bs1770hello_LDADD+=libbs1770gain.a
+#bs1770hello_LDADD+=$(top_builddir)/libffsox-2/libffsox_2.a
+#bs1770hello_LDADD+=$(top_builddir)/lib1770-2/lib1770_2.a
+#bs1770hello_LDADD+=$(top_builddir)/libpbutil/libpbutil.a
+#bs1770hello_LDADD+=-lm
noinst_LIBRARIES=libbs1770gain.a
libbs1770gain_a_SOURCES=
diff --git a/bs1770gain/Makefile.in b/bs1770gain/Makefile.in
index 5f11c17..a743543 100755
--- a/bs1770gain/Makefile.in
+++ b/bs1770gain/Makefile.in
@@ -109,11 +109,12 @@ BS1770GAIN_TOOLS_INSTALL = @BS1770GAIN_TOOLS_INSTALL@
BS1770GAIN_TOOLS_UNINSTALL = @BS1770GAIN_TOOLS_UNINSTALL@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Werror -Wall -Wformat -Wpointer-arith -Wcast-align \
- -Wcast-qual -Wreturn-type -Wextra -Wstrict-prototypes
-CPP = @CPP@
#CFLAGS+=-Wmissing-declarations
#CFLAGS+=-Wmissing-prototypes
+CFLAGS = @CFLAGS@ -Werror -Wall -Wformat -Wpointer-arith -Wcast-align \
+ -Wcast-qual -Wreturn-type -Wextra -Wstrict-prototypes \
+ -Wno-unused-variable
+CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/libpbutil \
-I$(top_srcdir)/lib1770-2 -I$(top_srcdir)/libffsox-2
CYGPATH_W = @CYGPATH_W@
@@ -206,6 +207,15 @@ bs1770gain_LDADD = libbs1770gain.a \
$(top_builddir)/libffsox-2/libffsox_2.a \
$(top_builddir)/lib1770-2/lib1770_2.a \
$(top_builddir)/libpbutil/libpbutil.a -lm
+#bin_PROGRAMS+=bs1770hello
+#bs1770hello_SOURCES=
+#bs1770hello_SOURCES+=bs1770hello.c
+#bs1770hello_LDADD=
+#bs1770hello_LDADD+=libbs1770gain.a
+#bs1770hello_LDADD+=$(top_builddir)/libffsox-2/libffsox_2.a
+#bs1770hello_LDADD+=$(top_builddir)/lib1770-2/lib1770_2.a
+#bs1770hello_LDADD+=$(top_builddir)/libpbutil/libpbutil.a
+#bs1770hello_LDADD+=-lm
noinst_LIBRARIES = libbs1770gain.a
libbs1770gain_a_SOURCES = bs1770gain.h bs1770gain_priv.h \
bs1770gain_aggregate.c bs1770gain_album.c bs1770gain_opath.c \
diff --git a/configure b/configure
index d9eaf2a..eeb0a9d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bs1770gain 0.4.3.
+# Generated by GNU Autoconf 2.69 for bs1770gain 0.4.4.
#
# Report bugs to <pbelkner at users.sf.net>.
#
@@ -580,10 +580,10 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='bs1770gain'
PACKAGE_TARNAME='bs1770gain'
-PACKAGE_VERSION='0.4.3'
-PACKAGE_STRING='bs1770gain 0.4.3'
+PACKAGE_VERSION='0.4.4'
+PACKAGE_STRING='bs1770gain 0.4.4'
PACKAGE_BUGREPORT='pbelkner at users.sf.net'
-PACKAGE_URL=''
+PACKAGE_URL='http://bs1770gain.sourceforge.net/'
# Factoring default headers for most tests.
ac_includes_default="\
@@ -1278,7 +1278,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures bs1770gain 0.4.3 to adapt to many kinds of systems.
+\`configure' configures bs1770gain 0.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1344,7 +1344,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of bs1770gain 0.4.3:";;
+ short | recursive ) echo "Configuration of bs1770gain 0.4.4:";;
esac
cat <<\_ACEOF
@@ -1377,6 +1377,7 @@ Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <pbelkner at users.sf.net>.
+bs1770gain home page: <http://bs1770gain.sourceforge.net/>.
_ACEOF
ac_status=$?
fi
@@ -1439,7 +1440,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-bs1770gain configure 0.4.3
+bs1770gain configure 0.4.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1695,7 +1696,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by bs1770gain $as_me 0.4.3, which was
+It was created by bs1770gain $as_me 0.4.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2510,7 +2511,7 @@ fi
# Define the identity of the package.
PACKAGE='bs1770gain'
- VERSION='0.4.3'
+ VERSION='0.4.4'
cat >>confdefs.h <<_ACEOF
@@ -5166,7 +5167,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by bs1770gain $as_me 0.4.3, which was
+This file was extended by bs1770gain $as_me 0.4.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5226,13 +5227,14 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <pbelkner at users.sf.net>."
+Report bugs to <pbelkner at users.sf.net>.
+bs1770gain home page: <http://bs1770gain.sourceforge.net/>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-bs1770gain config.status 0.4.3
+bs1770gain config.status 0.4.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 06f3247..5c24b94 100755
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# AC_CHECK_HEADER (header-file, [action-if-found], [action-if-not-found], [includes = `default-includes'])
# AC_CHECK_LIB (library, function, [action-if-found], [action-if-not-found], [other-libraries])
-AC_INIT([bs1770gain], [0.4.3], [pbelkner at users.sf.net])
+AC_INIT([bs1770gain], [0.4.4], [pbelkner at users.sf.net], [], [http://bs1770gain.sourceforge.net/])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
AC_PROG_RANLIB
diff --git a/libffsox-2/Makefile.am b/libffsox-2/Makefile.am
index abd35f3..86a0f96 100755
--- a/libffsox-2/Makefile.am
+++ b/libffsox-2/Makefile.am
@@ -2,7 +2,7 @@ CFLAGS+=-Werror
CFLAGS+=-Wall
CFLAGS+=-Wformat
CFLAGS+=-Wpointer-arith
-CFLAGS+=-Wcast-align
+#CFLAGS+=-Wcast-align
CFLAGS+=-Wcast-qual
CFLAGS+=-Wreturn-type
CFLAGS+=-Wextra
diff --git a/libffsox-2/Makefile.in b/libffsox-2/Makefile.in
index 3bd97de..3d0f98a 100755
--- a/libffsox-2/Makefile.in
+++ b/libffsox-2/Makefile.in
@@ -114,8 +114,9 @@ BS1770GAIN_TOOLS_INSTALL = @BS1770GAIN_TOOLS_INSTALL@
BS1770GAIN_TOOLS_UNINSTALL = @BS1770GAIN_TOOLS_UNINSTALL@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Werror -Wall -Wformat -Wpointer-arith -Wcast-align \
- -Wcast-qual -Wreturn-type -Wextra -Wstrict-prototypes
+#CFLAGS+=-Wcast-align
+CFLAGS = @CFLAGS@ -Werror -Wall -Wformat -Wpointer-arith -Wcast-qual \
+ -Wreturn-type -Wextra -Wstrict-prototypes
CPP = @CPP@
#CFLAGS+=-Wmissing-declarations
#CFLAGS+=-Wmissing-prototypes
diff --git a/libffsox-2/ffsox_csv2avdict.c b/libffsox-2/ffsox_csv2avdict.c
index e0a9474..0a1f498 100755
--- a/libffsox-2/ffsox_csv2avdict.c
+++ b/libffsox-2/ffsox_csv2avdict.c
@@ -256,11 +256,14 @@ static int priv_get_utf8(priv_t *b)
char *wp=b->ch;
size_t n;
+ int i;
// read first byte into buffer
- if (EOF==(*wp=getc(b->f)))
+ if (EOF==(i=getc(b->f)))
goto error;
+ *wp=(char)i;
+
// check how many more bytes need to be read for character
n = 0;
diff --git a/libffsox-2/ffsox_frame_reader.c b/libffsox-2/ffsox_frame_reader.c
index ecd35ff..d4f9f1c 100755
--- a/libffsox-2/ffsox_frame_reader.c
+++ b/libffsox-2/ffsox_frame_reader.c
@@ -145,8 +145,9 @@ static int frame_reader_run(frame_reader_t *n)
}
if ((size=avcodec_decode_audio4(cc,frame,&got_frame,pkt))<0) {
- DMESSAGE("decoding audio");
- return -1;
+ // skip the package.
+ pkt->size=0;
+ return 0;
}
pkt->size-=size;
diff --git a/libffsox-2/ffsox_frame_writer.c b/libffsox-2/ffsox_frame_writer.c
index a1f333a..18318b1 100755
--- a/libffsox-2/ffsox_frame_writer.c
+++ b/libffsox-2/ffsox_frame_writer.c
@@ -145,6 +145,10 @@ static int frame_writer_encode(frame_writer_t *fw, AVFrame *frame,
if (0!=*got_packet) {
av_packet_rescale_ts(pkt,cc->time_base,st->time_base);
+ // where do the "magic" factor 0.5 come from?
+ pkt->dts>>=1;
+ pkt->pts>>=1;
+ pkt->duration>>=1;
if (ffsox_stream_interleaved_write(so,pkt)<0) {
DMESSAGE("writing packet");
diff --git a/libffsox-2/ffsox_stream.c b/libffsox-2/ffsox_stream.c
index 321e92c..21794c6 100755
--- a/libffsox-2/ffsox_stream.c
+++ b/libffsox-2/ffsox_stream.c
@@ -41,5 +41,9 @@ int ffsox_stream_interleaved_write(stream_t *s, AVPacket *pkt)
{
pkt->stream_index=s->stream_index;
+#if 0 // {
+ fprintf(stderr,"%d: %I64d, %I64d\n",pkt->stream_index,pkt->pts,pkt->dts);
+#endif // }
+
return av_interleaved_write_frame(s->fc,pkt);
}
--
bs1770gain packaging
More information about the pkg-multimedia-commits
mailing list