diff options
| author | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2011-01-12 19:27:03 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2011-01-12 19:27:03 +0300 |
| commit | 6b565268fb9ade18f3ec4dc365a2e31ed6f76ee7 (patch) | |
| tree | 38451eccacb53c2e66fb274b7c2267acd5e74261 /tools | |
| parent | 44203907995199447d8a0052e6b1eb0189ae6385 (diff) | |
Fixes constrained VBR
Also removes the 8 byte/packet lower bound
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/celtdec.c | 4 | ||||
| -rw-r--r-- | tools/celtenc.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/celtdec.c b/tools/celtdec.c index b12b50a..23e1e1e 100644 --- a/tools/celtdec.c +++ b/tools/celtdec.c @@ -533,9 +533,9 @@ int main(int argc, char **argv) /*printf ("page granulepos: %d %d %d\n", skip_samples, page_nb_packets, (int)page_granule);*/ last_granule = page_granule; /*Extract all available packets*/ - while (!eos && ogg_stream_packetout(&os, &op) == 1 && op.bytes>=8) + while (!eos && ogg_stream_packetout(&os, &op) == 1) { - if (!memcmp(op.packet, "CELT ", 8)) { + if (op.bytes>=8 && !memcmp(op.packet, "CELT ", 8)) { celt_serialno = os.serialno; } if (celt_serialno == -1 || os.serialno != celt_serialno) diff --git a/tools/celtenc.c b/tools/celtenc.c index 0a3554f..65d9311 100644 --- a/tools/celtenc.c +++ b/tools/celtenc.c @@ -484,10 +484,7 @@ int main(int argc, char **argv) bytes_per_packet = (bitrate*1000*frame_size/rate+4)/8; - if (bytes_per_packet < 8) { - bytes_per_packet=8; - fprintf (stderr, "Warning: Requested bitrate (%0.3fkbit/sec) is too low. Setting CELT to 8 bytes/frame.\n",bitrate); - } else if (bytes_per_packet > MAX_FRAME_BYTES) { + if (bytes_per_packet > MAX_FRAME_BYTES) { bytes_per_packet=MAX_FRAME_BYTES; fprintf (stderr, "Warning: Requested bitrate (%0.3fkbit/sec) is too high. Setting CELT to %d bytes/frame.\n",bitrate,MAX_FRAME_BYTES); } |