Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23673 commits 17 branches 142 tags 291 MiB
Commit graph

116 commits

Author SHA1 Message Date
Thomas Martitz
df79ac2f9d Fix FS#11004 - Buffering crashes when skipping back from end of song. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24755 a1c6a512-1295-4272-9138-f99709370657
 2010-02-18 15:38:30 +00:00
Thomas Martitz
b11c819ddd Convert RINGBUF_* macros to inline functions, saving binsize and improving type safety. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24618 a1c6a512-1295-4272-9138-f99709370657
 2010-02-12 13:12:59 +00:00
Torne Wuff
c4e051bed7 Align addresses in the buffering code to STORAGE_ALIGN_MASK if the target has one. 
The PP502x DMA controller can only deal with doing DMA to 16-byte-aligned
addresses because we have inadequate control over the cache to prevent
interference. Other targets may also *prefer* cacheline aligned DMAs to
reduce the number of cache operations required. Almost all disk reads in
buffering.c will now be suitably aligned, allowing DMA to be used on PP502x.

Original change from FS#9708 by Boris Gjenero (dreamlayers).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24440 a1c6a512-1295-4272-9138-f99709370657
 2010-02-01 17:16:39 +00:00
Rafaël Carré
f620103925 buffering.c: cosmetics 
remove tabs, remove trailing spaces, indentation

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23697 a1c6a512-1295-4272-9138-f99709370657
 2009-11-22 13:51:25 +00:00
Michael Giacomelli
ecd9bcf3cb Commit FS#10605 - stable playback on low memory swcodec targets by Matthias Schneider. Should allow stable playback on targets with less then 4MB of RAM and sofware decoding such as the Sandisk Clip, c200v2, m200v4 and probably others. Fixes several problems in buffering that occured when the files to be buffered weren't much smaller then the ring buffer size. Fixes a bug where move_handle would corrupt the audio buffer when trying to copy a handle that both wrapped around the highest address in the ring buffer and overlapped part of the source and desination ranges. Moves the decision in playback.c about when to update the current track handle from audio_check_new_track to after the metadata has been buffered. Corrects several other minor pieces of code. I've logged about 100 hours without a crash on various players with this patch but its possible it breaks some combination of players and features I haven't thought to test. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23680 a1c6a512-1295-4272-9138-f99709370657
 2009-11-21 17:00:38 +00:00
Jeffrey Goode
59dd433ccd Removed unneeded includes 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23578 a1c6a512-1295-4272-9138-f99709370657
 2009-11-09 05:46:08 +00:00
Rafaël Carré
f3944cb694 buffering: leave a comment to explain what is broken in the code and link to FS#10605 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23344 a1c6a512-1295-4272-9138-f99709370657
 2009-10-25 11:03:59 +00:00
Thomas Martitz
e9c10189e9 Rework albumart buffering internally to allow for mutliple albumart sizes. 
Playback now has a few albumart slots. Anything (most importantly: skins)  can obtain such a slot.
The slot has fields for the size which is passed to bufopen then to image_load to buffer the albumart with the proper size.
Currently there's 1 slot. We can increase it for remotes if we want. Custom statusbar will increase it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23209 a1c6a512-1295-4272-9138-f99709370657
 2009-10-16 19:14:41 +00:00
Nils Wallménius
3d4701a6e4 FS#10080 
* Move strncpy() from core to the pluginlib
* Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins
* Drop strncpy() from the codec api as no codec used it
* Bump codec and plugin api versions


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
 2009-07-14 13:57:45 +00:00
Andrew Mahone
00d6cfd389 Fix yellow when building with HAVE_ALBUMART, without HAVE_JPEG/HAVE_BMP_SCALING. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21092 a1c6a512-1295-4272-9138-f99709370657
 2009-05-26 20:26:05 +00:00
