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

70 commits

Author SHA1 Message Date
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
Nicolas Pennequin
774fd19c37 Checking for total free buffer space isn't correct. What we need to check is the space available for the particular handle we want to rebuffer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15821 a1c6a512-1295-4272-9138-f99709370657
 2007-11-26 23:51:36 +00:00
Nicolas Pennequin
e24454f8b3 Buffering callbacks rework. There is now one callback for all the events that can occur. Callbacks are now registred only once instead of being removed after having been called. 
Fix FS#8092 by flushing the audio when a rebuffer is needed.
Also add some comments here and there.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15816 a1c6a512-1295-4272-9138-f99709370657
 2007-11-26 21:13:08 +00:00
Michael Sevakis
398d9fd8b4 Hopefully the last word on getting rid of yield_codecs loops (cut read chunk to 16kB). Sansa ata driver also didn't yield enough so buffering would starve other threads. Bump priority of audio thread to keep UI more responsive. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15724 a1c6a512-1295-4272-9138-f99709370657
 2007-11-20 22:45:46 +00:00
Michael Sevakis
fadbf0a6f7 Make threads responsible for explicit cancellation of their own boosted status. Sleeping and timeouts will no longer cancel it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15709 a1c6a512-1295-4272-9138-f99709370657
 2007-11-20 03:44:25 +00:00
Nicolas Pennequin
51923703fd Make the sim sleep between each file chunk, so that its buffering behaves more like that of a real target. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15694 a1c6a512-1295-4272-9138-f99709370657
 2007-11-19 16:37:55 +00:00
Nicolas Pennequin
87e5b1193c The error checking for bitmap handling in bufopen was serioulsy broken, as loading a huge bitmap showed. Fix it and reorganise the code slightly. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15597 a1c6a512-1295-4272-9138-f99709370657
 2007-11-12 15:16:41 +00:00
Nicolas Pennequin
5e0e2391ff Really fix red this time. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15576 a1c6a512-1295-4272-9138-f99709370657
 2007-11-11 13:28:24 +00:00
Nicolas Pennequin
a384fb6d8a Fix red on the iFP. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15575 a1c6a512-1295-4272-9138-f99709370657
 2007-11-11 13:15:36 +00:00
Nicolas Pennequin
9d4bed7ff0 Album art support. Based on FS#3045, but heavily modified to adapt to MoB and for cleanness. 
The cover pictures are loaded from external bitmaps. JPEG and embedded art are not supported. The pictures will only be drawn on the main display. There is no resizing but it is possible to specify the WPS bitmap size in the bitmap names (e.g. cover.100x100.bmp).
The bitmaps are stored in the main buffer and read directly from there. Currently, duplicate bitmaps will simply be present several times in the buffer, but this will be improved.
To enable for a target, #define HAVE_ALBUMART in its config file.
For more information, see the wiki page: http://www.rockbox.org/wiki/AlbumArt.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15572 a1c6a512-1295-4272-9138-f99709370657
 2007-11-11 12:29:37 +00:00
Brandon Low
dc0f497a4f No functional change 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15542 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 18:59:22 +00:00
Nicolas Pennequin
b50473ffd8 Fix a bug introduced by r15533 where end-of-file wouldn't be detected correctly. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15541 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 18:27:19 +00:00
Nicolas Pennequin
ca4771b40c Thanks to the changes in prep_bufdata, bufgetdata can be simplified a bit. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15537 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 16:12:28 +00:00
Brandon Low
551db40abb Clean up a (nearly impossible) null check. Add a comment. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15536 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 16:06:24 +00:00
Brandon Low
1db4243379 Change in function should be nearly zero, but change to proper naming and define use and allow a more liberal limit on bufgetdata to only ensure safety of wrapping, not the strict filechunk limit that I tried to impose earlier 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15535 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 15:52:10 +00:00
Brandon Low
6e8ee408bf Fix some bad where a handle is held across a sleep. We should probably audit this in other places as well. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15533 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 15:34:23 +00:00
Nicolas Pennequin
f56cb7e09f Fix the bug where MPC files would be skipped by disabling the check of the requested size against the default filechunk size in prep_bufdata when the caller is bufread. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15528 a1c6a512-1295-4272-9138-f99709370657
 2007-11-08 13:28:13 +00:00
Nicolas Pennequin
71b40994e0 Fix a flaw in prep_bufdata() that would lead to all kinds of problems with codecs that used bufread (MPC is one). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15501 a1c6a512-1295-4272-9138-f99709370657
 2007-11-07 00:39:08 +00:00
Brandon Low
3eed6fc025 Fix thinko in last patch, shouldn't effect current buffering clients. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15496 a1c6a512-1295-4272-9138-f99709370657
 2007-11-06 16:57:07 +00:00
Brandon Low
9821cce484 Pull the size range checking and disk request into a separate function that both bufread and bufgetdata can use. Do better range checking to ensure that we don't get 'stuck' in the calls and warn with a logf if requests are made for which we cannot guarantee satisfaction. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15495 a1c6a512-1295-4272-9138-f99709370657
 2007-11-06 16:49:30 +00:00
