wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
120,633 Commits 1 Branch 165 Tags 1.2 GiB
5c1dc30b64
Commit Graph

1583 Commits

Author SHA1 Message Date
Robert O'Callahan
a60bcefab7 Bug 476811. Fire 'waiting' event when the decoder starts buffering. r=doublec 
--HG--
extra : rebase_source : 1ac5d728e4f3f3e83de61d0806b20f328cdf380c
 2009-02-11 14:43:45 +13:00
Robert O'Callahan
af7e712e3f Bug 469272. Get rid of mPlayRequested since it's not needed; just use mPaused to remember whether we should be playing or not, if play() is called before the stream is loaded. r=doublec,r=kinetik 
--HG--
extra : rebase_source : 2753730346f3159f07214e0116a9a32bc45a348d
 2009-02-11 14:23:19 +13:00
Chris Double
efa39a8385 Back out bug 476731 in commit id 364777bc90b5 due to reftest failures 2009-02-09 15:52:04 +13:00
Chris Double
cb749708f5 Backed out changeset 364777bc90b5 due to test failures 2009-02-09 15:51:16 +13:00
Chris Double
d12a22daef Bug 469923 - Fix rounding issues with X-Content-Duration header causing test failure - r+sr=roc 2009-02-09 14:47:49 +13:00
Chris Pearce
8d5bc5908a Bug 476731 - Media element should fire error event when src is a 404 - r=doublec sr=roc 2009-02-09 14:04:10 +13:00
Chris Double
0757196440 Bug 469923 - Support X-Content-Duration for improved duration retrieval for Ogg media - r+sr=roc 2009-02-07 23:10:34 +13:00
Jesse Ruderman
2e1fda752f Add crashtests for the following bugs: https://bugzilla.mozilla.org/buglist.cgi?quicksearch=328944+401042+413085+416461+431705+437142+449006+463741+465651+472782+474744 2009-02-07 21:33:31 -08:00
Robert O'Callahan
c94a302481 Bug 455654. Rework the download-rate, playback-rate and related statistics so they're managed by the decoders in a thread-safe way. Implement proper HTML5 readyState handling with event firing, including 'canplay' and 'canplaythrough' events and autoplay behaviour. Also changes buffering so that we buffer when we're actually about to run out of data, instead of trying to guess when to buffer based on rate estimates. r=doublec 2009-02-05 21:02:21 +13:00
Robert O'Callahan
c752fcbe22 Backed out changeset ba595db2b681 2009-02-05 23:51:24 +13:00
Robert O'Callahan
3c26c1d1a0 Bug 455654. Rework the download-rate, playback-rate and related statistics so they're managed by the decoders in a thread-safe way. Implement proper HTML5 readyState handling with event firing, including 'canplay' and 'canplaythrough' events and autoplay behaviour. Also changes buffering so that we buffer when we're actually about to run out of data, instead of trying to guess when to buffer based on rate estimates. r=doublec 2009-02-05 21:02:21 +13:00
Chris Double
27dc9d2650 Bug 452698. Ensure that YUV to RGB conversion puts bytes in the right order for big-endian machines (PPC). r+sr=roc 
--HG--
extra : rebase_source : 8939f59496da5548509ebd64a515947b071c204d
 2009-01-30 20:30:37 +13:00
Matthew Gregan
e8b10c972d Bug 469698. Convert little-endian Wave data to native endinaness on big-endian machines (e.g. PPC). r+sr=roc 
--HG--
extra : rebase_source : a791e7474167faed8bebfdfd9bf960fe6fb752df
 2009-01-30 20:27:43 +13:00
Robert O'Callahan
6710c49b25 Bug 466410. Make sure videoWidth and videoHeight are posted to the element before metadataloaded fires. r=doublec 2009-01-28 22:33:37 +13:00
Chris Double
625058e17b Bug 475369. Fix regression from bug 451958 in passing mSeeking and mOffset to nsChannelToPipeListener. r+sr=roc 2009-01-28 22:27:09 +13:00
Chris Double
85e6295f63 Bug 451958 - Disable tests that fail randomly on Windows - r=roc 2009-01-27 15:33:03 +13:00
Chris Pearce
241aa1c5b2 Bug 451958. Add more CheckLoadURIs (part 4). r+sr=roc 
--HG--
extra : rebase_source : de1defd553b7f14cd5a5c1f04ccd0821b4422e4d
 2009-01-25 21:08:06 +13:00
