diff options
| author | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2010-07-05 23:47:04 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2010-07-05 23:47:04 +0400 |
| commit | fbaabc13f0111296a64e565f7b8779b7f67602ca (patch) | |
| tree | 5b9a1c9cabe7a44a4ce532c2eed39d0995a62173 /src | |
| parent | 8ba2a779eafd7996810ce9a8e8d75f05ecddd78a (diff) | |
IETF draft update, minor bugfix to the encoder
Diffstat (limited to 'src')
| -rw-r--r-- | src/hybrid_decoder.c | 4 | ||||
| -rw-r--r-- | src/hybrid_encoder.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/hybrid_decoder.c b/src/hybrid_decoder.c index 2c0885bc..f2da7380 100644 --- a/src/hybrid_decoder.c +++ b/src/hybrid_decoder.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2010 Xiph.Org Foundation - Written by Jean-Marc Valin */ +/* Copyright (c) 2010 Xiph.Org Foundation, Skype Limited + Written by Jean-Marc Valin and Koen Vos */ /* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/src/hybrid_encoder.c b/src/hybrid_encoder.c index 85201ade..21d1573f 100644 --- a/src/hybrid_encoder.c +++ b/src/hybrid_encoder.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2010 Xiph.Org Foundation - Written by Jean-Marc Valin */ +/* Copyright (c) 2010 Xiph.Org Foundation, Skype Limited + Written by Jean-Marc Valin and Koen Vos */ /* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -34,6 +34,7 @@ #endif #include <stdlib.h> +#include <stdio.h> #include "hybrid_encoder.h" #include "celt/libcelt/entenc.h" #include "celt/libcelt/modes.h" @@ -92,8 +93,10 @@ int hybrid_encode(HybridEncoder *st, const short *pcm, int frame_size, st->encControl.bitRate = 30000; /* Call SILK encoder for the low band */ + nBytes = bytes_per_packet; silk_ret = SKP_Silk_SDK_Encode( st->silk_enc, &st->encControl, pcm, 960, &enc, &nBytes ); if( silk_ret ) { + fprintf (stderr, "SILK encode error\n"); /* Handle error */ } @@ -101,6 +104,7 @@ int hybrid_encode(HybridEncoder *st, const short *pcm, int frame_size, celt_encoder_ctl(st->celt_enc, CELT_SET_START_BAND(13)); /* Encode high band with CELT */ + /* FIXME: Do some delay compensation here */ celt_ret = celt_encode_with_ec(st->celt_enc, pcm, NULL, frame_size, data, bytes_per_packet, &enc); return celt_ret; |