Andrew Mahone
216424a27f Fix the lock contention stall during cover art load, by adding a separate modify mutex for the buffer. Operations that modify contents of a buffer entry can still proceed, but ones that add or remove buffer entries, or move them 
in memory, will still block. Some members of struct memory_handle also need an earlier init in bufopen to make sure that buffer stats aren't trashed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20932 a1c6a512-1295-4272-9138-f99709370657
 2009-05-15 00:14:38 +00:00
Andrew Mahone
20f76d61ae Make JPEG and BMP scaler optional with HAVE_JPEG and HAVE_BMP_SCALING, both defined for all targets that have HAVE_ALBUMART. Disable JPEG in PictureFlow and pluginlib album art search with 32KiB plugin buffer until PictureFlow 
gets overlay support.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20851 a1c6a512-1295-4272-9138-f99709370657
 2009-05-04 15:46:41 +00:00
Andrew Mahone
54e6eb3bda Search for, and load, JPEG album art files. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20837 a1c6a512-1295-4272-9138-f99709370657
 2009-05-01 23:31:43 +00:00
Bertrik Sikken
66cf3a3329 Clean up some #includes 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20238 a1c6a512-1295-4272-9138-f99709370657
 2009-03-08 16:10:40 +00:00
Thomas Martitz
fcbfef8175 Show the watermark in the "Show buffering thread" screen (in bytes). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20096 a1c6a512-1295-4272-9138-f99709370657
 2009-02-23 22:55:48 +00:00
Antonius Hellmann
0055f13707 This should fix the occasional data aborts mainly in conjunction with AlbumArt on PP targets. See FS#9827 for details. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20081 a1c6a512-1295-4272-9138-f99709370657
 2009-02-22 10:12:34 +00:00
