diff options
| author | Eric Laurent <elaurent@google.com> | 2012-10-23 08:31:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 08:31:29 -0700 |
| commit | 9cdf6db50c0dab30f32291bf00c702ca79132674 (patch) | |
| tree | 64536f7b8dca7077d6649d6becb73c8b588da625 /media | |
| parent | 3aaa4e30f7663673f3453d3f4671b1119f1802fd (diff) | |
| parent | 5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1 (diff) | |
| download | frameworks_av-9cdf6db50c0dab30f32291bf00c702ca79132674.zip frameworks_av-9cdf6db50c0dab30f32291bf00c702ca79132674.tar.gz frameworks_av-9cdf6db50c0dab30f32291bf00c702ca79132674.tar.bz2 | |
am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
* commit '5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
stagefright: discard audio at start of capture
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 48bbf8f..8319cd7 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -373,7 +373,7 @@ MediaProfiles::getCameraId(const char** atts) void MediaProfiles::addStartTimeOffset(int cameraId, const char** atts) { - int offsetTimeMs = 700; + int offsetTimeMs = 1000; if (atts[2]) { CHECK(!strcmp("startOffsetMs", atts[2])); offsetTimeMs = atoi(atts[3]); |