diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 15:12:55 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 15:12:55 +0000 |
| commit | 35bcdef1441519bb66a77b675013309ef39e9eec (patch) | |
| tree | 62a3ebcfecb0a4a582d5bd1998e29be066e090e0 /apps/codecs/aac.c | |
| parent | 0f4dfc4e9d4c2cbae69442e415639476c73478b2 (diff) | |
| download | rockbox-35bcdef1441519bb66a77b675013309ef39e9eec.tar.gz rockbox-35bcdef1441519bb66a77b675013309ef39e9eec.zip | |
Find a more consistent and resilient way to handle SBR upsampled files. The detection is only done in one place (the metadata parser) and takes into account that the m4a header might already report corrected frame/sample sizes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29188 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/aac.c')
| -rw-r--r-- | apps/codecs/aac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c index 37e525e61a..0b27eed472 100644 --- a/apps/codecs/aac.c +++ b/apps/codecs/aac.c | |||
| @@ -145,8 +145,8 @@ next_track: | |||
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | #ifdef SBR_DEC | 147 | #ifdef SBR_DEC |
| 148 | /* The file uses SBR. */ | 148 | /* Check for need of special handling for seek/resume and elapsed time. */ |
| 149 | if (decoder->forceUpSampling) { | 149 | if (ci->id3->needs_upsampling_correction) { |
| 150 | sbr_fac = 2; | 150 | sbr_fac = 2; |
| 151 | } else { | 151 | } else { |
| 152 | sbr_fac = 1; | 152 | sbr_fac = 1; |