Browse Source

update celt code to celt-0.7.0 api (fixes #139)

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3690 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.117.0
torben 16 years ago
parent
commit
5b642bcabe
3 changed files with 10 additions and 10 deletions
  1. +1
    -1
      configure.ac
  2. +5
    -5
      drivers/netjack/net_driver.c
  3. +4
    -4
      tools/netsource.c

+ 1
- 1
configure.ac View File

@@ -709,7 +709,7 @@ fi

# Celt low-latency audio codec. netjack transmission via internet.
HAVE_CELT=false
PKG_CHECK_MODULES(CELT, celt >= 0.5.0,[HAVE_CELT=true], [true])
PKG_CHECK_MODULES(CELT, celt >= 0.7.0,[HAVE_CELT=true], [true])
if test x$HAVE_CELT = xfalse; then
AC_DEFINE(HAVE_CELT,0,"Whether CELT is available")
AC_MSG_RESULT(no)


+ 5
- 5
drivers/netjack/net_driver.c View File

@@ -549,13 +549,13 @@ net_driver_attach (net_driver_t *driver)

if( driver->bitdepth == 1000 ) {
#if HAVE_CELT
celt_int32_t lookahead;
celt_int32 lookahead;
// XXX: memory leak
CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL );
CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL );
celt_mode_info( celt_mode, CELT_GET_LOOKAHEAD, &lookahead );
driver->codec_latency = 2*lookahead;

driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode ) );
driver->capture_srcs = jack_slist_append(driver->capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
#endif
} else {
#if HAVE_SAMPLERATE
@@ -597,8 +597,8 @@ net_driver_attach (net_driver_t *driver)
if( driver->bitdepth == 1000 ) {
#if HAVE_CELT
// XXX: memory leak
CELTMode *celt_mode = celt_mode_create( driver->sample_rate, 1, driver->period_size, NULL );
driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode ) );
CELTMode *celt_mode = celt_mode_create( driver->sample_rate, driver->period_size, NULL );
driver->playback_srcs = jack_slist_append(driver->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
#endif
} else {
#if HAVE_SAMPLERATE


+ 4
- 4
tools/netsource.c View File

@@ -124,8 +124,8 @@ alloc_ports (int n_capture_audio, int n_playback_audio, int n_capture_midi, int
if( bitdepth == 1000 ) {
#if HAVE_CELT
// XXX: memory leak
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL );
capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) );
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL );
capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
#endif
} else {
#if HAVE_SAMPLERATE
@@ -163,8 +163,8 @@ alloc_ports (int n_capture_audio, int n_playback_audio, int n_capture_midi, int
if( bitdepth == 1000 ) {
#if HAVE_CELT
// XXX: memory leak
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL );
playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) );
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL );
playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
#endif
} else {
#if HAVE_SAMPLERATE


Loading…
Cancel
Save