31b7122867
This complements offset-based resume and playback start funcionality. The implementation is global on both HWCODEC and SWCODEC. Basically, if either the specified elapsed or offset are non-zero, it indicates a mid-track resume. To resume by time only, set elapsed to nonzero and offset to zero. To resume by offset only, set offset to nonzero and elapsed to zero. Which one the codec uses and which has priority is up to the codec; however, using an elapsed time covers more cases: * Codecs not able to use an offset such as VGM or other atomic formats * Starting playback at a nonzero elapsed time from a source that contains no offset, such as a cuesheet The change re-versions pretty much everything from tagcache to nvram. Change-Id: Ic7aebb24e99a03ae99585c5e236eba960d163f38 Reviewed-on: http://gerrit.rockbox.org/516 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested: Michael Sevakis <jethead71@rockbox.org>
137 lines
3.8 KiB
C
137 lines
3.8 KiB
C
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2010 Yoshihisa Uchida
|
|
*
|
|
* 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 "codecs/libtta/ttalib.h"
|
|
|
|
CODEC_HEADER
|
|
|
|
/*
|
|
* TTA (True Audio) codec:
|
|
*
|
|
* References
|
|
* [1] TRUE AUDIO CODEC SOFTWARE http://true-audio.com/
|
|
*/
|
|
|
|
static int32_t samples[PCM_BUFFER_LENGTH * 2] IBSS_ATTR;
|
|
|
|
/* 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_SAMPLE_DEPTH, TTA_OUTPUT_DEPTH - 1);
|
|
}
|
|
|
|
return CODEC_OK;
|
|
}
|
|
|
|
/* this is called for each file to process */
|
|
enum codec_status codec_run(void)
|
|
{
|
|
tta_info info;
|
|
unsigned int decodedsamples;
|
|
int endofstream;
|
|
int new_pos = 0;
|
|
int sample_count;
|
|
intptr_t param;
|
|
|
|
if (codec_init())
|
|
{
|
|
DEBUGF("codec_init() error\n");
|
|
return CODEC_ERROR;
|
|
}
|
|
|
|
ci->seek_buffer(0);
|
|
|
|
if (set_tta_info(&info) < 0 || player_init(&info) < 0)
|
|
return CODEC_ERROR;
|
|
|
|
codec_set_replaygain(ci->id3);
|
|
|
|
ci->configure(DSP_SET_FREQUENCY, ci->id3->frequency);
|
|
if (info.NCH == 2) {
|
|
ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
|
|
} else if (info.NCH == 1) {
|
|
ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO);
|
|
} else {
|
|
DEBUGF("CODEC_ERROR: more than 2 channels\n");
|
|
player_stop();
|
|
return CODEC_ERROR;
|
|
}
|
|
|
|
/* The main decoder loop */
|
|
decodedsamples = 0;
|
|
endofstream = 0;
|
|
|
|
if (ci->id3->offset || ci->id3->elapsed)
|
|
{
|
|
/* Need to save offset for later use (cleared indirectly by
|
|
advance_buffer) */
|
|
unsigned int pos = ci->id3->offset;
|
|
enum tta_seek_type type = TTA_SEEK_POS;
|
|
|
|
if (!pos) {
|
|
pos = ci->id3->elapsed / SEEK_STEP;
|
|
type = TTA_SEEK_TIME;
|
|
}
|
|
|
|
new_pos = set_position(pos, type);
|
|
|
|
if (new_pos >= 0)
|
|
decodedsamples = new_pos;
|
|
}
|
|
|
|
ci->set_elapsed((uint64_t)info.LENGTH * 1000 * decodedsamples / info.DATALENGTH);
|
|
|
|
while (!endofstream)
|
|
{
|
|
enum codec_command_action action = ci->get_command(¶m);
|
|
|
|
if (action == CODEC_ACTION_HALT)
|
|
break;
|
|
|
|
if (action == CODEC_ACTION_SEEK_TIME)
|
|
{
|
|
new_pos = set_position(param / SEEK_STEP, TTA_SEEK_TIME);
|
|
if (new_pos >= 0)
|
|
{
|
|
decodedsamples = new_pos;
|
|
}
|
|
|
|
ci->set_elapsed((uint64_t)info.LENGTH * 1000 * decodedsamples / info.DATALENGTH);
|
|
ci->seek_complete();
|
|
}
|
|
|
|
sample_count = get_samples(samples);
|
|
if (sample_count < 0)
|
|
break;
|
|
|
|
ci->pcmbuf_insert(samples, NULL, sample_count);
|
|
decodedsamples += sample_count;
|
|
if (decodedsamples >= info.DATALENGTH)
|
|
endofstream = 1;
|
|
ci->set_elapsed((uint64_t)info.LENGTH * 1000 * decodedsamples / info.DATALENGTH);
|
|
}
|
|
|
|
player_stop();
|
|
return CODEC_OK;
|
|
}
|