generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,048 Commits 1 Branch 0 Tags 108 MiB
756b8462eb
Commit Graph

57 Commits

Author SHA1 Message Date
tkchin@webrtc.org
b038c72369 Enable SCTP compile for iOS. 
Chromium's been updated to pull a version of usrsctplib that will compile correctly. This update DEPS to point at new revision and turn on the compile time flags for iOS sctp.

BUG=3211
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13929004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6681 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-07-14 20:24:09 +00:00
buildbot@webrtc.org
bb2d65895b (Auto)update libjingle 69617317-> 69623266 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6508 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-06-20 14:58:56 +00:00
buildbot@webrtc.org
58e7c8660c (Auto)update libjingle 69588980-> 69589535 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6503 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-06-20 00:26:50 +00:00
kjellander@webrtc.org
6b6e58d632 Remove unused test_env.py from isolate files + fix nss path. 
This is not necessary for executing tests for WebRTC.
It probably appeared in our .isolate files because of code
copied from Chromium.

BUG=
TEST=All non-baremetal trybots passing.
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/21639004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6373 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-06-09 14:35:09 +00:00
glaznev@webrtc.org
c3288c130d Add OpenGL Android video renderer which can display multiple 
yuv420 images in a single GLSurfaceView.
Start using new video renderer in AppRTC demo app.

BUG=
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15589004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6360 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-06-06 21:57:46 +00:00
pbos@webrtc.org
289a35c56d Add empty webrtcmediaengine.cc. 
Should contain CreateWebRtcMediaEngine as soon as
libjingle/libjingle.gyp in Chromium builds this file. This file is added
ahead of time to get a smoother rolling process.

BUG=1788
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19599005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6313 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-06-03 14:51:34 +00:00
tkchin@webrtc.org
acca675bcf Implement mac version of AppRTCDemo. 
- Refactored and moved AppRTCDemo to support sharing AppRTC connection code between iOS and mac counterparts.
- Refactored OpenGL rendering code to be shared between iOS and mac counterparts.
- iOS AppRTCDemo now respects video aspect ratio.

BUG=2168
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17589004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6291 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-30 22:26:06 +00:00
tkchin@webrtc.org
1732a591e7 Add a UIView for rendering a video track. 
RTCEAGLVideoView provides functionality to render a supplied RTCVideoTrack using OpenGLES2.

R=fischman@webrtc.org
BUG=3188

Review URL: https://webrtc-codereview.appspot.com/12489004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6192 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-19 23:26:01 +00:00
andresp@webrtc.org
581e2172af Fix libjingle to provide a field_trial implementation. 
This completes https://webrtc-codereview.appspot.com/14489004/ by updating libjingle rules.

BUG=crbug/367114
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20479004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6149 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-14 13:12:45 +00:00
pbos@webrtc.org
b5a22b1464 Revert r6110 and r6109. 
Effectively re-landing r6104 as well as r6108 which includes a fix to a
compile error that caused r6104 to be reverted in r6110.

BUG=
TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20459004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6119 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-13 11:07:01 +00:00
buildbot@webrtc.org
17911dca80 (Auto)update libjingle 66798415-> 66813165 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6110 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-12 18:42:49 +00:00
pbos@webrtc.org
d266a2020f Initial wiring of new webrtc API in libjingle. 
BUG=1788
R=pthatcher@google.com, pthatcher@webrtc.org
TBR=juberti@webrtc.org, mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8549005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6104 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-12 14:32:01 +00:00
buildbot@webrtc.org
5ee0f05d5f (Auto)update libjingle 66138442-> 66236292 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6057 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-05-05 20:18:08 +00:00
tkchin@webrtc.org
ff2733204d Implement ObjC DataChannel wrapper 
R=fischman@webrtc.org
BUG=3112

Review URL: https://webrtc-codereview.appspot.com/16369004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6031 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-30 18:32:33 +00:00
fischman@webrtc.org
a86c42c424 libjingle_unittest now compiles and passes on iOS! (reland of r5986) 
Example run from cmd-line:
ninja -C out_ios/Debug-iphoneos libjingle_unittest && \
  ~/src/ios-deploy/ios-deploy -d -u -v -b \
    ~/src/wr/trunk/out_ios/Debug-iphoneos/libjingle_unittest.app

Note that the test's use of signals means that lldb will break in the middle
of the suite.  To ignore these signals tell lldb:

pro hand -p true -s false -n false SIGINT
pro hand -p true -s false -n false SIGTERM
continue

BUG=3241
R=kjellander@webrtc.org, tkchin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/21369004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6025 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-29 18:37:29 +00:00
kjellander@webrtc.org
7d825e9b2c Revert "libjingle_unittest now compiles and passes on iOS!" 
This reverts commit r5986 as it fails compilation on Mac
(non-iOS). The failure was not discovered on the commitbots
since they don't clobber their builds.

