summaryrefslogtreecommitdiff
path: root/apps/recorder/recording.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/recorder/recording.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/recorder/recording.c')
-rw-r--r--apps/recorder/recording.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 4893f589f1..e246825443 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -1730,7 +1730,7 @@ bool recording_screen(bool no_source)
1730 /* Don't use language string unless agreed upon to make this 1730 /* Don't use language string unless agreed upon to make this
1731 method permanent - could do something in the statusbar */ 1731 method permanent - could do something in the statusbar */
1732 snprintf(buf, sizeof(buf), "Warning: %08lX", 1732 snprintf(buf, sizeof(buf), "Warning: %08lX",
1733 pcm_rec_get_warnings()); 1733 (unsigned long)pcm_rec_get_warnings());
1734 } 1734 }
1735 else 1735 else
1736#endif /* CONFIG_CODEC == SWCODEC */ 1736#endif /* CONFIG_CODEC == SWCODEC */
@@ -1755,8 +1755,16 @@ bool recording_screen(bool no_source)
1755 1755
1756 if(audio_stat & AUDIO_STATUS_PRERECORD) 1756 if(audio_stat & AUDIO_STATUS_PRERECORD)
1757 { 1757 {
1758#if CONFIG_CODEC == SWCODEC
1759 /* Tracks amount of prerecorded data in buffer */
1760 snprintf(buf, sizeof(buf), "%s (%lu/%ds)...",
1761 str(LANG_RECORD_PRERECORD),
1762 audio_prerecorded_time() / HZ,
1763 global_settings.rec_prerecord_time);
1764#else /* !SWCODEC */
1758 snprintf(buf, sizeof(buf), "%s...", 1765 snprintf(buf, sizeof(buf), "%s...",
1759 str(LANG_RECORD_PRERECORD)); 1766 str(LANG_RECORD_PRERECORD));
1767#endif /* CONFIG_CODEC == SWCODEC */
1760 } 1768 }
1761 else 1769 else
1762 { 1770 {
@@ -1915,8 +1923,7 @@ bool recording_screen(bool no_source)
1915 screens[i].update(); 1923 screens[i].update();
1916 1924
1917#if CONFIG_CODEC == SWCODEC 1925#if CONFIG_CODEC == SWCODEC
1918 /* stop recording - some players like H10 freeze otherwise 1926 /* stop recording first and try to finish saving whatever it can */
1919 TO DO: find out why it freezes and fix properly */
1920 rec_command(RECORDING_CMD_STOP); 1927 rec_command(RECORDING_CMD_STOP);
1921 audio_close_recording(); 1928 audio_close_recording();
1922#endif 1929#endif