I just checked the celt page. According to this:
http://www.celt-codec.org/news/
Celt is compatible to the chosen version of current spice until version
0.6.1. In 0.7.0 they changed the bit stream of celt.
However even 0.6.1 is not able to be build with spice as there are the
versions used in the function names. To be able to build spice with
0.6.1 I created a patch against Spice 0.9.1.
Again: It is not made to introduce the latest version of celt but at
least it is useful to use the latest compatible version of celt (0.6.1)
as a first step.
Cheers,
Mario
diff -uNr spice-0.9.1.org/client/audio_channels.h
spice-0.9.1/client/audio_channels.h
--- spice-0.9.1.org/client/audio_channels.h 2010-08-27
11:35:31.000000000 +0200
+++ spice-0.9.1/client/audio_channels.h 2011-11-06 14:54:23.516817248
+0100
@@ -18,7 +18,7 @@
#ifndef _H_AUDIO_CHANNELS
#define _H_AUDIO_CHANNELS
-#include <celt051/celt.h>
+#include <celt/celt.h>
#include "red_channel.h"
#include "debug.h"
diff -uNr spice-0.9.1.org/client/Makefile.am
spice-0.9.1/client/Makefile.am
--- spice-0.9.1.org/client/Makefile.am 2011-05-24 12:17:02.000000000
+0200
+++ spice-0.9.1/client/Makefile.am 2011-11-06 14:56:02.746817256 +0100
@@ -215,7 +215,7 @@
$(ALSA_CFLAGS) \
$(CEGUI_CFLAGS) \
$(CEGUI06_CFLAGS) \
- $(CELT051_CFLAGS) \
+ $(CELT_CFLAGS) \
$(GL_CFLAGS) \
$(MISC_X_CFLAGS) \
$(PIXMAN_CFLAGS) \
@@ -235,7 +235,7 @@
$(ALSA_LIBS) \
$(CEGUI_LIBS) \
$(CEGUI06_LIBS) \
- $(CELT051_LIBS) \
+ $(CELT_LIBS) \
$(GL_LIBS) \
$(JPEG_LIBS) \
$(MISC_X_LIBS) \
diff -uNr spice-0.9.1.org/client/Makefile.in
spice-0.9.1/client/Makefile.in
--- spice-0.9.1.org/client/Makefile.in 2011-08-25 14:56:14.000000000
+0200
+++ spice-0.9.1/client/Makefile.in 2011-11-06 14:56:21.676817256 +0100
@@ -327,9 +327,9 @@
CEGUI06_LIBS = @CEGUI06_LIBS@
CEGUI_CFLAGS = @CEGUI_CFLAGS@
CEGUI_LIBS = @CEGUI_LIBS@
-CELT051_CFLAGS = @CELT051_CFLAGS@
-CELT051_LIBDIR = @CELT051_LIBDIR@
-CELT051_LIBS = @CELT051_LIBS@
+CELT_CFLAGS = @CELT_CFLAGS@
+CELT_LIBDIR = @CELT_LIBDIR@
+CELT_LIBS = @CELT_LIBS@
CFLAGS = @CFLAGS@
CFLAGS_CFLAGS = @CFLAGS_CFLAGS@
CPP = @CPP@
@@ -521,7 +521,7 @@
$(ALSA_CFLAGS) \
$(CEGUI_CFLAGS) \
$(CEGUI06_CFLAGS) \
- $(CELT051_CFLAGS) \
+ $(CELT_CFLAGS) \
$(GL_CFLAGS) \
$(MISC_X_CFLAGS) \
$(PIXMAN_CFLAGS) \
@@ -540,7 +540,7 @@
$(ALSA_LIBS) \
$(CEGUI_LIBS) \
$(CEGUI06_LIBS) \
- $(CELT051_LIBS) \
+ $(CELT_LIBS) \
$(GL_LIBS) \
$(JPEG_LIBS) \
$(MISC_X_LIBS) \
diff -uNr spice-0.9.1.org/client/playback_channel.cpp
spice-0.9.1/client/playback_channel.cpp
--- spice-0.9.1.org/client/playback_channel.cpp 2011-05-24
12:17:02.000000000 +0200
+++ spice-0.9.1/client/playback_channel.cpp 2011-11-06
14:56:38.326817258 +0100
@@ -177,11 +177,11 @@
delete _wave_player;
if (_celt_decoder) {
- celt051_decoder_destroy(_celt_decoder);
+ celt_decoder_destroy(_celt_decoder);
}
if (_celt_mode) {
- celt051_mode_destroy(_celt_mode);
+ celt_mode_destroy(_celt_mode);
}
}
@@ -266,12 +266,12 @@
return;
}
- if (!(_celt_mode = celt051_mode_create(start->frequency,
start->channels,
+ if (!(_celt_mode = celt_mode_create(start->frequency,
start->channels,
frame_size,
&celt_mode_err))) {
THROW("create celt mode failed %d", celt_mode_err);
}
- if (!(_celt_decoder = celt051_decoder_create(_celt_mode))) {
+ if (!(_celt_decoder = celt_decoder_create(_celt_mode))) {
THROW("create celt decoder");
}
}
@@ -322,7 +322,7 @@
uint32_t size = packet->data_size;
celt_int16_t pcm[256 * 2];
- if (celt051_decode(_celt_decoder, data, size, pcm) != CELT_OK) {
+ if (celt_decode(_celt_decoder, data, size, pcm) != CELT_OK) {
THROW("celt decode failed");
}
#ifdef WAVE_CAPTURE
diff -uNr spice-0.9.1.org/client/record_channel.cpp
spice-0.9.1/client/record_channel.cpp
--- spice-0.9.1.org/client/record_channel.cpp 2011-05-24
12:17:02.000000000 +0200
+++ spice-0.9.1/client/record_channel.cpp 2011-11-06 14:56:54.166817258
+0100
@@ -104,10 +104,10 @@
delete _wave_recorder;
if (_celt_encoder) {
- celt051_encoder_destroy(_celt_encoder);
+ celt_encoder_destroy(_celt_encoder);
}
if (_celt_mode) {
- celt051_mode_destroy(_celt_mode);
+ celt_mode_destroy(_celt_mode);
}
}
@@ -164,12 +164,12 @@
int frame_size = 256;
int celt_mode_err;
_frame_bytes = frame_size * bits_per_sample * start->channels / 8;
- if (!(_celt_mode = celt051_mode_create(start->frequency,
start->channels, frame_size,
+ if (!(_celt_mode = celt_mode_create(start->frequency,
start->channels, frame_size,
&celt_mode_err))) {
THROW("create celt mode failed %d", celt_mode_err);
}
- if (!(_celt_encoder = celt051_encoder_create(_celt_mode))) {
+ if (!(_celt_encoder = celt_encoder_create(_celt_mode))) {
THROW("create celt encoder failed");
}
@@ -187,9 +187,9 @@
}
ASSERT(_celt_mode && _celt_encoder);
_wave_recorder->stop();
- celt051_encoder_destroy(_celt_encoder);
+ celt_encoder_destroy(_celt_encoder);
_celt_encoder = NULL;
- celt051_mode_destroy(_celt_mode);
+ celt_mode_destroy(_celt_mode);
_celt_mode = NULL;
delete _wave_recorder;
_wave_recorder = NULL;
@@ -249,7 +249,7 @@
int n;
if (_mode == SPICE_AUDIO_DATA_MODE_CELT_0_5_1) {
- n = celt051_encode(_celt_encoder, (celt_int16_t *)frame, NULL,
celt_buf,
+ n = celt_encode(_celt_encoder, (celt_int16_t *)frame, NULL,
celt_buf,
CELT_COMPRESSED_FRAME_BYTES);
if (n < 0) {
THROW("celt encode failed");
diff -uNr spice-0.9.1.org/common/Makefile.in
spice-0.9.1/common/Makefile.in
--- spice-0.9.1.org/common/Makefile.in 2011-08-25 14:56:14.000000000
+0200
+++ spice-0.9.1/common/Makefile.in 2011-11-06 14:57:51.826817262 +0100
@@ -158,9 +158,9 @@
CEGUI06_LIBS = @CEGUI06_LIBS@
CEGUI_CFLAGS = @CEGUI_CFLAGS@
CEGUI_LIBS = @CEGUI_LIBS@
-CELT051_CFLAGS = @CELT051_CFLAGS@
-CELT051_LIBDIR = @CELT051_LIBDIR@
-CELT051_LIBS = @CELT051_LIBS@
+CELT_CFLAGS = @CELT_CFLAGS@
+CELT_LIBDIR = @CELT_LIBDIR@
+CELT_LIBS = @CELT_LIBS@
CFLAGS = @CFLAGS@
CFLAGS_CFLAGS = @CFLAGS_CFLAGS@
CPP = @CPP@
diff -uNr spice-0.9.1.org/configure spice-0.9.1/configure
--- spice-0.9.1.org/configure 2011-08-25 14:56:15.000000000 +0200
+++ spice-0.9.1/configure 2011-11-06 14:28:32.116817150 +0100
@@ -645,9 +645,9 @@
SSL_CFLAGS
ALSA_LIBS
ALSA_CFLAGS
-CELT051_LIBDIR
-CELT051_LIBS
-CELT051_CFLAGS
+CELT_LIBDIR
+CELT_LIBS
+CELT_CFLAGS
PIXMAN_LIBS
PIXMAN_CFLAGS
SMARTCARD_CFLAGS
@@ -855,8 +855,8 @@
CAC_CARD_LIBS
PIXMAN_CFLAGS
PIXMAN_LIBS
-CELT051_CFLAGS
-CELT051_LIBS
+CELT_CFLAGS
+CELT_LIBS
ALSA_CFLAGS
ALSA_LIBS
SSL_CFLAGS
@@ -1556,10 +1556,10 @@
PIXMAN_CFLAGS
C compiler flags for PIXMAN, overriding pkg-config
PIXMAN_LIBS linker flags for PIXMAN, overriding pkg-config
- CELT051_CFLAGS
- C compiler flags for CELT051, overriding pkg-config
- CELT051_LIBS
- linker flags for CELT051, overriding pkg-config
+ CELT_CFLAGS
+ C compiler flags for CELT, overriding pkg-config
+ CELT_LIBS
+ linker flags for CELT, overriding pkg-config
ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
ALSA_LIBS linker flags for ALSA, overriding pkg-config
SSL_CFLAGS C compiler flags for SSL, overriding pkg-config
@@ -17172,35 +17172,35 @@
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CELT051" >&5
-$as_echo_n "checking for CELT051... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CELT" >&5
+$as_echo_n "checking for CELT... " >&6; }
-if test -n "$CELT051_CFLAGS"; then
- pkg_cv_CELT051_CFLAGS="$CELT051_CFLAGS"
+if test -n "$CELT_CFLAGS"; then
+ pkg_cv_CELT_CFLAGS="$CELT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"celt051 >= 0.5.1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "celt051 >= 0.5.1.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"celt >= 0.5.1.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "celt >= 0.5.1.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_CELT051_CFLAGS=`$PKG_CONFIG --cflags "celt051 >= 0.5.1.1"
2>/dev/null`
+ pkg_cv_CELT_CFLAGS=`$PKG_CONFIG --cflags "celt >= 0.5.1.1"
2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
-if test -n "$CELT051_LIBS"; then
- pkg_cv_CELT051_LIBS="$CELT051_LIBS"
+if test -n "$CELT_LIBS"; then
+ pkg_cv_CELT_LIBS="$CELT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"celt051 >= 0.5.1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "celt051 >= 0.5.1.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"celt >= 0.5.1.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "celt >= 0.5.1.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_CELT051_LIBS=`$PKG_CONFIG --libs "celt051 >= 0.5.1.1"
2>/dev/null`
+ pkg_cv_CELT_LIBS=`$PKG_CONFIG --libs "celt >= 0.5.1.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17220,22 +17220,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CELT051_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"celt051 >= 0.5.1.1" 2>&1`
+ CELT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"celt >= 0.5.1.1" 2>&1`
else
- CELT051_PKG_ERRORS=`$PKG_CONFIG --print-errors "celt051 >=
0.5.1.1" 2>&1`
+ CELT_PKG_ERRORS=`$PKG_CONFIG --print-errors "celt >= 0.5.1.1"
2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$CELT051_PKG_ERRORS" >&5
+ echo "$CELT_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (celt051 >= 0.5.1.1) were not
met:
+ as_fn_error $? "Package requirements (celt >= 0.5.1.1) were not met:
-$CELT051_PKG_ERRORS
+$CELT_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables CELT051_CFLAGS
-and CELT051_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables CELT_CFLAGS
+and CELT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
@@ -17247,16 +17247,16 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables CELT051_CFLAGS
-and CELT051_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables CELT_CFLAGS
+and CELT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- CELT051_CFLAGS=$pkg_cv_CELT051_CFLAGS
- CELT051_LIBS=$pkg_cv_CELT051_LIBS
+ CELT_CFLAGS=$pkg_cv_CELT_CFLAGS
+ CELT_LIBS=$pkg_cv_CELT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -17264,7 +17264,7 @@
-SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
+SPICE_REQUIRES+=" celt >= 0.5.1.1"
if test ! -e client/generated_marshallers.cpp; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pyparsing python
module" >&5
diff -uNr spice-0.9.1.org/configure.ac spice-0.9.1/configure.ac
--- spice-0.9.1.org/configure.ac 2011-08-25 14:55:52.000000000 +0200
+++ spice-0.9.1/configure.ac 2011-11-06 14:28:53.146817152 +0100
@@ -209,11 +209,11 @@
AC_SUBST(PIXMAN_LIBS)
SPICE_REQUIRES+=" pixman-1 >= 0.17.7"
-PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
-AC_SUBST(CELT051_CFLAGS)
-AC_SUBST(CELT051_LIBS)
-AC_SUBST(CELT051_LIBDIR)
-SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
+PKG_CHECK_MODULES(CELT, celt >= 0.5.1.1)
+AC_SUBST(CELT_CFLAGS)
+AC_SUBST(CELT_LIBS)
+AC_SUBST(CELT_LIBDIR)
+SPICE_REQUIRES+=" celt >= 0.5.1.1"
if test ! -e client/generated_marshallers.cpp; then
AC_MSG_CHECKING([for pyparsing python module])
diff -uNr spice-0.9.1.org/Makefile.in spice-0.9.1/Makefile.in
--- spice-0.9.1.org/Makefile.in 2011-08-25 14:56:15.000000000 +0200
+++ spice-0.9.1/Makefile.in 2011-11-06 14:29:12.356817152 +0100
@@ -152,9 +152,9 @@
CEGUI06_LIBS = @CEGUI06_LIBS@
CEGUI_CFLAGS = @CEGUI_CFLAGS@
CEGUI_LIBS = @CEGUI_LIBS@
-CELT051_CFLAGS = @CELT051_CFLAGS@
-CELT051_LIBDIR = @CELT051_LIBDIR@
-CELT051_LIBS = @CELT051_LIBS@
+CELT_CFLAGS = @CELT_CFLAGS@
+CELT_LIBDIR = @CELT_LIBDIR@
+CELT_LIBS = @CELT_LIBS@
CFLAGS = @CFLAGS@
CFLAGS_CFLAGS = @CFLAGS_CFLAGS@
CPP = @CPP@
diff -uNr spice-0.9.1.org/python_modules/Makefile.in
spice-0.9.1/python_modules/Makefile.in
--- spice-0.9.1.org/python_modules/Makefile.in 2011-08-25
14:56:15.000000000 +0200
+++ spice-0.9.1/python_modules/Makefile.in 2011-11-06
14:57:59.616817262 +0100
@@ -71,9 +71,9 @@
CEGUI06_LIBS = @CEGUI06_LIBS@
CEGUI_CFLAGS = @CEGUI_CFLAGS@
CEGUI_LIBS = @CEGUI_LIBS@
-CELT051_CFLAGS = @CELT051_CFLAGS@
-CELT051_LIBDIR = @CELT051_LIBDIR@
-CELT051_LIBS = @CELT051_LIBS@
+CELT_CFLAGS = @CELT_CFLAGS@
+CELT_LIBDIR = @CELT_LIBDIR@
+CELT_LIBS = @CELT_LIBS@
CFLAGS = @CFLAGS@
CFLAGS_CFLAGS = @CFLAGS_CFLAGS@
CPP = @CPP@
diff -uNr spice-0.9.1.org/server/Makefile.in
spice-0.9.1/server/Makefile.in
--- spice-0.9.1.org/server/Makefile.in 2011-08-25 14:56:15.000000000
+0200
+++ spice-0.9.1/server/Makefile.in 2011-11-06 14:58:10.646817264 +0100
@@ -220,9 +220,9 @@
CEGUI06_LIBS = @CEGUI06_LIBS@
CEGUI_CFLAGS = @CEGUI_CFLAGS@
CEGUI_LIBS = @CEGUI_LIBS@
-CELT051_CFLAGS = @CELT051_CFLAGS@
-CELT051_LIBDIR = @CELT051_LIBDIR@
-CELT051_LIBS = @CELT051_LIBS@
+CELT_CFLAGS = @CELT_CFLAGS@
+CELT_LIBDIR = @CELT_LIBDIR@
+CELT_LIBS = @CELT_LIBS@
CFLAGS = @CFLAGS@
CFLAGS_CFLAGS = @CFLAGS_CFLAGS@
CPP = @CPP@
@@ -380,7 +380,7 @@
-I$(top_srcdir)/common \
-DRED_STATISTICS \
$(Z_LIBS) \
- $(CELT051_CFLAGS) \
+ $(CELT_CFLAGS) \
$(PIXMAN_CFLAGS) \
$(PROTOCOL_CFLAGS) \
$(SASL_CFLAGS) \
@@ -402,7 +402,7 @@
libspice_server_la_LIBADD = \
$(top_builddir)/common/libspice-common.la \
- $(CELT051_LIBS) \
+ $(CELT_LIBS) \
$(GL_LIBS) \
$(JPEG_LIBS) \
$(LIBRT) \
diff -uNr spice-0.9.1.org/server/snd_worker.c
spice-0.9.1/server/snd_worker.c
--- spice-0.9.1.org/server/snd_worker.c 2011-08-24 16:07:52.000000000
+0200
+++ spice-0.9.1/server/snd_worker.c 2011-11-06 14:58:47.766817266 +0100
@@ -24,7 +24,7 @@
#include <sys/socket.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
-#include <celt051/celt.h>
+#include <celt/celt.h>
#include "spice.h"
#include "red_common.h"
@@ -335,7 +335,7 @@
size = packet->data_size;
if (record_channel->mode == SPICE_AUDIO_DATA_MODE_CELT_0_5_1) {
- int celt_err = celt051_decode(record_channel->celt_decoder,
packet->data, size,
+ int celt_err = celt_decode(record_channel->celt_decoder,
packet->data, size,
(celt_int16_t
*)record_channel->celt_buf);
if (celt_err != CELT_OK) {
red_printf("celt decode failed (%d)", celt_err);
@@ -763,7 +763,7 @@
spice_marshall_msg_playback_data(channel->send_data.marshaller,
&msg);
if (playback_channel->mode == SPICE_AUDIO_DATA_MODE_CELT_0_5_1) {
- int n = celt051_encode(playback_channel->celt_encoder,
(celt_int16_t *)frame->samples, NULL,
+ int n = celt_encode(playback_channel->celt_encoder,
(celt_int16_t *)frame->samples, NULL,
playback_channel->send_data.celt_buf,
CELT_COMPRESSED_FRAME_BYTES);
if (n < 0) {
red_printf("celt encode failed");
@@ -1126,8 +1126,8 @@
reds_enable_mm_timer();
}
- celt051_encoder_destroy(playback_channel->celt_encoder);
- celt051_mode_destroy(playback_channel->celt_mode);
+ celt_encoder_destroy(playback_channel->celt_encoder);
+ celt_mode_destroy(playback_channel->celt_mode);
}
static void snd_set_playback_peer(RedChannel *channel, RedClient
*client, RedsStream *stream,
@@ -1143,14 +1143,14 @@
snd_disconnect_channel(worker->connection);
- if (!(celt_mode =
celt051_mode_create(SPICE_INTERFACE_PLAYBACK_FREQ,
+ if (!(celt_mode = celt_mode_create(SPICE_INTERFACE_PLAYBACK_FREQ,
SPICE_INTERFACE_PLAYBACK_CHAN,
FRAME_SIZE, &celt_error))) {
red_printf("create celt mode failed %d", celt_error);
return;
}
- if (!(celt_encoder = celt051_encoder_create(celt_mode))) {
+ if (!(celt_encoder = celt_encoder_create(celt_mode))) {
red_printf("create celt encoder failed");
goto error_1;
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