Chris Pearce
389d3c06a1 Bug 451958. Add more CheckLoadURIs (part 3). r+sr=roc 
--HG--
extra : rebase_source : e4fbaea74fa01592896982d4c3862fa8a0ad86dd
 2009-01-25 21:07:54 +13:00
Chris Pearce
0c4bfb13af Bug 451958. Add more CheckLoadURIs (part 2). r+sr=roc 
--HG--
extra : rebase_source : 09323fc6904d59a7b747187293c5850351401580
 2009-01-25 21:07:43 +13:00
Chris Pearce
3b0b1c6e28 Bug 451958. Support Access-Controls for media loads. r+sr=roc 
--HG--
extra : rebase_source : 4a180379a401040f16c4fce80ef116da139ba2cb
 2009-01-25 00:00:17 +13:00
Daniel Holbert
31c18a6827 Bug 458167 - Fix bad usage of "it's" in comments: patch for content folder. r+sr=jst 2009-01-23 01:02:09 -08:00
Robert O'Callahan
876f275609 Backed out changeset a87563d6594e 
--HG--
extra : rebase_source : e4687a80f8e88f7f0e156a34ca95f96a1eaf85f6
 2009-01-23 17:39:45 +13:00
Chris Pearce
f816163290 Bug 451958. Support Access-Controls for media loads. r+sr=roc 
--HG--
extra : rebase_source : ab0be3a0dc18e6accfb4059c5d0f3e252b890afc
 2009-01-23 16:13:19 +13:00
Robert O'Callahan
66b0586b81 test_progress1.html still fails, sigh 2009-01-23 08:32:08 +13:00
Ted Mielczarek
961ec917de bug 474754 - sporadic test failures in test_wav_trunc.html. disable this test for now 2009-01-22 10:08:36 -05:00
Robert O'Callahan
6041ff18b9 Reenable test_progress1 to see if it passes now 2009-01-22 22:36:03 +13:00
Robert O'Callahan
4b882b6a59 Bug 474393. Fix bytes-downloaded count. r=doublec 2009-01-22 22:35:27 +13:00
Daniel Holbert
2fc6f19341 Backed out changeset e6566d187edd (bug 466410) on suspicion of causing linux reftest failures in 'ogg-video/basic-1.html' and 'ogg-video/zoomed-1.html' 2009-01-21 22:36:22 -08:00
Robert O'Callahan
1ff5269fcc Bug 466410. Ensure that videoWidth and videoHeight are valid when metadataloaded fires on Ogg videos. r=doublec 
--HG--
extra : rebase_source : 9e2a9c286a97ad9ba376a68d53a901af6b8ed312
 2009-01-22 13:52:06 +13:00
Chris Double
c8da86bd29 Bug 460738 - Suspend media downloads when in bfcache - r=kinetik sr=roc 2009-01-22 12:54:40 +13:00
Robert O'Callahan
8a01e6f96e Add missing tests for bug 463830 2009-01-17 22:26:55 +13:00
Chris Pearce
dd26dee475 Bug 463830. Use the video file name as the window title for standalone video objects, for now. r+sr=roc,r+sr=bzbarsky 
--HG--
extra : rebase_source : b9ee2200c86a0c3fa06cdb163a39a183aa313380
 2009-01-16 22:07:26 +13:00
Chris Pearce
dab0d6b3f3 Bug 469446. Necko should be able to cache byte-range requests when the start offset is zero. Then we can make our initial video load a byte-range request to detect whether the server supports byte-range requests, and the video data can still be cached. r=doublec,sr=roc,r=bzbarsky 
--HG--
extra : rebase_source : acec408274be2b770b5f1936b4f915ef1bafa60b
 2009-01-16 21:22:08 +13:00
Robert O'Callahan
b77d06a80b Bug 472878. Allow nsMediaDecoder::Invalidate to UpdateMediaSize on the element even if there is no frame for the element. r=doublec 
--HG--
extra : rebase_source : dcafd327c98d1da7076f06c86b23eb7d5dd1edcb
 2009-01-16 20:57:37 +13:00
