From b35807d75a77f0a27fa8d459ce79a5ff9103b569 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Mon, 31 Jan 2011 13:27:21 -0500 Subject: [PATCH] No longer extracting the frame size from the mode to build the header --- libcelt/celt_header.h | 2 +- libcelt/header.c | 4 ++-- tools/celtenc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcelt/celt_header.h b/libcelt/celt_header.h index 357a7f07..7499179a 100644 --- a/libcelt/celt_header.h +++ b/libcelt/celt_header.h @@ -57,7 +57,7 @@ typedef struct { } CELTHeader; /** Creates a basic header struct */ -EXPORT int celt_header_init(CELTHeader *header, const CELTMode *m, int channels); +EXPORT int celt_header_init(CELTHeader *header, const CELTMode *m, int frame_size, int channels); EXPORT int celt_header_to_packet(const CELTHeader *header, unsigned char *packet, celt_uint32 size); diff --git a/libcelt/header.c b/libcelt/header.c index 2816cd7e..ff98c127 100644 --- a/libcelt/header.c +++ b/libcelt/header.c @@ -51,7 +51,7 @@ _le_32 (celt_uint32 i) return ret; } -int celt_header_init(CELTHeader *header, const CELTMode *m, int channels) +int celt_header_init(CELTHeader *header, const CELTMode *m, int frame_size, int channels) { if (header==NULL) return CELT_BAD_ARG; @@ -64,7 +64,7 @@ int celt_header_init(CELTHeader *header, const CELTMode *m, int channels) header->sample_rate = m->Fs; header->nb_channels = channels; /*FIXME: This won't work for variable frame size */ - header->frame_size = m->shortMdctSize*m->nbShortMdcts; + header->frame_size = frame_size; header->overlap = m->overlap; header->bytes_per_packet = -1; header->extra_headers = 0; diff --git a/tools/celtenc.c b/tools/celtenc.c index 458fe6fa..5a8be452 100644 --- a/tools/celtenc.c +++ b/tools/celtenc.c @@ -508,7 +508,7 @@ int main(int argc, char **argv) /*celt_mode_info(mode, CELT_GET_FRAME_SIZE, &frame_size);*/ - celt_header_init(&header, mode, chan); + celt_header_init(&header, mode, frame_size, chan); header.nb_channels = chan; {