eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implements OPUS_GET_PITCH that queries the decoded pitch

Browse source
This commit is contained in:
Jean-Marc Valin 2011-09-14 09:50:06 -07:00
parent bceb8e1532
commit 25f7f35555
3 changed files with 46 additions and 9 deletions

30
src/opus_decoder.c
View file

@ -39,6 +39,8 @@
#include "float_cast.h"
#include "opus_private.h"
#include "os_support.h"
#include "silk_structs.h"
#include "silk_define.h"
struct OpusDecoder {
int celt_dec_offset;
@ -737,6 +739,12 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
{
int ret = OPUS_OK;
va_list ap;
void *silk_dec;
CELTDecoder *celt_dec;
silk_dec = (char*)st+st->silk_dec_offset;
celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
va_start(ap, request);
@ -756,12 +764,6 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
break;
case OPUS_RESET_STATE:
{
void *silk_dec;
CELTDecoder *celt_dec;
silk_dec = (char*)st+st->silk_dec_offset;
celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
OPUS_CLEAR((char*)&st->OPUS_DECODER_RESET_START,
sizeof(OpusDecoder)-
((char*)&st->OPUS_DECODER_RESET_START - (char*)st));
@ -772,6 +774,22 @@ int opus_decoder_ctl(OpusDecoder *st, int request, ...)
st->frame_size = st->Fs/400;
}
break;
case OPUS_GET_PITCH_REQUEST:
{
int *value = va_arg(ap, opus_int32*);
if (value==NULL)
{
ret = OPUS_BAD_ARG;
break;
}
if (st->prev_mode == MODE_CELT_ONLY)
celt_decoder_ctl(celt_dec, OPUS_GET_PITCH(value));
else
*value = ((silk_decoder_state*)silk_dec)->indices.signalType == TYPE_VOICED
? ((silk_decoder_state*)silk_dec)->lagPrev*48/((silk_decoder_state*)silk_dec)->fs_kHz
: 0;
}
break;
default:
/*fprintf(stderr, "unknown opus_decoder_ctl() request: %d", request);*/
ret = OPUS_UNIMPLEMENTED;