Björn Stenberg
6427d127aa Calculate watermark from bitrate and harddisk spinup time. 
Use a smaller PCM buffer on targets with 2MB or less ram.
(FS#9703)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19743 a1c6a512-1295-4272-9138-f99709370657
 2009-01-10 21:10:56 +00:00
Andrew Mahone
9058620849 Make scaler output truly pluggable, add an 8-bit greyscale output to 
pluginlib for use with greylib, and add source for a test scaled bmp
viewer using greylib.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19593 a1c6a512-1295-4272-9138-f99709370657
 2008-12-26 07:05:13 +00:00
Michael Sevakis
8cfbd3604f Use cookies for thread identification instead of pointers directly which gives a buffer against wrongly identifying a thread when the slot is recycled (which has been nagging me for awhile). A slot gets 255 uses before it repeats. Everything gets incompatible so a full update is required. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19377 a1c6a512-1295-4272-9138-f99709370657
 2008-12-10 08:57:10 +00:00
Andrew Mahone
781421afa2 resize-on-load for bitmap files on 2bpp and color targets 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19374 a1c6a512-1295-4272-9138-f99709370657
 2008-12-09 23:07:59 +00:00
Nicolas Pennequin
3625be4803 Fix FS#9319 and its (probably) duplicate, FS#9576. They both describe the boost remaining active after a change of the dynamic playlist, an issue added in r17109. 
The fix is to notify the buffering thread whenever an ID3 handle is created via bufopen (as is done in the other cases of bufopen).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19304 a1c6a512-1295-4272-9138-f99709370657
 2008-12-02 21:07:12 +00:00
Frank Gevaerts
2f8a0081c6 Apply FS#9500. This adds a storage_*() abstraction to replace ata_*(). To do that, it also introduces sd_*, nand_*, and mmc_*. 
This should be a good first step to allow multi-driver targets, like the Elio (ATA/SD), or the D2 (NAND/SD).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18960 a1c6a512-1295-4272-9138-f99709370657
 2008-11-01 16:14:28 +00:00
Jonathan Gordon
71898e5c54 Accept FS#9480 - centralise and organise the events in the apps/ layer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18819 a1c6a512-1295-4272-9138-f99709370657
 2008-10-16 10:38:03 +00:00
Jonathan Gordon
f397c25acf Fix a possible deadlock if the album art loading fails 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18711 a1c6a512-1295-4272-9138-f99709370657
 2008-10-05 09:17:05 +00:00
Nicolas Pennequin
cf369575bc Add handle values to the buffering LOGFQUEUE messages for easier debugging. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18092 a1c6a512-1295-4272-9138-f99709370657
 2008-07-18 23:42:47 +00:00
Nicolas Pennequin
929d5e9399 Fix FS#9137 and FS#8194 (the end of a track is cut off after rebuffering): the cause was a confusion between regular subtraction and subtraction in a ring-buffer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18090 a1c6a512-1295-4272-9138-f99709370657
 2008-07-18 23:26:35 +00:00
Magnus Holmgren
7c84ede378 Hopefully fix FS #9153, as well as another bug (in fill_buffer) that could cause problems when rebuffering. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18009 a1c6a512-1295-4272-9138-f99709370657
 2008-07-11 12:44:27 +00:00
Nicolas Pennequin
a2191b93af Fix FS#8964 (CPU remains boosted after buffering). 'filling' needs to be set to false when there's nothing left to buffer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17923 a1c6a512-1295-4272-9138-f99709370657
 2008-07-02 21:50:42 +00:00
Daniel Stenberg
2acc0ac542 Updated our source code header to explicitly mention that we are GPL v2 or 
later. We still need to hunt down snippets used that are not. 1324 modified
files...
http://www.rockbox.org/mail/archive/rockbox-dev-archive-2008-06/0060.shtml


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17847 a1c6a512-1295-4272-9138-f99709370657
 2008-06-28 18:10:04 +00:00
Nicolas Pennequin
f7e0e6bb1c Lock the linked list mutex when accessing the memory handles. This should fix the invalid values appearing for short times in the buffering debug screen. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17497 a1c6a512-1295-4272-9138-f99709370657
 2008-05-13 20:51:06 +00:00
Steve Bavin
e02d031f4c Remove unused #define. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17294 a1c6a512-1295-4272-9138-f99709370657
 2008-04-30 13:04:24 +00:00
Bertrik Sikken
c97e503a10 Cleaned up playblack.h header file and usage of it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17276 a1c6a512-1295-4272-9138-f99709370657
 2008-04-28 14:13:13 +00:00
Nicolas Pennequin
de026dcede Fix FS#8902 (NSF files get skipped). The cause was too strict metadata checking (the NSF metadata parser doesn't fill the 'length' field). Hopefully there won't be any problems with that anymore. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17142 a1c6a512-1295-4272-9138-f99709370657
 2008-04-16 16:18:05 +00:00
Nicolas Pennequin
4e2de44b44 A rather big change to how tracks are loaded: there are now two parts to the process and metadata loading is done by the buffering thread (except for the first unbuffered track). The audio thread now calls audio_load_track, and once the metadata is loaded, the buffering thread sends an event which will make the audio thread call audio_finish_load_track. This one then takes care of the rest of the loading. 
This method makes skipping noticeably faster for unbuffered tracks, and especially backwards.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17109 a1c6a512-1295-4272-9138-f99709370657
 2008-04-14 16:17:47 +00:00
Jens Arnold
2bf4178018 Make mpegplayer sleep the disk after buffering to save battery. * Add a simulator stub for ata_sleep(), and un-ifdef most calls to it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17096 a1c6a512-1295-4272-9138-f99709370657
 2008-04-13 12:24:47 +00:00
Nicolas Pennequin
33f522de8b Migrate the buffering code to the new events system. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16950 a1c6a512-1295-4272-9138-f99709370657
 2008-04-03 17:51:53 +00:00
Michael Sevakis
8a6fd3ff4e Just change PRIORITY_BUFFERING to 15. Seems a teeny tiny bit helpful to mpegplayer as well. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16884 a1c6a512-1295-4272-9138-f99709370657
 2008-03-29 23:21:19 +00:00
Michael Sevakis
9120c85698 Change the default buffer filechunk back to 32KB and bump the buffering thread priority up by one. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16883 a1c6a512-1295-4272-9138-f99709370657
 2008-03-29 20:52:56 +00:00
Nicolas Pennequin
12b6c847c5 Fix sim warnings. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16881 a1c6a512-1295-4272-9138-f99709370657
 2008-03-29 17:40:04 +00:00
Nicolas Pennequin
732df386af Boost the audio thread while it's filling the buffer. In the audio and the buffering threads, only cancel cpu boost when not filling. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16880 a1c6a512-1295-4272-9138-f99709370657
 2008-03-29 17:28:30 +00:00
Nicolas Pennequin
4fd277481a Correct some windows line endings back to unix. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16877 a1c6a512-1295-4272-9138-f99709370657
 2008-03-29 14:09:14 +00:00
Steve Bavin
135cc757bd Revert my earlier const madness, we'll keep the parameter lists simple. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16863 a1c6a512-1295-4272-9138-f99709370657
 2008-03-28 12:51:33 +00:00
Steve Bavin
c9df8fd87b The const police raid playback.c, should be no change to behaviour. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16860 a1c6a512-1295-4272-9138-f99709370657
 2008-03-28 11:24:24 +00:00
Steve Bavin
73f9863b1b More consts that require no functional change. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16814 a1c6a512-1295-4272-9138-f99709370657
 2008-03-26 08:57:25 +00:00
Michael Sevakis
27cf677339 Add a complete priority inheritance implementation to the scheduler (all mutex ownership and queue_send calls are inheritable). Priorities are differential so that dispatch depends on the runnable range of priorities. Codec priority can therefore be raised in small steps (pcmbuf updated to enable). Simplify the kernel functions to ease implementation and use the same kernel.c for both sim and target (I'm tired of maintaining two ;_). 1) Not sure if a minor audio break at first buffering issue will exist on large-sector disks (the main mutex speed issue was genuinely resolved earlier). At this point it's best dealt with at the buffering level. It seems a larger filechunk could be used again. 2) Perhaps 64-bit sims will have some minor issues (finicky) but a backroll of the code of concern there is a 5-minute job. All kernel objects become incompatible so a full rebuild and update is needed. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16791 a1c6a512-1295-4272-9138-f99709370657
 2008-03-25 02:34:12 +00:00
Nicolas Pennequin
483c40285b Notify the buffering thread when a handle is added, so it can go into filling mode. This is some sort of a replacement for the ATA idle callback. It will interrupt an ongoing buffering process (buffer_handle), but not for long enough to be a problem. 
Should fix a problem reported by Dave Hooper where inserting tracks into the playlist would flush the buffer and not refill it, sometimes causing the inserted tracks to be skipped.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16295 a1c6a512-1295-4272-9138-f99709370657
 2008-02-12 23:15:59 +00:00
Nicolas Pennequin
659fe5a35b Fix FS#6215 (player crashes after trying to resume deleted music file). As mentioned in the lastest comment, the problem was in trying to resume at an offset larger than the size of the file following the one that was deleted. This revealed a crash in the buffering code, which gets a fix, but we also need to intervene earlier in the track loading so that the track that gets played will be from its start. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16028 a1c6a512-1295-4272-9138-f99709370657
 2008-01-08 23:48:51 +00:00
Nicolas Pennequin
ecec94043d Check that the pointer isn't NULL before dereferencing it, just to be safe and to allow using bufgetdata to know how much data is available. Also remove a few trailing spaces. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15940 a1c6a512-1295-4272-9138-f99709370657
 2007-12-16 01:38:56 +00:00
Brandon Low
e959c5aa95 Possibly save a few bytes when stripping the tags of the last allocated handle 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15844 a1c6a512-1295-4272-9138-f99709370657
 2007-11-28 16:39:58 +00:00
Brandon Low
3386dd7be9 Fix FS8069, because Nico_P made it easy 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15840 a1c6a512-1295-4272-9138-f99709370657
 2007-11-28 04:58:16 +00:00