Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 14:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
347,677 Commits 615 Branches 98 Tags 6 GiB
60d3930af5
Commit Graph

226 Commits

Author SHA1 Message Date
Boris Zbarsky
43f774459d Bug 868312 finale: finish rooting dom/ code. r=smaug 2013-05-17 21:48:25 -04:00
Ryan VanderMeulen
91eae578bd Merge inbound to m-c. 2013-05-16 20:29:40 -04:00
Ryan VanderMeulen
c87dc8562f Merge m-c to birch. 2013-05-16 16:18:21 -04:00
Dave Hylands
70ed43e46c Bug 872170 - Fix camera file saving with composite device storage. r=mikeh 2013-05-16 11:12:29 -07:00
Dave Hylands
c53a4e7f72 Bug 858416 - Create a composite device storage interface. r=dougt 
* * *
Bug 858416 - Fix try test failures
 2013-05-11 02:10:18 -07:00
David Zbarsky
e35c65d6d0 Bug 868312 - Some more rooting fixes for dom r=bz 2013-05-10 22:39:45 -04:00
David Zbarsky
480bf64980 Bug 868312 - Rooting fixes for dom r=bz 2013-05-10 14:22:21 -04:00
Dave Hylands
5db8789cef Bug 870197 - Initialize mFrameCallback to null. r=mikeh 2013-05-09 10:17:42 -07:00
Mark Banner
26ea3b3736 Bug 863069 - Part 2: Sort lists in moz.build files (mac specific); r=gps 2013-05-08 19:31:52 +01:00
Michael Wu
b65992d857 Bug 869251 - Disable omx decoder and camera on gonk-JB, r=doublec,glandium 2013-05-02 17:21:22 -04:00
Mike Habicher
5dd647c3a6 Bug 834164 - handle aDataPtr == nullptr in camera driver DataCallback, r=cjones 2013-01-24 13:41:18 -05:00
David Zbarsky
b7033dea1a Bug 868312: Various dom rooting fixes r=bz 2013-05-04 03:52:57 -04:00
Chiajung Hung
e8d81505ed Bug 825110 - Part 1: Camera changes for B2G WebRTC video module. r=mhabicher 2013-05-02 07:59:58 -04:00
Dave Hylands
16908eb6b9 Bug 860934 - Use relative paths when handling device storage r=dougt 2013-04-18 16:13:23 +02:00
Ryan VanderMeulen
1afb8a0017 Backed out changeset 8f7ef60b6f5a (bug 860934) for mochitest asserts and crashes. 2013-04-18 12:02:27 -04:00
Dave Hylands
3e1b613ce9 Bug 860934 - Use relative paths when handling device storage r=dougt 2013-04-18 16:13:23 +02:00
Mike Habicher
282ec3c583 Bug 862256 - don't (re)reference CameraControl object during/after destructor, r=sotaro, a=tef+ 2013-04-17 16:30:44 +02:00
Mike Shal
df7deac25b Bug 846634 - Part 2: Move EXPORTS to moz.build; r=joey 2013-04-16 15:24:43 -04:00
Mike Habicher
1d2bbb33b4 Bug 872122 - clean up nsDOMCameraManager::GetListOfCameras(), r=bz 2013-05-16 10:39:13 -04:00
Jose Cortes
55924de20e Bug 842186 - Replace use of jsval with JS::Value in h and cpp files in the dom/network/ dom/camera/ and dom/devicestorage/ directories. r=jwalden 
--HG--
extra : rebase_source : f765875c5597feb55c9eda3d8a3224fc22ad02fb
 2013-04-02 16:17:52 -07:00
Kyle Machulis
72a717a860 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Kyle Machulis
43628a7867 Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot 2013-03-29 15:12:58 -07:00
Kyle Machulis
334c0800cf Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 
--HG--
extra : rebase_source : 004a756492323e1a049586e85b3be5037159df20
 2013-03-29 13:56:18 -07:00