BUG=3241
TBR=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19399004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5997 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-28 12:50:47 +00:00
fischman@webrtc.org
95cd1551f8 libjingle_unittest now compiles and passes on iOS! 
Example run from cmd-line:
ninja -C out_ios/Debug-iphoneos libjingle_unittest && ~/src/ios-deploy/ios-deploy -d -u -v -b ~/src/wr/trunk/out_ios/Debug-iphoneos/libjingle_unittest.app
Note that the test's use of signals means that lldb will break in the middle of the suite.  To ignore these signals tell lldb:

pro hand -p true -s false -n false SIGINT
pro hand -p true -s false -n false SIGTERM
continue

BUG=3241
R=noahric@google.com, tkchin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12229004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5986 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-25 23:59:56 +00:00
tkchin@webrtc.org
19b1be159e Provide GetStats method in RTCPeerConnection 
BUG=3144
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12069006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5960 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-22 21:05:38 +00:00
tkchin@webrtc.org
ec3d8ecdcc Fix typo by renaming RTCSessionDescriptonDelegate -> RTCSessionsDescriptionDelegate 
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12059004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5946 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-21 18:47:24 +00:00
fischman@webrtc.org
cf0b46c762 iosdeviceinfo.cc: remove unnecessary file 
The do-nothing implementation in this file is already present in
mobiledevicemanager.cc (shared with Android) so this isn't adding value, and
causes duplicate-symbol errors under some compilers.

BUG=3201
R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/11959004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5899 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-04-14 18:12:32 +00:00
mallinath@webrtc.org
0c6f0f94f1 Revert 5737 "Add system wrapper dependency to libjingle targets." 
Adding additional dependency is not required for libjingle targets.