Robert O'Callahan
82f8d8d1cb Disable randomly-failing progress-event test, properly 2009-01-16 15:24:52 +13:00
Robert O'Callahan
134102b6da Disable randomly-failing progress-event test 2009-01-16 15:15:21 +13:00
Chris Double
525b4dcecb Bug 464376 - Dispatch progress events while media resource is downloading - r+sr=roc 2009-01-16 09:26:51 +13:00
Matthew Gregan
a854c4ee45 Bug 471590. Update wave-decoder Pause to handle possible asynchyronous loading. r=doublec,sr=roc 
--HG--
extra : rebase_source : 4146cd1a399875992e44769d752effc4f312841f
 2009-01-08 21:44:38 +13:00
Chris Double
cdee3a861f Backed out changeset f155c8f39715 2009-01-07 16:33:42 +13:00
Chris Double
508543fa18 Bug 464376 - Fire audio/video progress events as per spec - r+sr=roc 2009-01-07 14:48:52 +13:00
Jesse Ruderman
22cd32241d Add five crashtests 2009-01-06 16:47:56 -08:00
Chris Pearce
d79cdb7eae Bug 472204. Define event handler scripts before the video/audio elements that reference them, to guard against situations where the video element loads before we've parsed the event handlers. r=roc 2009-01-06 14:18:40 +13:00
Robert O'Callahan
c149ac33a2 Backed out changeset a5587354082a 2009-01-05 16:33:01 +13:00
Chris Pearce
5f79974815 Bug 451958. Implement load policy for media elements. r+sr=roc 
--HG--
extra : rebase_source : 6554a080e91e0cf61807dd29ca5103dd35531cd8
 2009-01-05 13:50:33 +13:00
Robert O'Callahan
374cd3a20b Bug 449142. Scale video so that it fits in the content-box of the element and has the same aspect ratio as the video source. Also adds some Ogg video reftests. r=doublec,sr=dbaron 2008-12-29 21:20:27 +13:00
Robert O'Callahan
d7e2ae3261 Backed out changeset 1a4e7f55120d 2008-12-18 23:17:30 +13:00
Chris Double
fd9291b7fe Bug 464376. Fire progress events reliably and especially be sure to fire a final progress event when the resource finishes loading. r+sr=roc 
--HG--
extra : rebase_source : 387866a3c9ad9f05e35e9876ebd1db1224237798
 2008-12-18 20:56:32 +13:00
Robert O'Callahan
f4013df6e7 Backed out changeset 70b57b58afe2 2008-12-18 16:55:38 +13:00
Chris Double
9e493d5b6d Bug 464376. Fire progress events more consistently, especially being sure to fire a progress event at the end of a load. r+sr=roc 2008-12-18 14:48:44 +13:00
Robert O'Callahan
50bd83420a Bug 469247. Implement 'canPlayType' API for video/audio elements. r=doublec,r+sr=bzbarsky 
--HG--
extra : rebase_source : 06b14571546a763ee4f4b8641e8582bfff2caf8d
 2008-12-17 15:11:07 +13:00
