perkj@webrtc.org
7998089789
ApprtDemo Android: Switch between front and back camera.
...
This adds a UI icon for switching between the front and back camera.
This cl adds the possibility to change between the front and back camera while in a call
or before the other end have connected.
BUG=3786
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/23219004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7553 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-29 08:10:03 +00:00
henrike@webrtc.org
269fb4bc90
move xmpp and p2p to webrtc
...
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.
BUG=3379
Review URL: https://webrtc-codereview.appspot.com/26999004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-28 22:20:11 +00:00
glaznev@webrtc.org
243eb8e9af
Adding setting screen to AppRTCDemo.
...
- Move server URL from connection screen
to the setting screen.
- Add setting for local video resolution.
- Auto save last entered room number.
- Use full screen mode in video renderer and fix
texture offsets recalculation when rendering type is
dynamically changed.
BUG=3935,3953
R=kjellander@webrtc.org , pbos@webrtc.org , pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/30769004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7534 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-27 17:22:15 +00:00
perkj@webrtc.org
470988742a
Add HD support to Android if we detect a hardware video encoder that can be used. This Change the internal class MediaCodecVideoEncoder to have a one public method for checking if the platform is supported. It also adds &hd=true to the reqest url a hardware encoder is detected.
...
BUG=3934
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/30749004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7520 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-24 11:38:19 +00:00
glaznev@webrtc.org
7bb4a9881d
Merging Henrik's and Peter's changes for AppRTCDemo
...
from https://github.com/hkjellander/AppRTCDemo .
Description of changes:
- Add connect screen with an option to enter room number or select loopback mode.
- Add 'hangup' and 'WebRTC statistics' buttons to AppRTCDemo activity.
BUG=3938
R=kjellander@webrtc.org , pbos@webrtc.org , pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/28749004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7500 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-22 17:43:37 +00:00
henrike@webrtc.org
28100cb388
Reverts r7459 "Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p."
...
BUG=N/A
TBR=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29829004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7472 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-17 22:03:39 +00:00
glaznev@webrtc.org
58202946a7
Cleaning up Android AppRTCDemo.
...
- Move signaling code from Activity to a separate class
and add interface for AppRTC signaling. For now
only pure GAE signaling implements this interface.
- Move peer connection, video source and peer connection
and SDP observer code from Activity to a separate class.
- Main Activity class will do only high level calls and
event handling for peer connection and signaling classes.
- Also add video renderer position update and use full
screen for local preview until the connection is established.
BUG=
R=braveyao@webrtc.org , pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/24019004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7469 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-17 17:42:38 +00:00
henrike@webrtc.org
d1ba6d9cbf
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p.
...
BUG=3379
R=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/27709005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7459 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-15 17:30:28 +00:00
glaznev@webrtc.org
359d720004
Allow Android apps to set video renderer scaling type.
...
Also add type check for EGL context object received from apps and
switch to byte buffer video decoding if EGL context is incorrect
BUG=3851
R=tkchin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/25669004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7326 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-29 23:07:08 +00:00
glaznev@webrtc.org
996784548d
HW video decoding optimization to better support HD resolution:
...
- Change hw video decoder wrapper to allow to feed multiple input
and query for an output every 10 ms.
- Add an option to decode video frame into an Android surface object. Create
shared with video renderer EGL context and external texture on
video decoder thread.
- Support external texture rendering in Android renderer.
- Support TextureVideoFrame in Java and use it to pass texture from video decoder
to renderer.
- Fix HW encoder and decoder detection code to avoid query codec capabilities
from sw codecs.
BUG=
R=tkchin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/18299004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7185 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-15 17:52:42 +00:00
tkchin@webrtc.org
90750482fa
Remove deprecated RTCVideoRenderer constructor.
...
Removes -[RTCVideoRenderer initWithView]. Also, fix potential issue where we hold on to a video frame longer than the lifetime of its associated track.
BUG=3341
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16099004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7032 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-02 20:50:00 +00:00
thakis@chromium.org
44010f3e52
win: Replace custom assert() macro with regular assert.h
...
The current code got added in libjingle r103; I don't see a good reason for it.
Things still build with plain old assert.h.
The custom assert was wrong: __debugbreak() is documented to return void,
so doing `cond ? true : __debugbreak()` shouldn't build (and it doesn't in
clang-cl). It's possible to make it build by writing
`cond ? true : (__debugbreak(), true)`, but just using the regular header
seems like a much better fix.
BUG=chromium:82385
Review URL: https://webrtc-codereview.appspot.com/19139004/
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7007 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-29 03:00:15 +00:00
buildbot@webrtc.org
3740d74106
(Auto)update libjingle 73927658-> 73927775
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6958 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-22 22:27:04 +00:00
phoglund@webrtc.org
7bd5fefb17
Making sure muc members get recorded.
...
This is an upstream of a change I made; will describe in a separate
email thread.
Essentially, the members map wasn't getting populated in the callclient
example, so it was always empty. Now it will be populated correctly.
R=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13189004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6950 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-21 09:53:28 +00:00
houssainy@google.com
d5b292e450
Active connection stats [LocalAddress,RemoteAddress,LocalCandidateType...etc]
...
is now printed in the head-up display in Android appRTC.
This printing will be usefull in debugging switching ICE candidates.
R=andresp@webrtc.org , glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13189005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6927 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-19 11:43:32 +00:00
buildbot@webrtc.org
a09a99950e
(Auto)update libjingle 73222930-> 73226398
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6891 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-13 17:26:08 +00:00
tkchin@webrtc.org
cb46de24fb
Add new OWNERS file to talk/examples.
...
R=juberti@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/15039004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6851 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-07 20:01:34 +00:00
buildbot@webrtc.org
d4e598d57a
(Auto)update libjingle 72097588-> 72159069
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-29 17:36:52 +00:00
buildbot@webrtc.org
51c5508bf1
(Auto)update libjingle 72016417-> 72097588
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6792 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-28 22:26:15 +00:00
buildbot@webrtc.org
45304ff0a7
(Auto)update libjingle 71829282-> 71834788
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6773 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-24 16:06:35 +00:00
buildbot@webrtc.org
e2da234e27
(Auto)update libjingle 71766184-> 71775619
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6768 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-23 21:09:01 +00:00
jiayl@webrtc.org
a0b929b63c
Revert "Reland r6707 with the fix for callclient.cc."
...
Breaking pulse build again.
This reverts commit 3e0bb9b5bf7f616000399e24f1d9622ad6b612f9.
TBR=wu@webrtc.org
BUG=3310
Review URL: https://webrtc-codereview.appspot.com/17979004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6740 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 22:28:36 +00:00
jiayl@webrtc.org
a6e8cf8fb7
Reland r6707 with the fix for callclient.cc.
...
TBR=mallinath@webrtc.org
BUG=3310
Review URL: https://webrtc-codereview.appspot.com/13039004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6737 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-18 21:34:11 +00:00
tommi@webrtc.org
2adc51c86e
Handle the case if an unusually long peer name is provided in the peerconnection example.
...
R=xians@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/21899004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6687 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-15 08:56:07 +00:00
kjellander@webrtc.org
0402515d35
Implement command line flags for peerconnection client example on Windows
...
Adding the flags and functionality for 'autoconnect', 'autocall', 'server',
'port', and 'help' like in the linux example.
BUG=3459
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13609004
Patch from Vicken Simonian <vsimon@gmail.com>.
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6573 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-01 16:28:13 +00:00
tkchin@webrtc.org
013bdf802a
APPRTCDemo(objc): Remove regex parsing in favor of JSON struct.
...
Also some cleanup/refactoring of APPRTCAppClient.
R=fischman@webrtc.org , glaznev@webrtc.org
BUG=3407
Review URL: https://webrtc-codereview.appspot.com/18499004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6362 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-06 22:29:10 +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
fischman@webrtc.org
9512719569
AppRTCDemo(android): support app (UI) & capture rotation.
...
Now app UI rotates as the device orientation changes, and the captured stream
tries to maintain real-world-up, matching Chrome/Android and Hangouts/Android
behavior.
BUG=2432
R=glaznev@webrtc.org , henrike@webrtc.org , wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/15689005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6354 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-06 18:40:44 +00:00
fischman@webrtc.org
130fa64d4c
AppRTCDemo(android): remove HTML/regex hackery in favor of JSON struct.
...
BUG=3407
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16619006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6345 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-05 20:31:41 +00:00
tkchin@webrtc.org
738df8913d
Fix retain cycle in RTCEAGLVideoView.
...
CADisplayLink increases its target's refcount. In order to break retain cycle, we wrap CADisplayLink in a new RTCDisplayLinkTimer class and use that instead.
R=fischman@webrtc.org , noahric@chromium.org
BUG=3391
Review URL: https://webrtc-codereview.appspot.com/16599006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6331 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-04 20:19:39 +00:00
henrike@webrtc.org
09a71cd9ce
talk/ios: Fixes source after corrupt sync in r6305 (which corrupted r6291).
...
BUG=N/A
R=tkchin@webrtc.org
TBR=tkchin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/21589004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6318 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-03 22:46:23 +00:00
buildbot@webrtc.org
34a08b4fb8
(Auto)update libjingle 68275107-> 68379861
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6305 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-02 15:48:10 +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
fischman@webrtc.org
abe01dd634
AppRTCDemo(android): run in full-screen & immersive mode.
...
Also:
- Only show stats HUD on demand
- Only collect stats when HUD is showing
- Don't render solid green frame when video is not present in either direction
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12639004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6275 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-29 21:46:52 +00:00
fischman@webrtc.org
43a1395370
AppRTCDemo(android): README updates for a shrinking envsetup.sh world.
...
There was duplicated (and out of date!) information in README relative to
getting-started so de-duped to point to getting-started as the canonical
reference.
R=wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/15589006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6265 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-28 17:29:09 +00:00
buildbot@webrtc.org
727ff69829
(Auto)update libjingle 67872893-> 67873348
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6244 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-23 23:20:53 +00:00
buildbot@webrtc.org
75cb3dc5f2
(Auto)update libjingle 67869540-> 67872893
...
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6243 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-23 23:13:35 +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
fischman@webrtc.org
a150bc9bbf
PeerConnection(android): allow initializing either (or neither) of {Voice,Video}Engine.
...
Enables applications that don't want to pay the init/startup cost or request
extra permissions (e.g. audio-only app, or DataChannel-only app).
BUG=3234
Review URL: https://webrtc-codereview.appspot.com/15489004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6164 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-14 22:00:50 +00:00
fischman@webrtc.org
14ea7e8922
AppRTCDemo(android): added a Heads-Up Display for bandwidth estimation.
...
- tap display to toggle visibility
- increased getStats frequency to 1hz.
R=glaznev@google.com
Review URL: https://webrtc-codereview.appspot.com/19419004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6039 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-01 20:57:55 +00:00
fischman@webrtc.org
dd92feb6dd
AppRTCDemo(android): send the created SDP, not the local description after setting it
...
This is required to allow explicit filtering of ICE candidates.
BUG=3288
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/15419004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6038 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-01 19:06:18 +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
7c82adae61
AppRTCDemo was blocking the main thread for network requests. This fixes it by making the background queue serial instead of using @synchronize to make the background operations serial.
...
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16379004
Patch from Bridger Maxwell <bridgeyman@gmail.com>.
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6028 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-04-30 00:17:47 +00:00
fischman@webrtc.org
f27fdeb9c9
AppRTCDemo(android): don't initialize process-globals more than once.
...
BUG=3257
R=braveyao@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/19369004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6001 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-04-28 16:32:38 +00:00
mallinath@webrtc.org
a0d3067575
Use CreatePeerConnection method which accepts port_allocator.
...
Other method will be removed, in a different CL.
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/20369006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5987 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-04-26 00:00:15 +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
d1fe6b728e
AppRTCDemo(android): fix a couple of SDP-related regressions.
...
- r5834 made it so that empty fields are a fatal SDP parsing error, exposing
opportunities for improvement in the preferISAC; changed split/join to use
\r\n instead of \n and now omitting the trailing space on the m=audio line
that triggered the new failure.
- DTLS requires a different role for each endpoint so conflicts with loopback
calling. apprtc.py suppresses DTLS for that reason in loopback calls, so the
android demo app now only enables DTLS by default if it is not suppressed by a
constraint (matching Chrome).
BUG=3164,3165,2507
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/11229004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5847 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-04-04 21:40:46 +00:00
fischman@webrtc.org
49c5ba32bb
AppRTCDemo(iOS): now works in the iOS Simulator!
...
...which has no camera device emulation or pass-through, so no local video
view.
R=noahric@google.com
Review URL: https://webrtc-codereview.appspot.com/10919004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5815 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-03-31 20:22:19 +00:00
fischman@webrtc.org
61e78fca6c
AppRTCDemo(iOS): remote-video reliability fixes
...
Previously GAE Channel callbacks would be handled by JS string-encoding the
payload into a URL. Unfortunately this is limited to the (undocumented,
silently problematic) maximum URL length UIWebView supports. Replaced this
scheme by a notification from JS to ObjC and a getter from ObjC to JS (which
happens out-of-line to avoid worrying about UIWebView's re-entrancy, or lack
thereof). Part of this change also moved from a combination of: JSON,
URL-escaping, and ad-hoc :-separated values to simply JSON.
Also incidentally:
- Removed outdated TODO about onRenegotiationNeeded, which is unneeded
- Move handling of PeerConnection callbacks to the main queue to avoid having
to think about concurrency too hard.
- Replaced a bunch of NSOrderedSame with isEqualToString for clearer code and
not having to worry about the fact that [nil compare:@"foo"]==NSOrderedSame
is always true (yay ObjC!).
- Auto-scroll messages view.
BUG=3117
R=noahric@google.com
Review URL: https://webrtc-codereview.appspot.com/10899006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5814 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-03-31 20:16:49 +00:00