summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ca61a8f0: Merge "MediaCodecSource: stop puller from caller\'s thread ↵Chong Zhang2014-08-043-36/+45
|\ | | | | | | | | | | | | instead of looper" into lmp-dev * commit 'ca61a8f0bc22606cb11b99bdb10a146f941d556e': MediaCodecSource: stop puller from caller's thread instead of looper
| * Merge "MediaCodecSource: stop puller from caller's thread instead of looper" ↵Chong Zhang2014-08-013-36/+45
| |\ | | | | | | | | | into lmp-dev
| | * MediaCodecSource: stop puller from caller's thread instead of looperChong Zhang2014-08-043-36/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CameraSource/AudioSource's stop() and read() are both called from the puller's looper. This works if source operates normally (i.e. read() returns regularly before source is stopped), as the stop() will eventually be handled by the looper. However, if for some reason the source hang, it will get stuck in read(), and the stop() will never be processed, which could lead to ANR (in addition to the source hang). We need to move the source's stop out of the puller's looper. It also can't be on MediaCodecSource's looper, because the source's stop synchrounously waits for all outstanding buffers to return, these are only returned when MediaCodecSource's looper processes the buffer. This change moves the stop to MediaCodecSource::stop, after encoder is shutdown. Bug: 16522726 Change-Id: Ie91f563c5d8a98ab091bf1945af4e51f662b9403
* | | am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-devJeff Tinker2014-08-045-1/+44
|\ \ \ | |/ / | | | | | | | | | * commit 'b63d63b8afa25694d1973988d7acdfebcd01a18d': Allow device to be unprovisioned
| * | Merge "Allow device to be unprovisioned" into lmp-devJeff Tinker2014-08-015-1/+44
| |\ \ | | |/ | |/|
| | * Allow device to be unprovisionedJeff Tinker2014-08-015-1/+44
| | | | | | | | | | | | | | | bug: 12247651 Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
* | | am 44622db9: audio flinger: fix service fuzz test crashEric Laurent2014-08-041-0/+6
|\ \ \ | |/ / | | | | | | | | | * commit '44622db93a24219123facbbe14259000f90de728': audio flinger: fix service fuzz test crash
| * | audio flinger: fix service fuzz test crashEric Laurent2014-08-041-0/+6
| | | | | | | | | | | | | | | Bug: 13744704. Change-Id: I572c89f88dcab2b8b612ec6860983306f9f159ab
* | | am 678792e3: Merge "audio policy: fix service fuzz test crash" into lmp-devEric Laurent2014-08-031-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit '678792e362c4cd70640934049491d9f21560c63b': audio policy: fix service fuzz test crash
| * | Merge "audio policy: fix service fuzz test crash" into lmp-devEric Laurent2014-08-011-4/+4
| |\ \
| | * | audio policy: fix service fuzz test crashEric Laurent2014-08-011-4/+4
| | | | | | | | | | | | | | | | | | | | Bug: 13744391. Change-Id: I2430e09ad00476b9ac28dc55466942c61fb0531d
* | | | am facd8cf2: Merge "Revert "Revert "sound trigger: added permission ↵Eric Laurent2014-08-022-9/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | checks""" into lmp-dev * commit 'facd8cf2651f7fcf7225e735cae5f5d4ef3a334e': Revert "Revert "sound trigger: added permission checks""
| * | | Merge "Revert "Revert "sound trigger: added permission checks""" into lmp-devEric Laurent2014-08-012-9/+35
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Revert "sound trigger: added permission checks""Eric Laurent2014-08-012-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 936c84a5b743dce2a2572fdf54b37b187bc88b60. Bug: 16374803. Change-Id: I9d3137faeddf119b13f9cdb73c14ca49e1ee3d1c
* | | | am fdefe34f: Merge "Remove 64-bit android_atomic uses from StateQueue." into ↵Hans Boehm2014-08-010-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'fdefe34f40ea6c8964677eaa9107958b0bdf76d0': Remove 64-bit android_atomic uses from StateQueue.
| * | | Merge "Remove 64-bit android_atomic uses from StateQueue." into lmp-devHans Boehm2014-07-312-12/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-312-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use stdatomic.h instead. We're trying to remove android_atomic use wherever possible. The 64-bit uses seem easiest to remove first. This cleans up the code, though not as much as C++ <atomic> would, if it worked everywhere. (cherry picked from commit f39b560952d3706a7ff47ef0d82c1a836daeea42) Change-Id: I3c29bdbd5915cb9d47118834a3a742fe296cf87f
* | | | am 25644c50: Merge "GenericSource: timed text support" into lmp-devLajos Molnar2014-08-012-77/+199
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '25644c502ed8ec13bcf496613e65ec8edb1af4a7': GenericSource: timed text support
| * | | Merge "GenericSource: timed text support" into lmp-devLajos Molnar2014-07-312-77/+199
| |\ \ \ | | |/ / | |/| |
| | * | GenericSource: timed text supportLajos Molnar2014-07-312-77/+199
| | | | | | | | | | | | | | | | | | | | Bug: 16385674 Change-Id: Ib322cc13488dcadf2409921272cd469304b0af37
* | | | am 3c6fac2c: Merge "stagefright: propagate error in ↵Lajos Molnar2014-08-011-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MPEG4Extractor::readMetaData" into lmp-dev * commit '3c6fac2c807e4234953dcdc793029a82d1f3a089': stagefright: propagate error in MPEG4Extractor::readMetaData
| * | | Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into ↵Lajos Molnar2014-07-301-3/+4
| |\ \ \ | | | | | | | | | | | | | | | lmp-dev
| | * | | stagefright: propagate error in MPEG4Extractor::readMetaDataLajos Molnar2014-07-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16641557 Change-Id: I252825bd767a4581b9fca560f2cabfb37c18e137
* | | | | am a2e14302: mediaplayer: add looping support to NuPlayerLajos Molnar2014-08-012-4/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a2e14302d4b5ca5443611d0c05218b9da4cc64a6': mediaplayer: add looping support to NuPlayer
| * | | | mediaplayer: add looping support to NuPlayerLajos Molnar2014-07-312-4/+27
| |/ / / | | | | | | | | | | | | | | | | Bug: 16641557 Change-Id: I433158e6e585b4714cfd6d89562ecd0587a07ae2
* | | | am a2981013: NuPlayer: fix av discontinuity raceRobert Shih2014-08-011-7/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a298101317e5472f6b6a12e6ddeafdc4064bd5b2': NuPlayer: fix av discontinuity race
| * | | NuPlayer: fix av discontinuity raceRobert Shih2014-07-311-7/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assumption: NuPlayer must see both (a/v) discontinuities before resuming. Example issue: Suppose we're changing the video track, so the video source queues a DISCONTINUITY_FORMATCHANGE, and the audio source queues a DISCONTINUITY_NONE. Consider this sequence of events without this change: 1. audio discontinuity seen by player 2. mFlushingAudio = FLUSHED 3. video discontinuity seen by player 4. mFlushingAudio != NONE so no performScanSources is queued 5. video decoding shuts down without being restarted Bug: 15153976 Change-Id: I659550d9c0f883828103142abead857f576f25b1
* | | am 3423bbdb: GenericSource: support track (de)selectionRobert Shih2014-08-014-65/+330
|\ \ \ | |/ / | | | | | | | | | * commit '3423bbdb05f843a64356fa24e8657f03ecbb7d65': GenericSource: support track (de)selection
| * | GenericSource: support track (de)selectionRobert Shih2014-07-314-65/+330
| | | | | | | | | | | | | | | | | | Bug: 15153976 Change-Id: Idfce856b4ca5fa7853da857757490798bc3ffe1e
* | | am 63c0ce7a: mediaplayerservice: initialize mIsWidevineLajos Molnar2014-07-311-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit '63c0ce7ab7bd99d51414dcb4f765bc6faabf367d': mediaplayerservice: initialize mIsWidevine
| * | mediaplayerservice: initialize mIsWidevineLajos Molnar2014-07-311-1/+2
| | | | | | | | | | | | | | | Bug: 16641557 Change-Id: I77aad6e710117a16093726bf3b36360904fbe148
* | | am 1d5b45f7: Merge "stagefright: MediaCodec async operations." into lmp-devLajos Molnar2014-07-312-17/+35
|\ \ \ | |/ / | | | | | | | | | * commit '1d5b45f70f684996acc24fbf3e30fa5af0a0c642': stagefright: MediaCodec async operations.
| * | Merge "stagefright: MediaCodec async operations." into lmp-devLajos Molnar2014-07-302-17/+35
| |\ \
| | * | stagefright: MediaCodec async operations.Lajos Molnar2014-07-302-17/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In async mode: - codec must be restarted after flush - dequeueIn/OutputBuffers fail - getIn/OutputBuffers fail Bug: 11990118 Change-Id: If2d6a76ab499ee9ed4a11486fb537acbc52e66f6
* | | | am 89869f69: stagefright: enable decoder color format selectionLajos Molnar2014-07-312-10/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '89869f692c35d0ca914c7de4a1f5ff63c9920634': stagefright: enable decoder color format selection
| * | | stagefright: enable decoder color format selectionLajos Molnar2014-07-302-10/+23
| |/ / | | | | | | | | | | | | Bug: 10706245 Change-Id: I9a77631bfae0358be229b079228c1fcae0e77faf
* | | am b382340f: Merge "handle rotation in NuPlayer" into lmp-devChong Zhang2014-07-314-2/+52
|\ \ \ | |/ / | | | | | | | | | * commit 'b382340f33ac2dc26fe825ceb3ef98bac8af974c': handle rotation in NuPlayer
| * | Merge "handle rotation in NuPlayer" into lmp-devChong Zhang2014-07-254-2/+52
| |\ \
| | * | handle rotation in NuPlayerChong Zhang2014-07-304-2/+52
| | | | | | | | | | | | | | | | | | | | Bug: 16653284 Change-Id: I54165041da5a13498d627eee1b3ec59ef3c923b0
* | | | am d089a740: Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into ↵Chong Zhang2014-07-313-9/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd089a740e1e61d9503d2c84259bacb3e06c58a0e': ATSParser: treat stream type 0x83 as TrueHD AC3
| * | | Merge "ATSParser: treat stream type 0x83 as TrueHD AC3" into lmp-devChong Zhang2014-07-253-9/+7
| |\ \ \
| | * | | ATSParser: treat stream type 0x83 as TrueHD AC3Chong Zhang2014-07-303-9/+7
| | |/ / | | | | | | | | | | | | | | | | Bug: 16668055 Change-Id: I11fd3f795bbb50113e1a1e28e682edd76f11e146
* | | | am cb48eacb: Revert GenericSource track selection changesWei Jia2014-07-304-452/+65
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cb48eacb6f8857c7857bb28d6a13d4a0d417f2bd': Revert GenericSource track selection changes
| * | | Revert GenericSource track selection changesWei Jia2014-07-304-452/+65
| |/ / | | | | | | | | | | | | | | | | | | | | | This reverts commit bace25b0fbcd5101d2db288b0c70c4a239f0e815. This reverts commit eb1735e343a93830df259ae8882160bb0d79dcb5. This reverts commit 05312bc7478feec11d9ae88e951c0857a7a3f28d. Bug: 16660839
* | | am a6d28be0: Merge "Add Quad channel output to AudioPolicyManager" into lmp-devAndy Hung2014-07-301-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'a6d28be0be0fa813080a021bd6a5920a8cb4fbb1': Add Quad channel output to AudioPolicyManager
| * | Merge "Add Quad channel output to AudioPolicyManager" into lmp-devAndy Hung2014-07-291-0/+1
| |\ \
| | * | Add Quad channel output to AudioPolicyManagerAndy Hung2014-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Matches some USB device configurations. Change-Id: I2429f9de87816b4ad1d39516e3821562617c76ee
* | | | am e1d37b78: audio policy: add missing enums in config file parsingEric Laurent2014-07-301-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e1d37b784f3970e44a7331c189cbfdca15404648': audio policy: add missing enums in config file parsing
| * | | audio policy: add missing enums in config file parsingEric Laurent2014-07-301-0/+1
| | | | | | | | | | | | | | | | Change-Id: I4edd6cde11de62c9c19dfa623d08cddf42c953db
* | | | am 9f2dcf14: Merge "Add isSafeArraySize for new array size checks" into lmp-devAndy Hung2014-07-301-0/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9f2dcf14cb4bb75bd810f6ed8938e4dbbb18c651': Add isSafeArraySize for new array size checks
generated by cgit v1.1 at 2024-09-29 05:34:52 +0000