Matthew Gregan
c88fcaacd3 Bug 469595 - Changes to tests only: test_wav_seek* intermittent test failure - r=doublec 2008-12-16 17:58:33 +13:00
Matthew Gregan
fd9f596d87 Bug 464158 - nsHTMLMediaElement::PickMediaElement does not do media type switching - r=doublec sr=roc 2008-12-16 16:32:03 +13:00
Matthew Gregan
da8f3b4280 Bug 469628 - Playing 8-bit Wave files can block writing to the audio backend - r=doublec sr=roc 2008-12-16 12:37:42 +13:00
Matthew Gregan
32d671a197 Bug 466405 - Ogg and Wave specific mochitests should be hidden by appropriate build-time conditional - r=ted.mielczarek 2008-12-16 12:31:51 +13:00
Chris Double
27cf15deb8 Bug 463627 - Audio playback stops after some seconds on Linux - r=kinetik sr=roc 2008-12-16 12:06:22 +13:00
Chris Pearce
bae9b8c1a5 Bug462570 - Change Network state and Ready state names in HTMLMediaElement to match spec - r=doublec sr=roc 2008-12-15 16:38:16 +13:00
Matthew Gregan
d69380b6d1 Bug 469598 - nsHTMLMediaElement::MetadataLoaded calls nsMediaDecoder::Seek(0) - r=doublec sr=roc 2008-12-15 15:12:52 +13:00
Matthew Gregan
35292415af Bug 465498 - HTML5 <audio>: setting 'currentTime' throws exception sometimes; r+sr=roc 2008-12-14 21:46:28 +01:00
Matthew Gregan
1d1cb9373a Bug 468190 - ended reports true when seeking after playback ended; r=chris.double sr=roc 2008-12-14 19:02:54 +01:00
Matthew Gregan
ac28ff340a Bug 469255 - Seeking while seek in progress not handled correctly by Wave decoder; r+sr=roc 2008-12-14 15:54:45 +01:00
Chris Pearce
af426f61f6 Bug 469016 - Seeks after playback ended but before playback ended event are lost; r=chris.double sr=roc 2008-12-14 04:15:18 +01:00
Matthew Gregan
588b67e59c Bug 468992. Use stored mURI to reopen a WAVE stream after we've finished playing it. r+sr=roc 2008-12-12 21:43:36 +13:00
Chris Pearce
7e52bb9825 Bug 468721. Restructure Ogg decoder shutdown, making Stop synchronous on the main thread and queuing an event to destroy the decoder and associated state. r=doublec,sr=roc 2008-12-12 21:41:49 +13:00
Robert O'Callahan
8786ac7740 Bug 448600. Add prefs to disable Ogg and WAVE backends. r=doublec,sr=bzbarsky 2008-12-12 21:17:57 +13:00
Chris Pearce
15797f2c82 Bug 466045 - Intermittent failure of video seek mochitests; r=chris.double sr=roc 2008-12-10 15:30:41 +01:00
Chris Pearce
47107e9da3 Bug 467972 - Load() invoked to do seek in onended results in sending onloadedmetadata; r=chris.double sr=roc 2008-12-10 15:23:23 +01:00
Chris Pearce
e818da7cff Bug 466557. Don't let the Ogg decoder get stuck in states when unexpected transitions happen. r=doublec,sr=roc 2008-12-09 13:49:24 +13:00
Chris Double
8b5ba34291 Bug 465832. Make sure we don't fire any DOM events from a decoder that's shutting down. r=kinetik,sr=roc 2008-12-09 13:43:56 +13:00
Chris Double
cb0b0c4a77 Backed out changeset 34f6eb1300f1 due to test failure 2008-12-06 19:53:23 +13:00
Chris Double
b094bb85bd bug 464376 - Fire media progress events as needed - r+sr=roc 2008-12-06 18:25:16 +13:00
Serge Gautherie
c1a90c994b Backed out changeset: cb9da8789fce 2008-12-05 18:39:22 +01:00
Matthew Gregan
048708e0c1 Bug 465498 - HTML5 <audio>: setting 'currentTime' throws exception sometimes; r+sr=roc 2008-12-05 17:00:27 +01:00
Matthew Gregan
90c9d5fd1d Bug 466598. Clamp seeking in WAV files. r+sr=roc 2008-12-03 14:38:15 +13:00
Robert O'Callahan
76e539e029 Backed out changeset 3f5a6da199fc 2008-12-03 13:26:55 +13:00
Matthew Gregan
d3e8426e8c Bug 464158. Implement media type switching based on the MIME type of the loaded resouce. r=doublec,sr=roc 2008-12-03 10:16:15 +13:00
Robert O'Callahan
38b1afff17 Backed out changeset ab6c0cda36b2 to fix test failures 2008-11-19 16:21:08 +13:00
Chris Pearce
21090b1054 Bug 451958. Implement access checks for media elements. r+sr=roc,a=beltzner 2008-11-19 14:08:39 +13:00
Chris Pearce
d3f76607a7 Bug 462878. Ensure that nsMediaStream::Close is only called on the main thread, and prevent reentrant Stop calls. r+sr=roc,a=beltzner 2008-11-18 21:19:32 +13:00
Robert O'Callahan
feb588c019 Backed out changeset bbbcc5a1eb5e 2008-11-17 23:40:09 +13:00
Chris Pearce
d535b435ae Bug 462878. Make sure nsMediaStream::Close is only called on the main thread. Also prevent reentrant Stop calls. r=doublec,r+sr=roc,a=beltzner 2008-11-17 20:36:21 +13:00
Matthew Gregan
ec64786dd5 b=463968 test_wav_ended1.html can fail on slow machines with no audio hardware. r+sr=roc 2008-11-11 11:45:09 +13:00
Chris Pearce
4eb5f79990 Bug 462933. Remove timeouts from video tests, rely on master Mochitest timeout only. r=roc 2008-11-10 21:13:59 +13:00
Matthew Gregan
821f8b9ee4 Bug 463929. Support 8-bit WAV streams. r+sr=roc 2008-11-10 21:12:13 +13:00
Chris Double
a0ac5999cf Bug 449307 - Implement duration support for ogg backend - s+sr=roc 2008-11-10 14:38:02 +13:00
Matthew Gregan
873fa1824f b=449315 Support WAV format in <audio> element. r+sr=roc 2008-11-07 09:53:20 +13:00
Justin Dolske
c16718dbda Backout 30bfb150da06 (bug 449315) due to unit test timeouts. 2008-11-05 16:37:51 -08:00
Justin Dolske
f701f9d7f5 Backed out changeset 30bfb150da06 2008-11-05 16:36:12 -08:00
Chris Pearce
cb992e4544 b=462953 Remove unimplemented media attributes/methods from media IDL r=doublec,sr=roc 2008-11-06 11:53:29 +13:00
Matthew Gregan
c39fd04c4a b=449315 Support WAV format in <audio> element. r+sr=roc 2008-11-06 11:25:04 +13:00
Chris Double
b0413aae98 Backed out changeset a82181a23253 2008-11-05 00:01:04 +13:00
Chris Double
1379f310fb Bug 449307 - Support duration attribute on media elements - r+sr=roc 2008-11-04 21:08:39 +13:00
Chris Double
b3cdf58216 Bug 462916 - Update liboggplay to pick up ability to compute Ogg duration - r+sr=roc 2008-11-04 21:06:40 +13:00
Chris Double
4044a293e4 Bug 462378 - Cache video/audio downloads to file - r+sr=bzbarsky 2008-10-31 11:24:29 +13:00
Ted Mielczarek
26dab6f284 bug 461395 - add support for PARALLEL_DIRS to build system, parallelize content. r=bsmedberg 2008-10-30 13:02:14 -04:00
Robert O'Callahan
c98e2689e7 Bug 448603. Support direct loading of Ogg audio and video files by creating a synthetic <video> document. r=doublec,sr=bzbarsky 2008-10-29 22:20:08 -07:00
Chris Double
dfed368739 Bug 448680 - Starting <video> playback causes master volume to jump to max - r+sr=roc 2008-10-29 05:17:59 +13:00
Chris Double
25b91b292c Bug 461281 - CPU usage goes to 100% after playing some Ogg files - r+sr=roc 2008-10-24 18:43:17 +13:00
Chris Double
3cdc37e789 Backout of Bug 461281 2008-10-23 23:58:26 +13:00
Chris Double
219121677e Backed out changeset 8493c800cc20 2008-10-23 23:57:58 +13:00
Chris Double
391db362c4 Backout of Bug 461281 2008-10-23 23:57:26 +13:00
Chris Double
db6bfe5b31 Backed out changeset f291cb19c48b 2008-10-23 23:57:02 +13:00
Chris Pearce
5626abf73f Bug 461287 - nsHttpStreamStrategy::Seek() incorrectly increments read cursor - r=chris.double sr=roc 2008-10-23 21:14:28 +13:00
Chris Double
bc19465a73 Bug 461281 - Add .ogg file for tests - r+sr=roc 2008-10-23 21:08:49 +13:00
Chris Double
d790b3cadb Bug 461281 - CPU usage goes to 100% after playing some Ogg files - r+sr=roc 2008-10-23 21:07:36 +13:00
Chris Double
29028931ea Bug 460871 - fire timeupdate event when playback position changes - r+sr=roc 2008-10-23 21:02:18 +13:00
Chris Double
d01400799c Bug 449154 - nsHTMLMediaElement::play() doesn't reset properly - s+sr=roc 2008-10-21 22:19:33 +13:00
Olli Pettay
d5328ab301 Bug 460751 - Progress events should use long long, not long for .total and .loaded, r=chris.double, sr=sicking 2008-10-21 12:06:53 +03:00
Chris Double
d8f279addd Bug 449159 - Refactor Ogg backend and implement seeking - r+sr=roc 2008-10-19 20:39:21 +13:00
Chris Double
7c6c3f79d2 Bug 459765 - Update to libsydneyaudio r3730 r=kinetik 2008-10-16 16:16:29 +13:00
Chris Pearce
af37ffa177 Bug 454683 - "Media element setVolume should fail on invalid values" [r+sr=roc] 2008-10-01 00:44:16 -05:00
Matthew Gregan
c918946cca Bug 457806 - "<source> child of <audio> causes HTML parser to enter infinite loop" [r+sr=mrbkap] 2008-09-30 23:58:02 -05:00
Chris Double
1155ec25d9 Backed out changeset 477309013214 2008-10-01 16:52:51 +13:00
Chris Double
87416154b2 Bug 454971 - Support creation of Audio objects outside of the document - r+sr=roc 2008-09-30 12:49:30 +13:00
Chris Double
0ca49699b8 Bug 455500 - Enormous memory usage with fieldset, legend, audio and DOMAttrModified event listener - s+sr=roc 2008-09-30 12:05:06 +13:00
Robert O'Callahan
a63964617e Backing out 454683 due to test failure 2008-09-29 17:06:34 +13:00
Robert O'Callahan
6a7ba95820 Backing out 454683 due to test failure 2008-09-29 17:05:06 +13:00
Serge Gautherie
081680f133 Bug 454683 - Media element setVolume should fail on invalid values; "bustage fix" fix :-> 2008-09-29 04:21:19 +02:00
Serge Gautherie
48439b455d Bug 454683 - Media element setVolume should fail on invalid values; bustage fix 2008-09-29 02:28:19 +02:00
Chris Pearce
88294184fe Bug 454683 - Media element setVolume should fail on invalid values; r+sr=roc 2008-09-29 00:28:26 +02:00
Doug Turner
4a598578ab Bug 457025 - WinCE nsAudioStream link errors. r=chris.double 2008-09-25 15:05:23 -07:00
Chris Double
cb014a3623 Backed out changeset c7c42974317d 2008-09-25 19:33:10 +12:00
Chris Double
5a9cd82fac Bug 449159 - Implement seeking in the Ogg backend - r+sr=roc 2008-09-25 16:25:15 +12:00
Robert O'Callahan
f79290bb0e Bug 450930. Fire a DOM event when painting so that content and chrome can track what's being repainted. r=smaug,sr=dbaron 2008-09-18 21:47:21 +12:00
Ted Mielczarek
468a3823fc bug 447642 - get rid of --disable-mochitest, replace MOZ_MOCHITEST with ENABLE_TESTS. r=bsmedberg 2008-09-09 13:59:11 -04:00
Vladimir Vukicevic
787a337e0f b=451938; ensure correct principal is used in case of <video> and drawImage; r=bz 2008-09-06 16:47:28 -07:00
Olli Pettay
60c17b973e Bug 452262, Crash [@ nsOggDecoder::Stop], r=chris.double, sr=roc 2008-08-27 13:13:24 +03:00
Robert O'Callahan
0bfbd14b8c Disabling test for bug 448534 because it causes a crash in unrelated code :-( 2008-08-04 15:22:38 +12:00
Chris Double
1d47d66f07 Bug 448534. Make sure that the video stops when the element is removed from the document. r+sr=roc 2008-08-04 13:51:01 +12:00
Chris Double
1aeca7c105 Bug 448673. Make sure the progress timer is cancelled properly. r+sr=roc 2008-08-04 13:33:43 +12:00
Chris Double
053f31fd82 Bug 448714. Remove Ogg decoder's observer listener when playback stops. r+sr=roc 2008-08-04 13:31:33 +12:00
Chris Double
225262e936 Bug 422538. Integrate Ogg decoders. r=ted,r+sr=roc 2008-07-29 23:50:14 -07:00
Chris Double
04f0124c61 Bug 447639. Update <video> and <audio> elements for spec changes, and add tests. r+sr=roc 2008-07-29 21:55:27 -07:00
Chris Double
02ccf2851f Bug 382267. Core implementation of the <video> and <audio> elements. r=jst,r+sr=roc 2008-07-09 20:22:20 +12:00