summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys need to be ↵Eino-Ville Talvala2014-09-261-10/+13
|\ | | | | | | | | | | | | null." into lmp-dev * commit '5f5d0544454f062c1f37acad1a72d8c47b4a32b2': Camera1 shim: If there's no flash, the keys need to be null.
| * Merge "Camera1 shim: If there's no flash, the keys need to be null." into ↵Eino-Ville Talvala2014-09-261-10/+13
| |\ | | | | | | | | | lmp-dev
| | * Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we set FLASH_MODE_OFF for FLASH_MODE when a flash unit isn't available. However, per the API documentation, the key has to be null instead. - Make sure that the flash mode and supported flash mode keys are null if there's no flash unit on start - Don't set flash mode in later setParameters calls if there is no flash unit - Map NULL value for flash mode key to FLASH_MODE_OFF for internal consistency. Bug: 17660716 Change-Id: I3033682f0b882b8c2004114e2afef31662caebda
* | | am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if ↵Wei Jia2014-09-261-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | video exists." into lmp-dev * commit '0ed72488feba74904d25ebc91bda60c6b1d0af55': NuPlayer: use format obtained from source to tell if video exists.
| * | Merge "NuPlayer: use format obtained from source to tell if video exists." ↵Wei Jia2014-09-261-1/+1
| |\ \ | | | | | | | | | | | | into lmp-dev
| | * | NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 17374216 Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
* | | | am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-261-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ea55da9434f674efaacaa443c97a411bdef4ff1a': Fix SoftAAC2 flush
| * | | Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-251-4/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Fix SoftAAC2 flushMarco Nelissen2014-09-251-4/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | If there were less than a full frame worth of samples in the ring buffer, then flush would loop forever trying to empty the ring buffer. Bug: 17646525 Change-Id: I68ec87352a91ce3a96d05e9b3f60a6e7975f9156
* | | am e0711f26: camera: add traces for KPI measurementRuchit Sharma2014-09-262-2/+16
|\ \ \ | |/ / | | | | | | | | | * commit 'e0711f2651121754a10c784e3b149024d17fa4d5': camera: add traces for KPI measurement
| * | camera: add traces for KPI measurementRuchit Sharma2014-09-252-2/+16
| |/ | | | | | | | | Bug: 17658101 Change-Id: I1d8035c4a8fba7b88a87f205ce57c13d812e9df5
* | am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
|\ \ | |/ | | | | | | * commit 'c0d17e349901c3ccf6d15b7dcdf7fa30139c9750': NuPlayer: Fix decoder error handling
| * Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
| |\
| | * NuPlayer: Fix decoder error handlingAndy Hung2014-09-243-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon error, release MediaCodec after flushing data. Report errors when they occur with ALOGE. Fix onInputBufferFilled mInputBufferIsDequeued check. Bug: 17423087 Bug: 17622642 Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
* | | am 9a70c2c4: Merge "Fix Widevine classic playback errors with NuPlayer" into ↵Lajos Molnar2014-09-251-1/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-dev * commit '9a70c2c490afe35383c2226061af5a2f4e5b2109': Fix Widevine classic playback errors with NuPlayer
| * | Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-devLajos Molnar2014-09-251-1/+8
| |\ \
| | * | Fix Widevine classic playback errors with NuPlayerJeff Tinker2014-09-241-1/+8
| | | | | | | | | | | | | | | | | | | | bug: 17589961 Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
* | | | am a935c76f: stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-251-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a935c76f96b066941b34f81c42b3fe9d00db98c5': stagefright: Advertise 16x16 alignment requirement for PV codecs
| * | | stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-241-6/+6
| | | | | | | | | | | | | | | | | | | | Bug: 17648616 Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
* | | | am 207fc297: Merge "mediaplayer: handle bad input in VideoFrameScheduler" ↵Lajos Molnar2014-09-252-4/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '207fc297cb388c1466b7e0ef35de9d8b13830b37': mediaplayer: handle bad input in VideoFrameScheduler
| * | | Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-devLajos Molnar2014-09-252-4/+17
| |\ \ \
| | * | | mediaplayer: handle bad input in VideoFrameSchedulerLajos Molnar2014-09-242-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17626098 Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
* | | | | am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into ↵Lajos Molnar2014-09-251-7/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '4a34b9a4759d7dcc2d2ad5bd96ea8477915dd67a': stagefright: use frame height if slice height is 0
| * | | | Merge "stagefright: use frame height if slice height is 0" into lmp-devLajos Molnar2014-09-251-7/+14
| |\ \ \ \
| | * | | | stagefright: use frame height if slice height is 0Lajos Molnar2014-09-241-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for some vendors that set slice height to 0. Android uses slice height is the vertical stride for YUV planar and semiplanar formats. Bug: 13433554 Change-Id: I4da038e7a768dcd8360c33fa1a9ce95a172f16bb
* | | | | | am 70a250ab: Merge "SoftVideoDecoderOMXComponent: re-config the buffer size ↵Ronghua Wu2014-09-251-0/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when port definition changed." into lmp-dev * commit '70a250ab52079a4d02ff0687c07a73b2bd39feaf': SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.
| * | | | | Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port ↵Ronghua Wu2014-09-251-0/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | definition changed." into lmp-dev
| | * | | | SoftVideoDecoderOMXComponent: re-config the buffer size when port definition ↵Ronghua Wu2014-09-241-0/+34
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | changed. Bug: 17326758 Change-Id: I7c6b85284ae0cbfa54f999851f56db84345b65bf
* | | | | am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and ↵Ronghua Wu2014-09-255-18/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | SoftMEPEG4." into lmp-dev * commit 'cae1c0fa3f4d5e2387f05a6055bf356914851c4b': stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
| * | | | Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into ↵Ronghua Wu2014-09-255-18/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-dev
| | * | | | stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.Ronghua Wu2014-09-245-18/+31
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 17326758 Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
* | | | | am ec5206c9: Merge "LiveSession: do not drop seek request" into lmp-devRobert Shih2014-09-251-10/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ec5206c99694d263ac099bf2c37f8119f43f74f1': LiveSession: do not drop seek request
| * | | | Merge "LiveSession: do not drop seek request" into lmp-devRobert Shih2014-09-251-10/+17
| |\ \ \ \
| | * | | | LiveSession: do not drop seek requestRobert Shih2014-09-181-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17538727 Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
* | | | | | am 50373731: Merge "NuPlayerDecoder: release MediaBuffers when decoder is ↵Wei Jia2014-09-251-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted." into lmp-dev * commit '50373731b2438912e467ae34c92c712bb84d8a75': NuPlayerDecoder: release MediaBuffers when decoder is deleted.
| * | | | | Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into ↵Wei Jia2014-09-241-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | * | | | | NuPlayerDecoder: release MediaBuffers when decoder is deleted.Wei Jia2014-09-241-0/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
* | | | | | am f74023f0: Merge "stagefright: return encrypted input buffer for secure ↵Lajos Molnar2014-09-251-1/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codecs" into lmp-dev * commit 'f74023f0fbd35b4e9382703dd34c14b440f3da43': stagefright: return encrypted input buffer for secure codecs
| * | | | | Merge "stagefright: return encrypted input buffer for secure codecs" into ↵Lajos Molnar2014-09-241-1/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | lmp-dev
| | * | | | stagefright: return encrypted input buffer for secure codecsLajos Molnar2014-09-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17630446 Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
* | | | | | am 846202f5: Merge "NuCachedSource2: more fixes for source read hang" into ↵Chong Zhang2014-09-241-2/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '846202f5483c30ff380fc997c7d4461cce090098': NuCachedSource2: more fixes for source read hang
| * | | | | Merge "NuCachedSource2: more fixes for source read hang" into lmp-devChong Zhang2014-09-241-2/+14
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | NuCachedSource2: more fixes for source read hangChong Zhang2014-09-241-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not try to read from HTTP source if already disconnecting - Let NuCachedSource2::readAt() return immediately when disconnecting Bug: 17613805 Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
* | | | | | am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC ↵Ronghua Wu2014-09-244-84/+141
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder." into lmp-dev * commit '80ec934ae7d4e3a78af87554fdb77a58f6386ba0': stagefright: add adaptive playback support to SoftHEVC decoder.
| * | | | | Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into ↵Ronghua Wu2014-09-244-84/+141
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | lmp-dev
| | * | | | stagefright: add adaptive playback support to SoftHEVC decoder.Ronghua Wu2014-09-234-84/+141
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 17326758 Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
* | | | | am fc55783d: Merge "NuPlayer will notify SeekComplete only when requested ↵Wei Jia2014-09-243-19/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | so." into lmp-dev * commit 'fc55783d0886d5dbaa234f85a4313796d9ef1df4': NuPlayer will notify SeekComplete only when requested so.
| * | | | Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-devWei Jia2014-09-243-19/+29
| |\ \ \ \
| | * | | | NuPlayer will notify SeekComplete only when requested so.Wei Jia2014-09-233-19/+29
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 17596535 Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
* | | | | am a4b08944: Merge "audio policy: add hw hotword flag for inputs" into lmp-devEric Laurent2014-09-242-31/+69
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a4b0894425c0e2a2ebd54b002b6bafa5f1ce0445': audio policy: add hw hotword flag for inputs
generated by cgit v1.1 at 2025-02-10 09:05:57 +0000