Ben Tian
5a6f3aa1f9 Bug 851823 - Disable shutter sound in CameraService. r=sotaro 2013-03-27 11:19:10 -04:00
David Zbarsky
46284ae633 Bug 847007: Remove nsIContent includes r=Ms2ger 2013-03-21 20:05:20 -04:00
Sotaro Ikeda
192f030a70 Bug 844248 - Add a custom media stream for camera preview. r=roc 2013-03-20 10:07:46 -04:00
Mike Shal
7ecea60097 Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps 2013-03-19 11:47:00 -07:00
Mike Habicher
7be815fc66 Bug 850845 - don't dereference null mCameraHw pointer, r=sotaro 
--HG--
extra : rebase_source : e41763a11413d1cb66c2e4914a582f35cd9b60f0
 2013-03-14 17:30:38 -04:00
Mike Shal
b04d88a2f2 Bug 818246 - Part 9: Move XPIDL_FLAGS to moz.build; r=gps 2013-03-11 22:05:00 -07:00
Mike Shal
cd4191e248 Bug 818246 - Part 7: Move XPIDL_MODULE to moz.build; rs=gps 2013-03-11 22:00:00 -07:00
Gregory Szorc
c865547d94 Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium 
This is the result of running
|mach mozbuild-migrate --list XPIDLSRCS SDK_XPIDLSRCS XPIDL_SOURCES| and
reverting xpcom/sample/*.
 2013-03-12 10:17:46 -07:00
Sotaro Ikeda
f282eca1d4 Bug 803471 - Part 5e - Change Makefile.in to add GonkNativeWindowClient.cpp. r=mhabicher 2013-03-08 14:43:33 -05:00
Sotaro Ikeda
1d25d0bcb1 Bug 803471 - Part 5d - Cange GonkRecorder to use GonkCameraHardware. r=mhabicher 2013-03-08 14:43:33 -05:00
Sotaro Ikeda
7922e181f4 Bug 803471 - Part 5c - Cange GonkCamera to use android::Camera. r=mhabicher 2013-03-08 14:43:33 -05:00
Sotaro Ikeda
b8ff00c62f Bug 803471 - Part 5a - Split GonkNativeWindow to GonkNativeWindow and GonkNativeWindowClient. r=kchen 2013-03-08 14:43:32 -05:00
Sotaro Ikeda
41c8bbdebb Bug 803471 - Part 4 - Use OmxClient in GonkRecorder. r=mhabicher 2013-03-08 14:43:32 -05:00
Gregory Szorc
a0e24e2250 Bug 784841 - Part 18k: Convert /dom; f=Ms2ger rs=khuey 2013-02-25 12:47:20 -08:00
Sotaro Ikeda
37483e1e02 Bug 839628 - Add MIN_UNDEQUEUED_BUFFERS check in GonkNativeWindow::dequeueBuffer(). r=kchen, r=mikeh 2013-02-21 07:04:03 -05:00
Sotaro Ikeda
b4d9c3d0b1 Bug 826072 - Dispatch Init() out of nsGonkCameraControl's constructor. r=mikeh 2013-02-16 14:05:45 -05:00
Peter Van der Beken
c1b3c1ac36 Fix for bug 839529 (Remove various CC participants that don't do anything). r=smaug. 
--HG--
extra : rebase_source : 8a272905c79396e7ae08aaaf83566ac450c45be0
 2013-02-07 10:19:08 +00:00
Scott Johnson
f04d0705c3 Bug 840341: Rev the IID of nsICameraCapabilities. [r=bsmedberg] 
--HG--
extra : rebase_source : d5d2ada4afb1733e7b92c8329e86c109488af911
 2013-02-14 16:26:28 -06:00
Robert O'Callahan
2c25988734 Bug 837034. Part 2: Convert DOMMediaStream to use WebIDL. r=peterv,jesup 
--HG--
rename : content/media/nsDOMMediaStream.cpp => content/media/DOMMediaStream.cpp
rename : content/media/nsDOMMediaStream.h => content/media/DOMMediaStream.h
extra : rebase_source : 483fca748444db20ed0d35cb586485f277e1808c
 2013-02-15 21:04:11 +13:00
Robert O'Callahan
a019386f6d Bug 837034. Part 1: Rename nsDOM(Local)MediaStream to DOM(Local)MediaStream and put them in the mozilla namespace. r=jesup 
--HG--
rename : content/media/nsDOMMediaStream.cpp => content/media/DOMMediaStream.cpp
rename : content/media/nsDOMMediaStream.h => content/media/DOMMediaStream.h
extra : rebase_source : 6fd3f71779b4ecb9d3b053b6cd844c2ff0c25f80
 2013-02-15 21:01:58 +13:00
Olli Pettay
b9080a0df7 Bug 839528 - Change the namespace of xpidl dictionary helpers, r=khuey 2013-02-11 21:37:50 +02:00
Sotaro Ikeda
8b05a8977a Bug 836782 - reduce gralloc buffer reallocation in camera StartPreview(), r=kchen 2013-02-06 12:57:50 -05:00
Alexandre Lissy
3431ca7c5f Bug 832745 - Adding a principal for a stream when creating. r=roc 2013-01-30 11:03:17 +01:00
Sotaro Ikeda
9869e6bdbd Bug 833521 - forward "recording-device-events" event to parent process, r=dougt 2013-01-24 21:45:36 -05:00
Ryan VanderMeulen
cc8552d9ab Backed out changeset 58209cc0ae14 (bug 833521) for build bustage. 2013-01-24 15:23:53 -05:00
Sotaro Ikeda
06930e355e Bug 833521 - forward "recording-device-events" event to parent process, r=dougt 2013-01-24 14:51:03 -05:00
Dale Harvey
cfa3d2a2b5 Bug 833095 - Fix format of file notification when recording complete. r=mikeh 2013-01-23 16:35:06 -05:00
Mike Habicher
7c83d08483 Bug 819835 - add support for setting the EXIF DateTime field, r=sotaro 2013-01-18 16:06:28 -05:00
Mike Habicher
a3564c5af8 backed out changeset 0004848a182f, a=bustage 2013-01-18 16:46:26 -05:00
Mike Habicher
3fb12b17e4 Bug 819835 - add support for setting the EXIF DateTime field, r=sotaro 2013-01-18 16:06:28 -05:00
Mike Habicher
f6bd4f4799 Bug 830995 - move Alloc/DeallocSurfaceDescriptorGralloc() calls out of the GonkNativeWindow mMutex lock, r=kanru 2013-01-17 10:53:03 -05:00
Mike Habicher
fc22619eca Bug 830116 - remove off-main-thread calls to nsMainThreadPtrHandle::get() in error-handling paths, r=jst 2013-01-15 10:57:22 -05:00
Marco Chen
3c2cd9423f Bug 829420 - [Camera] In GonkNativeWindow::dequeueBuffer, -1 will be used as index to access an Arrary. r=kanru 2013-01-11 18:18:35 +08:00
Trevor Saunders
138e996dfc no bug - remove a bunch of extra ';'s to make -pedantic happy 2013-01-11 05:14:04 -05:00
Mike Habicher
e09bb5012c Bug 827503 - use nsMainThreadPtrHolders when passing XPCWrappedJSes around off main thread, r=bholley,jst a=blocking-basecamp+ 2013-01-09 00:43:50 +01:00
Mike Habicher
a471e8fe91 backing out patch for bug 827503 due to runtime crashes, r=crash 2013-01-09 16:39:37 +01:00
Doug Turner
c52c731184 Bug 827311 - Remote file update notifications. r=bent a=blocking-basecamp 2013-01-09 07:03:28 -08:00
Mike Habicher
f612f4fccc Bug 827503 - use nsMainThreadPtrHolders when passing XPCWrappedJSes around off main thread, r=bholley,jst a=blocking-basecamp+ 2013-01-09 00:43:50 +01:00
Mike Habicher
521925ef88 Bug 825986 - propagate startRecording() return code instead of asserting; clean up GonkRecorder lifecycle management, r=kanru 2013-01-08 10:11:32 +01:00
Kan-Ru Chen (陳侃如)
da81243529 Bug 825687 - Unregister camera control from the camera hardware. r=mikeh 2013-01-07 13:54:24 +01:00
Mike Habicher
0c6c027935 Bug 820139 - Ensure video recorder exists before trying to start recording. r=kchen 2012-12-23 10:56:59 -05:00
Mike Habicher
7ab344aefb Bug 818933 - Provide a hardware release API so that we don't have to rely on CC of CameraControl objects. r=mhabicher 2012-12-23 10:54:54 -05:00
Mike Habicher
49025fcfff Bug 822531 - Fix regression of bug 783682 caused by bug 779139. r=mwu 2012-12-18 18:19:38 -05:00
Mats Palmgren
51d407db90 Bug 820230 - Add missing #include to fix compile error. r=me 2012-12-12 00:15:07 +01:00
Marco Chen
0ce1fa6a30 Bug 811649 - Mute other audio when video recording is started by using an AudioChannelAgent to integrate with AudioChannelService. r=mhabicher a=blocking-basecamp 2012-12-11 18:14:06 +08:00
Mike Habicher
2d7844ee84 Bug 817496 - Notify DeviceStorage when a new video file is finished recording. r=dougt 2012-12-04 21:00:39 -05:00
Mike Habicher
f9756fe293 Bug 817141 - Call EndTrack()/Finish() from StopPreview() (as well) to prevent deadlock. r=kchen 2012-12-04 21:00:39 -05:00
Ms2ger
abe686e45d Bug 814898 - Part d: Cleanup CC goop in some more parts of dom/; r=mccr8 2012-12-02 09:54:51 +01:00
Ms2ger
4c7f8c7ec0 Bug 814898 - Part c: Cleanup CC goop in B2G-specific parts of dom/; r=mccr8 2012-12-02 09:54:37 +01:00
Mike Habicher
37bba31644 Bug 809259 - fix for buffer exhaustion when cycling camera modes. r=cjones a=blocking-basecamp 2012-11-30 18:26:58 -08:00
Kartikaya Gupta
215585f6a7 Bug 814418 - Fix some warnings about unused variables. r=ehsan 2012-11-30 11:06:37 -05:00
Chris Jones
57c48cf12d Bug 809259: Properly handle allocation failures. r=kanru 2012-11-27 22:54:39 -08:00
Mike Habicher
b56d6daacd Bug 809259 - improve camera stability when switching between picture and video modes r=kanru 2012-11-23 13:31:42 +08:00
Benoit Jacob
986ee1a065 Bug 807437 - Eliminate redundant Traverse/Unlink CC macros - part 1: automatic changes - r=mccr8 2012-11-15 02:32:40 -05:00
Benoit Jacob
c248c79c55 Bug 798033 - adapt dom/camera code to not relying on headers to do using namespace - r=mhabicher 2012-11-12 19:06:31 -05:00
Matt Joras
da70d3f085 Bug 798033 - Removes 'using namespace' from dom headers - r=khuey 2012-11-10 10:45:52 -05:00
Ryan VanderMeulen
30d168a3da Backed out changeset 5054c2552a30 (bug 798033) for b2g bustage. 2012-11-10 11:52:15 -05:00
Matt Joras
80ff2e8190 Bug 798033 - Removes 'using namespace' from dom headers - r=khuey 2012-11-10 10:45:52 -05:00
Mike Habicher
266e0bab6c Bug 810440 - Add missing rotation parameter to SetupRecording function call, drop default parameter values. r=daleharvey 2012-11-09 20:32:10 -05:00
Edwin Flores
54f63e89ca Bug 798448 - Stop GonkNativeWindow::perform returning an error when the transform is set r=kanru 2012-11-08 17:24:02 +13:00
Mike Habicher
39bf4c9296 Bug 808099 - Write the correct rotational meta-data to the video stream. r=cjones 2012-11-06 22:32:01 -05:00
Mike Habicher
854c16fccb Bug 808030 - Make camera default to smallest non-0x0 thumbnail size with reduced quality. r=cjones 2012-11-02 19:53:40 -04:00
Mike Habicher
d390a1808b Bug 801693 - Plumb video recorder state-change (error, size/length limit) handling. r=jst 2012-11-02 16:11:50 -04:00
Nathan Froyd
4c61ef9ec5 Bug 806618 - rewrite PR_NewLogModule calls to not generate static initializers; r=ehsan 2012-10-29 19:32:10 -04:00
Mike Habicher
789fb9465d Bug 804741 - close our recorder output file handle because recorder dup()s it. r=mwu 2012-10-29 16:16:42 -07:00
Robert O'Callahan
b1feab9a84 Bug 805703. Part 1: MediaStreamGraph::CreateInputStream -> CreateSourceStream. r=jesup 
--HG--
extra : rebase_source : 3c327e9ead92508f12df4b95f2fd24fa2ba97ab5
 2012-10-29 17:36:31 +13:00
Tim Taubert
0d6ec594ec Bug 805377 - [Camera] Change to video record mode will cause app crash r=mikeh a=blocking-basecamp 2012-10-26 14:55:08 +02:00
Randell Jesup
4fda85ac3e Bug 803976: Implementation of LocalMediaStreams for .stop() r=roc,anant 2012-10-24 19:21:32 -04:00
Ehsan Akhgari
fec8894f04 Backed out changeset 165208ecd591 (bug 803976) 2012-10-24 20:29:32 -04:00
Michael Vines
47d6f6b628 Bug 803733 - Normalize camera sensor orientation. r=cjones 2012-10-24 17:23:01 -07:00
Randell Jesup
d6cc9a88c2 Bug 803976: Implementation of LocalMediaStreams for .stop() r=roc,anant 2012-10-24 19:21:32 -04:00
Mike Habicher
249302d897 Bug 795379 - Add support for getting and setting video recording profiles. r=jst 2012-10-23 18:30:28 -04:00
Isaac Aggrey
c984edf823 Bug 794510: Part 2: Use more stdint types instead of protypes.h types; r=ehsan 2012-10-11 18:38:04 -05:00
Isaac Aggrey
8cae05114f Bug 794510: Part 4 - Use PR_NewLogModule instead of PR_LOG_DEFINE; r=ehsan,wtc 2012-10-13 15:56:35 -05:00
Nathan Froyd
dd427057c4 Bug 798573 - remove prtypes.h #includes in dom/; r=ehsan 2012-10-05 17:28:24 -04:00
Mike Habicher
03e80bf53e Bug 798304 - Call AppendRelativePath() to append video filename (possibly including subpath) to data storage area root. r=dougt 2012-10-10 06:32:37 -04:00
Ehsan Akhgari
f0a3f6136f Bug 579517 follow-up: Remove NSPR types that crept in 2012-10-01 16:04:09 -04:00
Mike Habicher
737adc7dfa Bug 779145 - Add support for unsoliciated onShutter and onClosed callbacks, handle OnNavigation to clean-up. r=jst 2012-09-30 20:37:47 -04:00
Inder Kumar ext:(%20and%20Mike%20Habicher%20%3Cmhabicher%40mozilla.com%3E)
6d9d08d1fd Bug 776062: Add support for recording video on gonk. r=cjones,double,ikumar,mikeh sr=sicking 2012-09-28 22:30:52 -07:00
Isaac Aggrey
481e7dfb0b Bug 791906: Replace NSPR integer limit constants with stdint ones; r=ehsan 2012-09-28 01:57:33 -05:00
Edwin Flores
2d29e71ff1 Bug 759506 - GonkNativeWindow and layers changes for B2G zero-copy OMX hardware decoding r=kanru 2012-09-27 16:33:42 +12:00
Mike Habicher
5b69de0f54 Bug 776934 - Add permissions check to camera API. r=jlebar 2012-09-21 06:32:18 -04:00
Ms2ger
0ee9c6885f Bug 792343 - Enable FAIL_ON_WARNINGS in some more of dom/ (first batch); r=mounir 2012-09-20 09:55:36 +02:00
Mike Habicher
3e87cb17ab Bug 790746 2012-09-12 22:24:00 -04:00
Nathan Froyd
96439647c2 Bug 786703 - fix dom/ build failures from introducing PARALLEL_DIRS; r=glandium 2012-09-11 07:47:42 -04:00
Mike Habicher
1bf2b1130b Bug 789307 - Unlock() the graphics buffer if we're not going to consume it. r=kchen 2012-09-07 16:23:01 -04:00
Mike Habicher
6ae700c29b Bug 779139 - Make DOM-facing camera objects cycle collection participants. r=jst 
--HG--
rename : dom/camera/CameraControl.h => dom/camera/CameraControlImpl.h
rename : dom/camera/GonkCameraCapabilities.cpp => dom/camera/DOMCameraCapabilities.cpp
 2012-09-04 21:01:56 -04:00
David Zbarsky
d050fe5813 Bug 785486 - DomCameraManager redefines DOM_CAMERA_LOG_LEVEL r=mikeh 2012-08-24 16:50:57 -04:00
Nathan Froyd
1a9bf63360 Bug 783357 - part 1: add XPIDL_FLAGS to make idl dependencies more explicit; r=khuey 2012-08-24 16:01:30 -04:00
Ehsan Akhgari
e368dc9c85 Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg 
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
 2012-08-22 11:56:38 -04:00
David Zbarsky
3154e1b535 Bug 784004 - Don't include Layers.h everywhere Part 3 r=nical 2012-08-21 00:06:46 -04:00
Paul Adenot
106e87bbbc Bug 774581: Send event when starting/stopping audio or video recording; r=anant,mhabicher 2012-08-17 09:10:08 -07:00
Mike Habicher
3063ddba91 Bug 783682 - Camera - always assume the camera gives us yuv420sp [r=gal] 2012-08-20 09:11:20 -07:00
Nicolas Silva
75542595f3 Bug 782372 - Splits ImageLayers.h into ImageLayers.h ImageContainer.h and ImageTypes.h, r=bgirard 2012-08-19 15:33:25 -04:00
Kan-Ru Chen
4e3b4c5d63 Bug 757341 - Camera direct texturing with async video. r=cjones 2012-08-17 18:56:55 +08:00
Mike Habicher
e6ca420bb5 Bug 780905 - Remove excess logging from DOMCameraManager. r=smaug 2012-08-07 20:49:07 -04:00
Mike Hommey
70d7c821af Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Eric Faust
b0323e13a7 Bug 752223 - Implement JS_NumberValue(), replacing JS_NewNumberValue(). (r=luke) 2012-08-01 17:59:47 -07:00
Mike Habicher
7db1f300b0 Bug 779351 - Camera needs to get/configure the SourceMediaStream on the main thread, r=roc 2012-08-01 14:21:27 -04:00
Mike Habicher
8cd21fd5cb Bug 779283: fix assertions in ICS camera r=dzbarsky 2012-07-31 17:57:39 -07:00
David Zbarsky
083c6b4275 Fix virtual destructor warnings in dom/camera, no bug, blanket r=bz 2012-07-31 14:30:53 -07:00
Michael Wu
5ec86f9e4b Follow up to Bug 740997 - land the right version of GonkCameraCapabilities.cpp, r=killer 2012-07-31 01:45:26 -04:00
Mike Habicher
9e245cc9a4 Bug 740997 - ICS camera support, r=jst,gal,roc 2012-07-30 17:59:05 -04:00