fbarchard@google.com
64dc671167
Roll libyuv to r590
...
BUG=none
TEST=try bots
Review URL: https://webrtc-codereview.appspot.com/1161004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3615 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-03-05 21:02:33 +00:00
kjellander@webrtc.org
4013ac478e
Roll Chromium revision 176094:182149
...
This gets us (for build/):
* GYP updates for Mac 64-bit builds (r178644)
* Lots of updates to Android scripts
* Support Visual Studio Express 2012.
* asan=1 now enables line numbers in symbolized ASan reports (r179326)
See
http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog.html?url=trunk%2Fsrc%2Fbuild%2F&range=176094%3A182149&mode=html
for more info
In addition to this all our DEPS references to Chromium's DEPS file are
updated.
BUG=none
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/1106004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3516 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-02-14 19:13:30 +00:00
andrew@webrtc.org
e6e344a7dc
Sync libvpx and its gyp wrapper from Chromium.
...
TBR=kjellander
BUG=webrtc:1213
Review URL: https://webrtc-codereview.appspot.com/1096007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3505 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-02-12 19:35:18 +00:00
kjellander@webrtc.org
18a21a03c6
Android NDK build tools
...
This CL enables building with Android NDK in the way that Chromium buildbots do it.
== Overview ==
* Add Android dependencies to DEPS (SDK, NDK, Android test runner). This also makes it possible to use Android's build/android/run_tests.py script to execute tests on Android devices.
* Add a Python script to build the WebRTC Video demo for Android using ndk-build and Ant. This is designed as an annotation script for Buildbots but is also fine to run locally.
* Update Android.mk so it works with the compiler output from a build performed by build/android/buildbot/bb_run_bot.py (which is how Chrome buildbots build).
== Syncing Android dependencies ==
To get the dependencies added in DEPS synced out, you must change the last line
of your .gclient file to look like this:
];target_os = ["android"]
That will append another variable to the .gclient file that causes these
dependencies to be synced during gclient sync.
If you want to get additional platform-specific dependencies in the same
checkout, add them to the list too, e.g. target_os = ["android", "unix"].
== Android.mk ==
The fix in Android.mk is needed since Chrome is building using build/android/buildbot/bb_run_bot.py, which only output the libraries into out/Debug. With the change it works for both that and a normal build (which copies the library files from out/Debug/obj.target/subpath to out/Debug anyway as a part of the build).
== svn:ignore ==
NOTICE: Before submitting, the following directories should be added to svn:ignore in third_party to avoid them from being removed and re-synced for every build:
* android_testrunner
* android_tools
* WebKit
This has to be done in a manual SVN commit since it's not possible to include in a git-svn CL (and I don't want to migrate this to a SVN CL).
BUG=none
TEST=local builds
Review URL: https://webrtc-codereview.appspot.com/1024009
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3497 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-02-11 17:43:19 +00:00
henrik.lundin@webrtc.org
73deaadd0e
Removing a hack for CNG
...
However, two other "hacks" had to be added to maintain bit-exactness
with legacy.
Note that this change requires a new version of the universal.rtp test
input, although the output reference stays the same.
Moving reference files, and using a new input vector for NetEq4.
The new input vector neteq_universal_new.rtp is identical to the old
neteq_universal.rtp, except that the payload type for CNG packets that
follows a wideband codec is changed to 98.
Update to resources revision 15 where the new reference files are.
Also changing a faulty log error.
Review URL: https://webrtc-codereview.appspot.com/1078009
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3442 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-31 13:32:51 +00:00
kjellander@webrtc.org
9ae4c669ec
Set working dir for test run script + update resources
...
By changing the working directory for the executing script to the same
directory as the script is located in, it is possible to run the script
standing in a higher-level directory (otherwise the input file relative
paths become invalid).
This CL also changes the input file path for the audio_e2e_test test to
assume the file is located resources.
BUG=none
TEST=locally executed the tests standing in trunk/
Review URL: https://webrtc-codereview.appspot.com/1061009
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3422 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-28 21:19:56 +00:00
mflodman@webrtc.org
59d209562f
Moving ViE test files and deleting files no longer used.
...
BUG=977
TEST=Try bots.
Review URL: https://webrtc-codereview.appspot.com/1046004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3414 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-25 12:45:39 +00:00
fbarchard@google.com
ebc6d8f172
libyuv r540 roll for valgrind tools update, optimized ARGBToI444_SSSE3 and I420Copy single memcpy per plane if contiguous.
...
BUG=none
TEST=try bots still pass
Review URL: https://webrtc-codereview.appspot.com/1019012
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3378 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-17 01:43:38 +00:00
kjellander@webrtc.org
75ba51938c
Updating chromium_revision 169394:176094
...
This resolves ninja error on Windows due to recent depot_tools update, since a newer GYP will be synced.
Initially we ran into a compile issue with libvpx: http://code.google.com/p/webm/issues/detail?id=521
The change in libvpx.gyp is needed since the newer version of Clang that
is used with this Chromium revision provides the -fsanitize=address flag
instead of the old (now deprecated) -faddress-sanitizer. Without
disabling them when asan=1, we'll get compile errors for the assembly
offsets generated for Libvpx. See http://crbug.com/159580 for more details.
BUG=libyuv:173
TEST=trybots passing.
Review URL: https://webrtc-codereview.appspot.com/1026004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3361 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-11 16:04:50 +00:00
fbarchard@google.com
26901c262c
libyuv r534 for tools folder valgrind and endian fix for big endian platforms like s390x.
...
BUG=none
TEST=try bots
Review URL: https://webrtc-codereview.appspot.com/1031005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3359 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-01-10 22:48:18 +00:00
leozwang@webrtc.org
ac77084583
Roll opus to 172355 and delete opus_demo from webrtc opus
...
opus_demo has been inlucded in opus in chromium.
BUG=None
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/973013
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3317 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-19 17:24:30 +00:00
fbarchard@google.com
4c32439830
Roll libyuv to r520. Includes security fix to mark stack as not executable.
...
BUG=1172
TEST=none
Review URL: https://webrtc-codereview.appspot.com/1000005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3300 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-15 00:20:08 +00:00
fbarchard@google.com
dec09eed2f
libyuv r515 ports matrix effects to Neon
...
BUG=none
TESTED=try bots
Review URL: https://webrtc-codereview.appspot.com/966034
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3295 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-14 15:22:25 +00:00
roosa@google.com
b8ba4d8109
Add number of inserted samples to NetEq statistics.
...
BUG=
Review URL: https://webrtc-codereview.appspot.com/964030
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3289 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-14 00:06:18 +00:00
marpan@webrtc.org
9f0fc97d2f
Rolllibvpx to 7a09f6b89268
...
Relevant updates/fixes:
000c8414b510: Moved denoiser frame copy/updates out of loopfilter thread.
Multi-threading bug fix: http://code.google.com/p/webm/issues/detail?id=497
ef2248a2a376: Added work buffer for denoiser.
Denoiser bug fix: http://code.google.com/p/webm/issues/detail?id=485
464b1df6d45b: Updates to qp-regulate and rate correction factor.
Rate control improvement: http://code.google.com/p/webrtc/issues/detail?id=1153
TBR=andrew@webrtc.org , leozwang@google.com
Review URL: https://webrtc-codereview.appspot.com/981005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3266 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-11 23:02:32 +00:00
kma@webrtc.org
02d9df4544
Updated webrtc_resources_revision to 11, for adding two test files for APM and iSAC.
...
Review URL: https://webrtc-codereview.appspot.com/973014
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3261 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-11 19:33:56 +00:00
marpan@webrtc.org
55edaecc93
Revert r3254 due to bot failure on android.
...
TBR=andrew@webrtc.org , leozwang@google.com
Review URL: https://webrtc-codereview.appspot.com/971018
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3255 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-10 19:59:03 +00:00
marpan@webrtc.org
1f3476dd83
Roll libvpx to 000c8414b510.
...
Relevant updates/fixes:
000c8414b510: Moved denoiser frame copy/updates out of loopfilter thread.
Multi-threading bug fix: http://code.google.com/p/webm/issues/detail?id=497
ef2248a2a376: Added work buffer for denoiser.
Denoiser bug fix: http://code.google.com/p/webm/issues/detail?id=485
464b1df6d45b: Updates to qp-regulate and rate correction factor.
Rate control improvement: http://code.google.com/p/webrtc/issues/detail?id=1153
Review URL: https://webrtc-codereview.appspot.com/971017
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3254 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-10 18:11:30 +00:00
fbarchard@google.com
781cf06124
libyuv r508 with scaler fix for overread horizontally that was caught by valgrind.
...
BUG=none
TEST=valgrind bots
Review URL: https://webrtc-codereview.appspot.com/968013
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3232 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-12-04 03:07:29 +00:00
kjellander@webrtc.org
107d4efd11
Rolling chromium_revision 157509:169394
...
This gives us, among other things:
* updated gtest that compiles with Visual Studio 2012
* newer build tools
* newer Clang compiler.
BUG=none
TEST=all trybots passing.
Review URL: https://webrtc-codereview.appspot.com/973004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3165 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-11-26 16:31:20 +00:00
tina.legrand@webrtc.org
221b11af22
Pulling Opus version 1.0.1 from Chromium
...
BUG=issue1055
Review URL: https://webrtc-codereview.appspot.com/933024
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3161 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-11-26 08:20:44 +00:00
andrew@webrtc.org
8cd18c55b8
Add winsdk_samples to provide directshow_baseclasses.
...
Builds locally on Windows (and passes try), and a gyp run succeeds with
include_internal_video_capture=0. This should ensure it won't impact
Chromium.
Review URL: https://webrtc-codereview.appspot.com/937026
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3146 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-11-21 18:46:45 +00:00
kjellander@webrtc.org
3662aa38f3
Revert 3123 - Roll to libyuv r496 for Android x86 fix by avoiding stdint.h
...
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/931012
TBR=fbarchard@google.com
Review URL: https://webrtc-codereview.appspot.com/933020
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3128 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-11-19 07:03:34 +00:00
fbarchard@google.com
2ec58dc4d1
Roll to libyuv r496 for Android x86 fix by avoiding stdint.h
...
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/931012
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3123 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-11-17 00:14:47 +00:00
fbarchard@google.com
8123ed74dd
libyuv roll to r481 for optimization of neon yuv to/from rgb
...
BUG=none
TEST=convert_test in libyuv
Review URL: https://webrtc-codereview.appspot.com/929016
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3101 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-11-15 01:40:47 +00:00
fbarchard@google.com
c9471474e4
Roll libyuv to r438 to get vs2012 cleanup, NV12 to/from I420 and NV21. Added Unaligned unittests.
...
BUG=none
TEST=libyuv unittests
Review URL: https://webrtc-codereview.appspot.com/922008
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3004 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-26 20:31:23 +00:00
tina.legrand@webrtc.org
1f8c02a4de
Getting Opus from Chrome
...
This CL replaces http://review.webrtc.org/921006/
BUG=issue982
TBR=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/933006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2993 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-25 12:37:08 +00:00
tina.legrand@webrtc.org
d7ee10fe0f
Remove internal version of Opus
...
First step towards moving over to use Opus in Chrome.
BUG=issue982
Review URL: https://webrtc-codereview.appspot.com/937004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2990 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-25 10:47:14 +00:00
marpan@webrtc.org
2e40582760
Roll libvpx to fd3078fd8fe7.
...
Relevant updates:
fd3078fd8fe7: Fix to Valgrind memory issues.
4cf4c94ad166: Fix to rd cost computation for motion vector bias
(issue: http://code.google.com/p/webm/issues/detail?id=486 )
4c53bacce4a9: post-proc: deblock filter optimization
(issues: http://code.google.com/p/webm/issues/detail?id=480
http://code.google.com/p/webm/issues/detail?id=479 )
Review URL: https://webrtc-codereview.appspot.com/921007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2978 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-23 23:57:27 +00:00
vikasmarwaha@webrtc.org
0cd4c1be68
Rollback r2962 from webrtc trunk.
...
Review URL: https://webrtc-codereview.appspot.com/915007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2969 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-23 00:19:32 +00:00
andrew@webrtc.org
14b43beb7c
Move src/ -> webrtc/
...
TBR=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/915006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2963 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-22 18:19:23 +00:00
marpan@webrtc.org
24a419c0c7
Roll libvpx to 4cf4c94ad166.
...
Relevant updates:
4cf4c94ad166: Fix to rd cost computation for motion vector bias
(issue: http://code.google.com/p/webm/issues/detail?id=486 )
f6886c4b9328: post-proc: fix 0 or negative threshold handling
4c53bacce4a9: post-proc: deblock filter optimization
(issues: http://code.google.com/p/webm/issues/detail?id=480
http://code.google.com/p/webm/issues/detail?id=479 )
Review URL: https://webrtc-codereview.appspot.com/909004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2962 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-22 17:55:26 +00:00
fbarchard@google.com
0a02c38345
Roll libyuv to r426 to pick up MJPGSize() for WebRTC, and Neon optimization changes for YUY2 and NV12.
...
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/868010
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2948 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-18 20:37:41 +00:00
tina.legrand@webrtc.org
a7d8387bdd
Opus integration
...
First patch = delivery from August 22, 2012.
Review URL: https://webrtc-codereview.appspot.com/756005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2945 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-18 10:00:52 +00:00
mikhal@webrtc.org
fafb0bf38b
Rolling libvpx to 30d8ba541ede
...
Review URL: https://webrtc-codereview.appspot.com/873008
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2896 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-10 00:11:44 +00:00
fbarchard@google.com
cc82cff82e
libyuv roll r389 for mac visibility, Q420 and YUY2 optimization, AVX2 detect.
...
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/858004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2857 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-01 18:32:41 +00:00
fbarchard@google.com
133f5d06aa
libyuv roll to r381 for I422ToRGBA
...
BUG=none
TEST=libyuv unittest
Review URL: https://webrtc-codereview.appspot.com/820007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2853 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-30 19:25:38 +00:00
marpan@webrtc.org
81f09d709e
Roll libvpx to get changes/fix to cyclic refresh.
...
Review URL: https://webrtc-codereview.appspot.com/835004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2814 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-24 18:06:42 +00:00
andrew@webrtc.org
b9d2064f6e
Roll Chromium 152335:157509, and add google_apis/build.
...
- gitignore google_apis.
- Disable 4005 warning in gflags.gyp.
TBR=niklas.enbom, kjellander
TESTED=trybots
Review URL: https://webrtc-codereview.appspot.com/819004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2792 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-19 23:08:50 +00:00
fbarchard@google.com
56c7c81250
libyuv roll to r364 for NEON version of I420ToRGBA
...
BUG=none
TEST=libyuv unittest
Review URL: https://webrtc-codereview.appspot.com/812005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2790 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-19 21:15:45 +00:00
fbarchard@google.com
2e7c22da7d
Roll libyuv to match chrome and gtp roll.
...
BUG=none
TEST=try bots pass
Review URL: https://webrtc-codereview.appspot.com/784012
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2780 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-18 08:03:32 +00:00
stefan@webrtc.org
a36442db10
Roll libvpx to fixes for valgrind warnings.
...
BUG=
Review URL: https://webrtc-codereview.appspot.com/802005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2769 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-13 09:15:53 +00:00
fbarchard@google.com
852fd687e0
Fix for clang ia32 on linux which does not support optimize attribute.
...
BUG=libyuv bug 83
TEST=./build/gyp_chromium --depth=. -Dtarget_arch=ia32 -Dclang=1 webrtc.gyp && make libyuv
Review URL: https://webrtc-codereview.appspot.com/790004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2731 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-10 22:01:32 +00:00
fbarchard@google.com
1594e84ca0
Roll to libyuv r341 to fix unittest failures on build bots. Version number updated so unittests pass version check. Disabled 4 tests that failed valgrind - libyuv bugs 79,80,81,82 opened for followup.
...
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/787005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2730 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-10 20:54:05 +00:00
stefan@webrtc.org
de8db4e350
Roll libvpx to c6fd0a5d to get MFQE and denoising improvements.
...
BUG=
Review URL: https://webrtc-codereview.appspot.com/779004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2710 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-06 10:49:31 +00:00
fbarchard@google.com
3baa8a2102
Roll libyuv to r338 which includes more complete unittests, lint fixes, and a bug fix for YUY2ToARGB which was oversampling by 1 row for UV channels. This should help with setting up build bots for libyuv and keeps the version in sync with chromium.
...
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/771005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2690 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-31 04:12:08 +00:00
andrew@webrtc.org
12dbcd9798
Roll Chromium 143348:152335.
...
Fix libvpx-Android build error.
Review URL: https://webrtc-codereview.appspot.com/760004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2680 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-28 20:34:57 +00:00
fbarchard@google.com
a4fa46108c
Bump libyuv version to 331 which includes clang build fixes.
...
BUG=none
TEST=devenv -build Debug webrtc.sln
Review URL: https://webrtc-codereview.appspot.com/766004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2679 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-28 18:29:03 +00:00
andrew@webrtc.org
7b2e919f7d
Add pinned dep for cygwin.
...
Review URL: https://webrtc-codereview.appspot.com/760005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2676 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-28 15:56:40 +00:00
stefan@webrtc.org
727a9f5648
Roll libvpx to c522217d.
...
Also changing generate_gypi.sh to sort the list of files before writing gypis.
TBR=andrew@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/751004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2657 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-22 20:14:33 +00:00