Nicolas Pennequin
86b7c2b408 This was (probably) committed by accident, remove it. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15491 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 23:46:45 +00:00
Brandon Low
7ca056dc13 Don't yield twice in a row 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15490 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 21:48:15 +00:00
Nicolas Pennequin
eac794de77 Types other than packet audio still need to yield while buffering. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15489 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 21:46:17 +00:00
Nicolas Pennequin
0c7b26d3a7 Readd yield_codec, making it check for useful data through buffer_is_low. Fixes the PCM buffer underruns. 
Also move update_data_counters and make it static.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15487 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 21:11:54 +00:00
Brandon Low
287f14b8ca This was a bad change on my part earlier. Do not immediately start buffering codecs when they are bufopened 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15486 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 18:58:50 +00:00
Nicolas Pennequin
6631e36fa7 Fix some logf warnings. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15483 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 18:19:38 +00:00
Brandon Low
86830b6566 Create two separate ways for a handle buffer request to be sent. One is when the buffer has gotten low, in this case, we want to start a buffer fill. The other is when the buffer itself requests a buffer as part of a running fill. Obviously this is not a new fill start 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15480 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 17:51:55 +00:00
Brandon Low
76f9bfa945 When seeking foward off of the buffer, if it is a short seek don't rebuffer the whole track, just read enough to satisfy 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15479 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 17:50:51 +00:00
Brandon Low
3379440a4b Remove conf_filechunk, it should never have been a setting and its implementation doesn't do what it claims any way 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15478 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 17:48:21 +00:00
Brandon Low
1df1e7b0c7 Remove unused conf_preseek from buffering.c and all of its accountraments. This is _not_ a setting. This is a guessing tool used by either playback or buffering to serve its clients better. Use the REBUFFER_GUESS size in resume to help obviate pondlife's bug. This will also need to be used when FS8092 gets fixed correctly with a complete rebuffer for backward movements. It may also belong in buffering not playback, haven't decided for sure 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15475 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 16:02:12 +00:00
Brandon Low
560515fba1 Minor improvement in responsiveness to buffer_handle calls 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15473 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 15:47:40 +00:00
Brandon Low
555a764dad logging improvements 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15472 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 15:24:21 +00:00
Brandon Low
47eb569b62 SHould fix FS#8074, is more better regardless though 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15466 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 03:11:58 +00:00
Brandon Low
d02b5c744e Don't keep useless id3v2 or other leading tag data on the buffer, it could be large 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15465 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 01:56:12 +00:00
Brandon Low
31c1164c49 make handle_id of zero valid, stop using memsets to clear tracks, should be no functional changes 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15462 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 19:01:02 +00:00
Brandon Low
2ecb3231c6 More residuals from 8077, sanitize chunk and watermark settings 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15452 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 06:01:46 +00:00
Brandon Low
ebc981b233 More residuals from 8077 that should make buffering start up more smoothly and complete more completely 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15451 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 05:57:48 +00:00
Brandon Low
3817acc682 Tweak the way the data_counters are calculated to make it more friendly to the potential read-during-write, probably has very little impact on the compiled code 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15448 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 05:15:41 +00:00
Brandon Low
aabd6885bf More try to fix 8077, BUF_USED is not a good way to determine if the buffer is healthy any more, we'll need a enw way if we need to resurrect yield_codec later 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15447 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 02:40:24 +00:00
Brandon Low
1c36a660ea Disable the already spinning optimization until it is written correctly 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15445 a1c6a512-1295-4272-9138-f99709370657
 2007-11-04 00:23:22 +00:00
Brandon Low
9784f6b752 Make the use of signed int for buffer handles consistent and handle wrapping better. Number of handle_ids available is unchanged by this. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15442 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 22:06:56 +00:00
Brandon Low
7b74dd7574 Attempt to fix FS#8077... again 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15441 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 21:57:27 +00:00
Brandon Low
c2e1cc1e39 Revert recent changes that are broken 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15439 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 21:48:08 +00:00
Brandon Low
acb3e9af22 Make handle id semantics more like file id. This may need to be revisited if we ever start storing long lived things on the buffer (if an item lives through 32k other items coming and going, there will be an id collision and things will break) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15437 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 21:13:15 +00:00
Brandon Low
60d4e7c9c4 Buffering consistency improvements 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15436 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 17:55:45 +00:00
Brandon Low
11a3661d73 Make atomic type work for even first track. Rework low buffer handling... uses a stateful variable because I'm a bitter old man and it works this way 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15425 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 06:21:32 +00:00
Brandon Low
dc58c3d92e Give lowmem targets or targets with broken ATA implementations more buffering opportunities. Fix part of hcs' long standing SPC bug by filling if the useful data is equal to the watermark as well as less than 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15417 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 03:46:22 +00:00