summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Switch to new fx library APIMarco Nelissen2012-10-259-174/+0
| | | | Change-Id: I6603aef5e3821a8f911e3f33ef8565d04bd1e2e5
* am 203836b7: am b8d6efba: Camera2: Don\'t hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
|\ | | | | | | | | * commit '203836b7584ccb7787202578259d27d70a8a3ede': Camera2: Don't hold locks while waiting to sync.
| * am b8d6efba: Camera2: Don\'t hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
| |\ | | | | | | | | | | | | * commit 'b8d6efba8b87e6eeb049651cb67f9827198e658e': Camera2: Don't hold locks while waiting to sync.
| | * Camera2: Don't hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
| | | | | | | | | | | | | | | Bug: 7409877 Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
* | | Make ThrottledSource more usableMarco Nelissen2012-10-242-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | Add reconnectAtOffset(), DrmInitialization() and getDrmInfo(). Also rearrange the code a bit so all the methods that just call through to the wrapped DataSource are in the header. Change-Id: If25b674df317b0f6da5d36241c694e32abb0a01c
* | | am e3e639b1: am ac1a450a: Merge "Don\'t attempt to seek audio and video ↵Andreas Huber2012-10-231-9/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | separately." into jb-mr1-dev * commit 'e3e639b1714d35628f9b75276839ad55d8afc74c': Don't attempt to seek audio and video separately.
| * | am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into ↵Andreas Huber2012-10-231-9/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | jb-mr1-dev * commit 'ac1a450a76c2f42f66c876200cb724d1e93ef4c7': Don't attempt to seek audio and video separately.
| | * Merge "Don't attempt to seek audio and video separately." into jb-mr1-devAndreas Huber2012-10-231-9/+17
| | |\
| | | * Don't attempt to seek audio and video separately.Andreas Huber2012-10-231-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The widevine extractor doesn't deal too well with that... Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff related-to-bug: 7262386
* | | | am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." ↵Eino-Ville Talvala2012-10-231-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027': Camera2: Increase mode update timeout.
| * | | am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-devEino-Ville Talvala2012-10-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc': Camera2: Increase mode update timeout.
| | * | Merge "Camera2: Increase mode update timeout." into jb-mr1-devEino-Ville Talvala2012-10-231-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Camera2: Increase mode update timeout.Eino-Ville Talvala2012-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During camera startup, it might take a few hundred milliseconds before requests start to be dequeued by the HAL. Increase the timeout for synchronizing mode changes and triggers so that triggers near startup don't time out. Bug: 6970465 Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
* | | | am 9cdf6db5: am 5f6f5b7d: Merge "stagefright: discard audio at start of ↵Eric Laurent2012-10-231-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | capture" into jb-mr1-dev * commit '9cdf6db50c0dab30f32291bf00c702ca79132674': stagefright: discard audio at start of capture
| * | | am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into ↵Eric Laurent2012-10-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1': stagefright: discard audio at start of capture
| | * | Merge "stagefright: discard audio at start of capture" into jb-mr1-devEric Laurent2012-10-231-1/+1
| | |\ \
| | | * | stagefright: discard audio at start of captureEric Laurent2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new camcorder start sound is longer than previous one and we must discard more audio when capture starts. Ideally, camcorder should use synchronous record start. Bug 7394330. Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
* | | | | am 3aaa4e30: am c4640c9e: Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3aaa4e30f7663673f3453d3f4671b1119f1802fd': Increase allowed number of VHQ resamplers to 3
| * | | | am c4640c9e: Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-231-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c4640c9eef850bb1c754bd6b477f1cc8350c6081': Increase allowed number of VHQ resamplers to 3
| | * | | Increase allowed number of VHQ resamplers to 3Glenn Kasten2012-10-221-1/+1
| | |/ / | | | | | | | | | | | | | | | | Bug: 7378660 Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
* | | | am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality ↵Mathias Agopian2012-10-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | resampler to produce garbage" into jb-mr1-dev * commit '7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7': Fix a typo that caused the high quality resampler to produce garbage
| * | | am e384d75b: Merge "Fix a typo that caused the high quality resampler to ↵Mathias Agopian2012-10-221-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | produce garbage" into jb-mr1-dev * commit 'e384d75b95b9db30d64a18ada93e070cf07de306': Fix a typo that caused the high quality resampler to produce garbage
| | * | Merge "Fix a typo that caused the high quality resampler to produce garbage" ↵Mathias Agopian2012-10-221-1/+1
| | |\ \ | | | | | | | | | | | | | | | into jb-mr1-dev
| | | * | Fix a typo that caused the high quality resampler to produce garbageMathias Agopian2012-10-211-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the problem is that if libaudio_resampler is present, it is those coefficients that will always be selected, but the correct meta-data. Bug: 7385994 Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
* | | | am dc5f12a2: am 0328ec08: WFD use of HDCP is now optional.Andreas Huber2012-10-222-66/+40
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'dc5f12a217279d60444fc7243fe89ba4311eea88': WFD use of HDCP is now optional.
| * | | am 0328ec08: WFD use of HDCP is now optional.Andreas Huber2012-10-222-66/+40
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20': WFD use of HDCP is now optional.
| | * | WFD use of HDCP is now optional.Andreas Huber2012-10-222-66/+40
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't we won't. If an HDCP session is established we'll tell our observer that the connection is secure, otherwise we don't. Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46 related-to-bug: 7368436
* | | am ad99e748: am c3ed4a1c: Merge "AAC DRC reference level for mobile is ↵Jean-Michel Trivi2012-10-191-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | -16dB" into jb-mr1-dev * commit 'ad99e748ae97be7b0f769e1895ca7f69da6c9df8': AAC DRC reference level for mobile is -16dB
| * | am c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-devJean-Michel Trivi2012-10-191-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'c3ed4a1c3ea71681c71de48c206a899e702864bd': AAC DRC reference level for mobile is -16dB
| | * Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-devJean-Michel Trivi2012-10-191-1/+1
| | |\
| | | * AAC DRC reference level for mobile is -16dBJean-Michel Trivi2012-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use -16dB as the default DRC reference level when decoding streams with DRC metadata. Bug 7370764 Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
* | | | am e50ba28a: am 9e760d66: Merge "Camera2: Fix potential deadlock" into ↵Eino-Ville Talvala2012-10-191-7/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'e50ba28aa1846a7c2a296f122a5675476dacc4a5': Camera2: Fix potential deadlock
| * | | am 9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-devEino-Ville Talvala2012-10-191-7/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9e760d66c5dfae4d9688e32d7a02fca09569f7ef': Camera2: Fix potential deadlock
| | * | Merge "Camera2: Fix potential deadlock" into jb-mr1-devEino-Ville Talvala2012-10-191-7/+11
| | |\ \
| | | * | Camera2: Fix potential deadlockEino-Ville Talvala2012-10-171-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setPreviewWindow was holding a lock during long-lasting HAL calls which may cause deadlock if the HAL calls back into the service during the call. Stop holding the lock during these calls, since it's not essential to do so. Bug: 7320517 Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
* | | | | am febe48ae: am 3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-devMarco Nelissen2012-10-193-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'febe48aef0cb757e149d6f4494c9d220d6ba369a': Fix valgrind issues
| * | | | am 3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-devMarco Nelissen2012-10-193-2/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3c9e53c6ea2b01506addd4fb1164e6a9bbe6e16f': Fix valgrind issues
| | * | | Merge "Fix valgrind issues" into jb-mr1-devMarco Nelissen2012-10-193-2/+8
| | |\ \ \
| | | * | | Fix valgrind issuesMarco Nelissen2012-10-173-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were reading some uninitialized memory when creating bass boost and EQ effects, and using memcpy() with identical source and destination. Change-Id: I15ea1b2c52ae05cbf54aef04351e89805e0ebf8e
* | | | | | am 424b4a57: am 291f824e: Remove active track when thread goes to standbyGlenn Kasten2012-10-191-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '424b4a57f5e1e8bd99cb619398389a467ec41f92': Remove active track when thread goes to standby
| * | | | | am 291f824e: Remove active track when thread goes to standbyGlenn Kasten2012-10-191-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '291f824e02ff517a34cfe50220b4e2b402ee998d': Remove active track when thread goes to standby
| | * | | | Remove active track when thread goes to standbyGlenn Kasten2012-10-181-3/+3
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 7369232 Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1
* | | | | am 4ad27b11: am 1baa01a5: Merge "hardening: eliminate more .text relocations"Nick Kralevich2012-10-191-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4ad27b11f8c883a3131d1f81d883de01b8076be1': hardening: eliminate more .text relocations
| * | | | am 1baa01a5: Merge "hardening: eliminate more .text relocations"Nick Kralevich2012-10-191-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1baa01a52f24566c134313fade8b19a582654638': hardening: eliminate more .text relocations
| | * \ \ \ Merge "hardening: eliminate more .text relocations"Nick Kralevich2012-10-191-2/+4
| | |\ \ \ \
| | | * | | | hardening: eliminate more .text relocationsNick Kralevich2012-10-181-2/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations were cleaned up from amrwbenc. Looks like we forgot one. Fixed. Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
* | | | | | Merge "Ignore SIGPIPE during write() to broken pipe"jp abgrall2012-10-171-0/+1
|\ \ \ \ \ \
| * | | | | | Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens occasionally when taking a bugreport. Bug: 6447319 Change-Id: Ia6531a4a3658461f8fd3f7106e7996da7cc5933a
* | | | | | | am 5ee33507: am ccd08439: Added some extra failure logging messagesJames Dong2012-10-172-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '5ee3350785f2821a1b5aad92824ea6b380f61ece': Added some extra failure logging messages
| * | | | | am ccd08439: Added some extra failure logging messagesJames Dong2012-10-172-0/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'ccd08439c7914d86264c7ad81bfd03cf39aaa9f7': Added some extra failure logging messages