summaryrefslogtreecommitdiffstats
path: root/lib/rbcodec/codecs
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-12-22 20:01:42 -0500
committerSolomon Peachy <pizza@shaftnet.org>2018-12-22 20:12:10 -0500
commit928557bb174fdc6ae44d784137e19a61b4f42693 (patch)
tree37b6a3effd923b839c8fb02b806c43ea7506be9f /lib/rbcodec/codecs
parent9b9b30bd547c829157f3f83c71378f0bbd43241d (diff)
downloadrockbox-928557bb174fdc6ae44d784137e19a61b4f42693.tar.gz
rockbox-928557bb174fdc6ae44d784137e19a61b4f42693.tar.bz2
rockbox-928557bb174fdc6ae44d784137e19a61b4f42693.zip
AAC bitstream format files support
Files with extension "aac" in ADTS or ADIF format are now playable. Full credit goes to Igor Poretsky. Change-Id: I413b34e15e5242fea60d3461966ae0984080f530
Diffstat (limited to 'lib/rbcodec/codecs')
-rw-r--r--lib/rbcodec/codecs/SOURCES1
-rw-r--r--lib/rbcodec/codecs/aac_bsf.c157
-rw-r--r--lib/rbcodec/codecs/codecs.make1
3 files changed, 159 insertions, 0 deletions
diff --git a/lib/rbcodec/codecs/SOURCES b/lib/rbcodec/codecs/SOURCES
index 039772cf9a..f0787d267d 100644
--- a/lib/rbcodec/codecs/SOURCES
+++ b/lib/rbcodec/codecs/SOURCES
@@ -42,6 +42,7 @@ vgm.c
#if MEMORYSIZE > 2
kss.c
#endif
+aac_bsf.c
#ifdef HAVE_RECORDING
diff --git a/lib/rbcodec/codecs/aac_bsf.c b/lib/rbcodec/codecs/aac_bsf.c
new file mode 100644
index 0000000000..3bce283958
--- /dev/null
+++ b/lib/rbcodec/codecs/aac_bsf.c
@@ -0,0 +1,157 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Codec for aac files without container
+ *
+ * Written by Igor B. Poretsky
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "codeclib.h"
+#include "libfaad/common.h"
+#include "libfaad/structs.h"
+#include "libfaad/decoder.h"
+
+CODEC_HEADER
+
+/* The maximum buffer size handled by faad. 12 bytes are required by libfaad
+ * as headroom (see libfaad/bits.c). FAAD_BYTE_BUFFER_SIZE bytes are buffered
+ * for each frame. */
+#define FAAD_BYTE_BUFFER_SIZE (2048-12)
+
+static void update_playing_time(void)
+{
+ ci->set_elapsed((unsigned long)((ci->id3->offset - ci->id3->first_frame_offset) * 8LL / ci->id3->bitrate));
+}
+
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
+{
+ if (reason == CODEC_LOAD) {
+ /* Generic codec initialisation */
+ ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
+ ci->configure(DSP_SET_SAMPLE_DEPTH, 29);
+ }
+
+ return CODEC_OK;
+}
+
+/* this is called for each file to process */
+enum codec_status codec_run(void)
+{
+ size_t n;
+ int32_t bread;
+ unsigned int frame_samples;
+ uint32_t s = 0;
+ unsigned char c = 0;
+ long action = CODEC_ACTION_NULL;
+ intptr_t param;
+ unsigned char* buffer;
+ NeAACDecFrameInfo frame_info;
+ NeAACDecHandle decoder;
+ NeAACDecConfigurationPtr conf;
+
+ /* Clean and initialize decoder structures */
+ if (codec_init()) {
+ LOGF("FAAD: Codec init error\n");
+ return CODEC_ERROR;
+ }
+
+ ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
+ codec_set_replaygain(ci->id3);
+
+ ci->seek_buffer(ci->id3->first_frame_offset);
+
+ /* initialise the sound converter */
+ decoder = NeAACDecOpen();
+
+ if (!decoder) {
+ LOGF("FAAD: Decode open error\n");
+ return CODEC_ERROR;
+ }
+
+ conf = NeAACDecGetCurrentConfiguration(decoder);
+ conf->outputFormat = FAAD_FMT_24BIT; /* irrelevant, we don't convert */
+ NeAACDecSetConfiguration(decoder, conf);
+
+ buffer=ci->request_buffer(&n, FAAD_BYTE_BUFFER_SIZE);
+ bread = NeAACDecInit(decoder, buffer, n, &s, &c);
+ if (bread < 0) {
+ LOGF("FAAD: DecInit: %ld, %d\n", bread, decoder->object_type);
+ return CODEC_ERROR;
+ }
+ ci->advance_buffer(bread);
+
+ if (ci->id3->offset > ci->id3->first_frame_offset) {
+ /* Resume the desired (byte) position. */
+ ci->seek_buffer(ci->id3->offset);
+ NeAACDecPostSeekReset(decoder, 0);
+ update_playing_time();
+ } else if (ci->id3->elapsed) {
+ action = CODEC_ACTION_SEEK_TIME;
+ param = ci->id3->elapsed;
+ } else {
+ ci->set_elapsed(0);
+ ci->set_offset(ci->id3->first_frame_offset);
+ }
+
+ /* The main decoding loop */
+ while (1) {
+ if (action == CODEC_ACTION_NULL)
+ action = ci->get_command(&param);
+
+ if (action == CODEC_ACTION_HALT)
+ break;
+
+ /* Deal with any pending seek requests */
+ if (action == CODEC_ACTION_SEEK_TIME) {
+ /* Seek to the desired time position. */
+ ci->seek_buffer(ci->id3->first_frame_offset + (uint32_t)((uint64_t)param * ci->id3->bitrate / 8));
+ ci->set_elapsed((unsigned long)param);
+ NeAACDecPostSeekReset(decoder, 0);
+ ci->seek_complete();
+ }
+
+ action = CODEC_ACTION_NULL;
+
+ /* Request the required number of bytes from the input buffer */
+ buffer=ci->request_buffer(&n, FAAD_BYTE_BUFFER_SIZE);
+
+ if (n == 0) /* End of Stream */
+ break;
+
+ /* Decode one block - returned samples will be host-endian */
+ if (NeAACDecDecode(decoder, &frame_info, buffer, n) == NULL || frame_info.error > 0) {
+ LOGF("FAAD: decode error '%s'\n", NeAACDecGetErrorMessage(frame_info.error));
+ return CODEC_ERROR;
+ }
+
+ /* Advance codec buffer (no need to call set_offset because of this) */
+ ci->advance_buffer(frame_info.bytesconsumed);
+
+ /* Output the audio */
+ ci->yield();
+ frame_samples = frame_info.samples >> 1;
+ ci->pcmbuf_insert(&decoder->time_out[0][0], &decoder->time_out[1][0], frame_samples);
+
+ /* Update the elapsed-time indicator */
+ update_playing_time();
+ }
+
+ LOGF("AAC: Decoding complete\n");
+ return CODEC_OK;
+}
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index 8934272fcf..afb8396938 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -181,6 +181,7 @@ $(CODECDIR)/sgc.codec : $(CODECDIR)/libsgc.a $(CODECDIR)/libemu2413.a
$(CODECDIR)/vgm.codec : $(CODECDIR)/libvgm.a $(CODECDIR)/libemu2413.a
$(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
$(CODECDIR)/opus.codec : $(CODECDIR)/libopus.a $(TLSFLIB)
+$(CODECDIR)/aac_bsf.codec : $(CODECDIR)/libfaad.a
$(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list