summaryrefslogtreecommitdiffstats
path: root/apps/codecs.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-06-22 16:41:16 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-06-30 00:40:27 +0200
commit488813197292bd1db8d533d7b42c38852971c2e8 (patch)
tree07ea7247799b1b6b487c5ca73311380fc947700e /apps/codecs.c
parenta9ea1a42695401334717f2e497a7f5576d87691d (diff)
downloadrockbox-488813197292bd1db8d533d7b42c38852971c2e8.tar.gz
rockbox-488813197292bd1db8d533d7b42c38852971c2e8.zip
Update software recording engine to latest codec interface.
Basically, just give it a good rewrite. Software codec recording can be implemented in a more straightforward and simple manner and made more robust through the better codec control now available. Encoded audio buffer uses a packed format instead of fixed-size chunks and uses smaller data headers leading to more efficient usage. The greatest benefit is with a VBR format like wavpack which needs to request a maximum size but only actually ends up committing part of that request. No guard buffers are used for either PCM or encoded audio. PCM is read into the codec's provided buffer and mono conversion done at that time in the core if required. Any highly-specialized sample conversion is still done within the codec itself, such as 32-bit (wavpack) or interleaved mono (mp3). There is no longer a separate filename array. All metadata goes onto the main encoded audio buffer, eliminating any predermined file limit on the buffer as well as not wasting the space for unused path queue slots. The core and codec interface is less awkward and a bit more sensible. Some less useful interface features were removed. Threads are kept on narrow code paths ie. the audio thread never calls encoding functions and the codec thread never calls file functions as before. Codecs no longer call file functions directly. Writes are buffered in the core and data written to storage in larger chunks to speed up flushing of data. In fact, codecs are no longer aware of the stream being a file at all and have no access to the fd. SPDIF frequency detection no longer requires a restart of recording or plugging the source before entering the screen. It will poll for changes and update when stopped or prerecording (which does discard now-invalid prerecorded data). I've seen to it that writing a proper header on full disk works when the format makes it reasonably practical to do so. Other cases may have incorrect data sizes but sample info will be in tact. File left that way may play anyway. mp3_enc.codec acquires the ability to write 'Info' headers with LAME tags to make it gapless (bonus). Change-Id: I670685166d5eb32ef58ef317f50b8af766ceb653 Reviewed-on: http://gerrit.rockbox.org/493 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/codecs.c')
-rw-r--r--apps/codecs.c43
1 files changed, 21 insertions, 22 deletions
diff --git a/apps/codecs.c b/apps/codecs.c
index 69204b7c4f..18022d9df3 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -73,13 +73,6 @@ static size_t codec_size;
extern void* plugin_get_audio_buffer(size_t *buffer_size);
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && defined(HAVE_RECORDING)
-#undef open
-static int open(const char* pathname, int flags, ...)
-{
- return file_open(pathname, flags);
-}
-#endif
struct codec_api ci = {
0, /* filesize */
@@ -99,7 +92,7 @@ struct codec_api ci = {
NULL, /* configure */
NULL, /* get_command */
NULL, /* loop_track */
-
+
/* kernel/ system */
#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
__div0,
@@ -147,21 +140,14 @@ struct codec_api ci = {
#endif
#ifdef HAVE_RECORDING
- enc_get_inputs,
- enc_set_parameters,
- enc_get_chunk,
- enc_finish_chunk,
- enc_get_pcm_data,
- enc_unget_pcm_data,
-
- /* file */
- (open_func)PREFIX(open),
- PREFIX(close),
- (read_func)PREFIX(read),
- PREFIX(lseek),
- (write_func)PREFIX(write),
+ NULL, /* enc_pcmbuf_read */
+ NULL, /* enc_pcmbuf_advance */
+ NULL, /* enc_encbuf_get_buffer */
+ NULL, /* enc_encbuf_finish_buffer */
+ NULL, /* enc_stream_read */
+ NULL, /* enc_stream_lseek */
+ NULL, /* enc_stream_write */
round_value_to_list32,
-
#endif /* HAVE_RECORDING */
/* new stuff at the end, sort into place next time
@@ -299,3 +285,16 @@ int codec_close(void)
return status;
}
+
+#ifdef HAVE_RECORDING
+enc_callback_t codec_get_enc_callback(void)
+{
+ if (curr_handle == NULL ||
+ c_hdr->lc_hdr.magic != CODEC_ENC_MAGIC) {
+ logf("Codec: not an encoder");
+ return NULL;
+ }
+
+ return c_hdr->rec_extension[0];
+}
+#endif /* HAVE_RECORDING */