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

setting nb channels automatically from the mode.

Browse source
This commit is contained in:
Jean-Marc Valin 2008-02-14 15:21:01 +11:00
parent 0d28aa99c0
commit bdd0280293
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/celtdec.c
View file

@ -296,11 +296,14 @@ static CELTDecoder *process_header(ogg_packet *op, celt_int32_t enh_enabled, cel
celt_header_from_packet((char*)op->packet, op->bytes, &header); celt_header_from_packet((char*)op->packet, op->bytes, &header);
if (header.mode==0) if (header.mode==0)
mode = celt_mono;
else if (header.mode==1)
mode = celt_stereo;
else
{ {
mode = celt_mono;
*channels = 1;
} else if (header.mode==1)
{
mode = celt_stereo;
*channels = 2;
} else {
fprintf (stderr, "Invalid mode: %d\n", header.mode); fprintf (stderr, "Invalid mode: %d\n", header.mode);
return NULL; return NULL;
} }
@ -321,9 +324,6 @@ static CELTDecoder *process_header(ogg_packet *op, celt_int32_t enh_enabled, cel
*nframes = 1; *nframes = 1;
if (*channels==-1)
*channels = header.nb_channels;
if (!quiet) if (!quiet)
{ {
fprintf (stderr, "Decoding %d Hz audio in", *rate); fprintf (stderr, "Decoding %d Hz audio in", *rate);