> Add system wrapper dependency to libjingle targets.
> This is necessary to handle usage of STR_CASE_CMP in
> common_types.h ( as in https://webrtc-codereview.appspot.com/10099005/)
> 
> TBR=wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/10309004

TBR=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/10379004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5744 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-03-20 23:07:03 +00:00
mallinath@webrtc.org
979f1f8235 Add system wrapper dependency to libjingle targets. 
This is necessary to handle usage of STR_CASE_CMP in
common_types.h ( as in https://webrtc-codereview.appspot.com/10099005/)

TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/10309004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5737 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-03-20 15:09:09 +00:00
wu@webrtc.org
b9a088b920 Update talk to 61538839. 
TBR=mallinath

Review URL: https://webrtc-codereview.appspot.com/8669005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5548 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-02-13 23:18:49 +00:00
wu@webrtc.org
0de29504ab Revert 5545 "Update libjingle to 61514460" 
> Update libjingle to 61514460
> 
> TBR=tommi@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/8649004

TBR=xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8669004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5547 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-02-13 19:54:28 +00:00
xians@webrtc.org
e749c9ebdb Update libjingle to 61514460 
TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8649004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5545 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-02-13 15:09:40 +00:00
fischman@webrtc.org
540acde5b3 PeerConnection(java): use MediaCodec for HW-accelerated video encode where available. 
Still disabled by default until https://code.google.com/p/webrtc/issues/detail?id=2899 is resolved.

Also (because I needed them during development):
- make AppRTCDemo "debuggable" for extra JNI checks
- honor audio constraints served by apprtc.appspot.com
- don't "restart" video when it hasn't been stopped (affects running with the
  screen off)

BUG=2575
R=noahric@google.com

Review URL: https://webrtc-codereview.appspot.com/8269004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5539 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-02-13 03:56:14 +00:00
sergeyu@chromium.org
9cf037b831 Update libjingle to 61168196 
R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8139004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5502 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-02-07 19:03:26 +00:00
mallinath@webrtc.org
ecd622eec3 Updating libjingle.gyp after addition new files yuvframescapturer.cc. 
TBR=pbos@webrc.org

Review URL: https://webrtc-codereview.appspot.com/7919006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5476 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-02-03 17:17:05 +00:00
jiayl@webrtc.org
a576faf82a Enable SCTP and use OPENSSL on Anroid and NSS on other platforms. 
It includes unit test fixes to properly initialize SSL if DTLS or SSL random number generator is used in the tests.
The private key and certificate constant strings used in some tests are updated to be compatible with NSS.
A few potentially overflow type conversions caused compiling warning on Windows and they are fixed by importing and using Chromium's checked_cast, which aborts the program if overflow occurs.
It also fixes a leak in nssstreamadapter.cc by releasing the PRFileDesc* in StreamClose.

BUG=2253
R=fischman@webrtc.org, juberti@google.com, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/4679005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5459 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-29 17:45:53 +00:00
mallinath@webrtc.org
0dac5378e5 Revert 5447 "Update talk to 60420316." 
> Update talk to 60420316.
> 
> TBR=wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/7719005

TBR=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7729004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5448 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-28 06:58:42 +00:00
mallinath@webrtc.org
752a017809 Update talk to 60420316. 
TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7719005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5447 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-28 06:45:52 +00:00
wu@webrtc.org
a8910d2f88 Update talk to 60094938. 
Review URL: https://webrtc-codereview.appspot.com/7489005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5420 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-23 22:12:45 +00:00
sergeyu@chromium.org
4b26e2eee3 Update libjingle to 59676287 
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7229004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5390 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-15 23:15:54 +00:00
henrika@webrtc.org
aebb1ade9d pRevert 5371 "Revert 5367 "Update talk to 59410372."" 
> Revert 5367 "Update talk to 59410372."
> 
> > Update talk to 59410372.
> > 
> > R=jiayl@webrtc.org, wu@webrtc.org
> > 
> > Review URL: https://webrtc-codereview.appspot.com/6929004
> 
> TBR=mallinath@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6999004

TBR=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7109004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5381 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-14 10:00:58 +00:00
henrika@webrtc.org
44461fa5cb Revert 5367 "Update talk to 59410372." 
> Update talk to 59410372.
> 
> R=jiayl@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6929004

TBR=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5371 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-13 09:35:02 +00:00
mallinath@webrtc.org
0f3356e20b Update talk to 59410372. 
R=jiayl@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6929004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5367 4adac7df-926f-26a2-2b94-8c16560cd09d
 2014-01-11 01:26:23 +00:00
fischman@webrtc.org
000dde99c8 Android build: make it quiet on success and not overly noisy on failure. 
- OpenSLDemo and WebRTCDemo get the sauce that AppRTCDemo got in r5271
- libjingle_peerconnection_jar is now silent on success
- Fix a bug introduced by r5271 which caused ant logs to be emitted to a subdir of talk/examples instead of in the gyp output directory.

R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6199005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5332 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-12-20 22:49:35 +00:00
henrike@webrtc.org
9ee75e9c77 Enables mixing and matching Java and native audio. It is used for getting best of both worlds capabilities (AEC and low latency). 
BUG=N/A
R=fischman@webrtc.org, niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/4189004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5270 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-12-11 21:42:44 +00:00
sergeyu@chromium.org
a23f0ca4ba Update talk to 56619788 
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/3839005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5120 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-11-13 22:48:52 +00:00
wu@webrtc.org
1d1ffc9ad2 Update talk to 54898858. 
TEST=try bots
TBR=mallinath

Review URL: https://webrtc-codereview.appspot.com/2414004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4979 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-10-16 18:12:02 +00:00
fischman@webrtc.org
4e65e07e41 VideoCaptureAndroid: rewrote the (standalone) implementation of video capture on Android. 
Besides being ~40% the size of the previous implementation, this makes it so
that VideoCaptureAndroid can stop and restart capture, which is necessary to
support onPause/onResume reasonably on Android.

BUG=1407
R=henrike@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2334004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4915 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-10-03 18:23:13 +00:00
fischman@webrtc.org
76fe9309b9 Use link_settings instead of all_dependent_settings to pacify xcode gyp generator 
Should unbreak e.g. http://chromegw/i/chromium.webrtc.fyi/builders/Mac%20%5Blatest%20WebRTC%20trunk%5D/builds/2396

R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2261004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4796 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-09-19 21:11:08 +00:00
fischman@webrtc.org
ccddd0a941 Roll webrtc's chromium_revision 217707:224141 
Also adds -lm for executables depending on isac since the newer clang in the
newer chromium revision requires it, and -lstdc++ for dependencies of the objc lib because newer gyp links with gcc instead of g++ for non-C++-containing libs.

R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2177007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4795 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-09-19 20:27:32 +00:00
wu@webrtc.org
967bfff54d Update talk to 52534915. 
R=sergeyu@chromium.org

Review URL: https://webrtc-codereview.appspot.com/2251004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4786 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-09-19 05:49:50 +00:00
henrike@webrtc.org
82f014aa0b OpenSL (not default): Enables low latency audio on Android. 
BUG=1669
R=andrew@webrtc.org, fischman@webrtc.org, niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2032004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4719 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-09-10 18:24:07 +00:00
fischman@webrtc.org
e3de6b1e90 Enable ObjC build by default and reenable 64-bit mac libjingle build 
BUG=2124
TESTED=trybots & building for mac, mac64, ios-sim, and ios-device on my MBP all build everything in out/Debug.
R=niklas.enbom@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2080004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4620 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-08-26 19:31:21 +00:00
sergeyu@chromium.org
492e315400 Update gyp file after libjingle roll. 
TBR=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2103004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4609 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-08-24 00:06:43 +00:00
wu@webrtc.org
91053e7c5a Update libjingle to 50654631. 
R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2000006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4519 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-08-10 07:18:04 +00:00
fischman@webrtc.org
c883fdc273 PeerConnection.java: enable setting trace & log levels from Java 
Replaces the hard-coded scheme that was there before and lets apps decide what
to log and to where.

R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1969004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4498 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-08-06 19:00:53 +00:00
wu@webrtc.org
9dba525627 * Update libjingle to 50389769. 
* Together with "Add texture support for i420 video frame." from
wuchengli@chromium.org.
https://webrtc-codereview.appspot.com/1413004

RISK=P1
TESTED=try bots
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1967004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4489 4adac7df-926f-26a2-2b94-8c16560cd09d
 2013-08-05 20:36:57 +00:00