summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 23718a84: am 34febc96: stagefright: process CSD regardless of what port ↵Lajos Molnar2014-08-251-3/+2
|\ | | | | | | | | | | | | was last queued * commit '23718a84fb2f9932b484dabb748c761c37af3742': stagefright: process CSD regardless of what port was last queued
| * am 34febc96: stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
| |\ | | | | | | | | | | | | * commit '34febc9654ba3b447239b7761ce4c93ca9a20b5f': stagefright: process CSD regardless of what port was last queued
| | * stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | CSD is always on the input port, so it does not matter which port a buffer was last queued to. Bug: 17216852 Change-Id: I6d00eb4bf3c2e9b9cc3c9918229de958bc465693
* | | am 211aae92: am 848726d8: Merge "MediaCodec: handle errors during flushing." ↵Wei Jia2014-08-251-6/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-dev * commit '211aae92d3f48a56f266a2b933d6f53b625098b0': MediaCodec: handle errors during flushing.
| * | am 848726d8: Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
| |\ \ | | |/ | | | | | | | | | * commit '848726d845b51da04364bdaf4ec915c85d593c0e': MediaCodec: handle errors during flushing.
| | * Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
| | |\
| | | * MediaCodec: handle errors during flushing.Wei Jia2014-08-221-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 17068327 Bug: 13133027 Change-Id: I06caf79b90ebf55d6d7561cb82516c0b6c66f0e4
* | | | am 008cee91: am 052efa49: Merge "wait for flush to finish before returning ↵Chong Zhang2014-08-253-0/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setSurface" into lmp-dev * commit '008cee913577839d2377ff79bf4f26655c3a2c7d': wait for flush to finish before returning setSurface
| * | | am 052efa49: Merge "wait for flush to finish before returning setSurface" ↵Chong Zhang2014-08-233-0/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '052efa490b595d17d1452ec019979996fe470a05': wait for flush to finish before returning setSurface
| | * | Merge "wait for flush to finish before returning setSurface" into lmp-devChong Zhang2014-08-233-0/+29
| | |\ \
| | | * | wait for flush to finish before returning setSurfaceChong Zhang2014-08-223-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17187598 Change-Id: I091219e57158a4532044ca49342b57277d6ecb15
* | | | | Merge "stagefright: SoftwareRenderer support ARGB, RGB888"David Smith2014-08-231-28/+67
|\ \ \ \ \
| * | | | | stagefright: SoftwareRenderer support ARGB, RGB888David Smith2014-08-221-28/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17203044 Change-Id: Id56688bb4f63dd701e4c621ef6c2bec725e6304d
* | | | | | stagefright: MediaFilter and SimpleFilter(s)David Smith2014-08-2215-2/+1363
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaFilter implements CodecBase and provides video filtering support via filter modules which extend SimpleFilter. Bug: 17203044 Change-Id: Ifb30c501e2901c44999d95d7d150e863b2bd06c6
* | | | | am 44945f04: am 43febe72: Merge "add buffering update to GenericSource" into ↵Chong Zhang2014-08-224-6/+112
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '44945f04a5f6bbbb79447446a9d12d37d474ab6f': add buffering update to GenericSource
| * | | | am 43febe72: Merge "add buffering update to GenericSource" into lmp-devChong Zhang2014-08-224-6/+112
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '43febe72dadc751acff410842e091d4099919fad': add buffering update to GenericSource
| | * | | Merge "add buffering update to GenericSource" into lmp-devChong Zhang2014-08-224-6/+112
| | |\ \ \ | | | |/ / | | |/| |
| | | * | add buffering update to GenericSourceChong Zhang2014-08-224-6/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17182378 Change-Id: Ib86f3f522d7ea635489edd2b512adb7f4b27e381
* | | | | am c3c107ca: am d1de9bb3: Merge "ACodec: handle errors related to native ↵Wei Jia2014-08-222-6/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | window." into lmp-dev * commit 'c3c107cae90e635e4d0928133d513c12f4dbe79d': ACodec: handle errors related to native window.
| * | | | am d1de9bb3: Merge "ACodec: handle errors related to native window." into ↵Wei Jia2014-08-222-6/+13
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd1de9bb33a2f645fb9dc54e7fc69ca45304850a5': ACodec: handle errors related to native window.
| | * | | Merge "ACodec: handle errors related to native window." into lmp-devWei Jia2014-08-222-6/+13
| | |\ \ \
| | | * | | ACodec: handle errors related to native window.Wei Jia2014-08-222-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17068327 Bug: 13133027 Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
* | | | | | am 3672da6f: am 7992a5d0: Merge "NuPlayerDriver: fix current position for ↵Wei Jia2014-08-222-17/+44
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop and pause." into lmp-dev * commit '3672da6f03db75f7d7c86dd1e994e7758ba82670': NuPlayerDriver: fix current position for stop and pause.
| * | | | | am 7992a5d0: Merge "NuPlayerDriver: fix current position for stop and ↵Wei Jia2014-08-222-17/+44
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pause." into lmp-dev * commit '7992a5d0f6d995d46bf649dbac45e0e8267f1397': NuPlayerDriver: fix current position for stop and pause.
| | * | | | Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-devWei Jia2014-08-222-17/+44
| | |\ \ \ \
| | | * | | | NuPlayerDriver: fix current position for stop and pause.Wei Jia2014-08-222-17/+44
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When start() is called after EOS, it means restarting from the beginning of the stream. Fix racing conditon on accessing some members. Report seekTo position before any notifyPosition is called. Bug: 17031731 Bug: 17178928 Change-Id: I008b827288cf28d39e2a943373fe1e5d7d6c2595
* | | | | | am e6198959: am b534f461: Merge "move cache prefill to GenericSource\'s ↵Chong Zhang2014-08-223-98/+142
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message handler" into lmp-dev * commit 'e61989593b2afec539f7d699e5b4c0bfdbca27d8': move cache prefill to GenericSource's message handler
| * | | | | am b534f461: Merge "move cache prefill to GenericSource\'s message handler" ↵Chong Zhang2014-08-223-98/+142
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'b534f461f6056c84c3ae87e27430f4b934fd3eb1': move cache prefill to GenericSource's message handler
| | * | | | Merge "move cache prefill to GenericSource's message handler" into lmp-devChong Zhang2014-08-223-98/+142
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | move cache prefill to GenericSource's message handlerChong Zhang2014-08-213-98/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows prepareAsync to be terminated by reset promptly. It also makes it easier to do buffer update as GenericSource can access the cache status now. Bug: 16892748 Bug: 17182378 Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
* | | | | | am 687ee2d4: am 89c4ab2f: Merge "print warning if offset != buffer size" ↵Chong Zhang2014-08-221-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '687ee2d4e0fcddc4af0b6ad1096ea330c23a85c4': print warning if offset != buffer size
| * | | | | am 89c4ab2f: Merge "print warning if offset != buffer size" into lmp-devChong Zhang2014-08-221-0/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '89c4ab2f4e4fbccf5c67e2671cf252053dbe5d38': print warning if offset != buffer size
| | * | | | Merge "print warning if offset != buffer size" into lmp-devChong Zhang2014-08-221-0/+5
| | |\ \ \ \
| | | * | | | print warning if offset != buffer sizeChong Zhang2014-08-191-0/+5
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Bug: 17110981 Change-Id: Iacceca203372f4c06ff5ef7ce98edd5554727b64
* | | | | | am af385b13: am 5f42113f: stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'af385b13bd2db112cb4502b401e60559939de23c': stagefright: allow to resubmit CSDs for SoftAAC2
| * | | | | am 5f42113f: stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5f42113f21c31802e044f0a73351eef35e32feaf': stagefright: allow to resubmit CSDs for SoftAAC2
| | * | | | stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17118001 Change-Id: I45469b9aa6146edf3265b0f05f5ce3592b5daca6
* | | | | | am e2f34c14: am 143a951f: SoftAAC2: allow reconfiguring output after ↵Robert Shih2014-08-221-10/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple output buffers * commit 'e2f34c14d15fc59a8ad60ea16782862592ff28cb': SoftAAC2: allow reconfiguring output after multiple output buffers
| * | | | | am 143a951f: SoftAAC2: allow reconfiguring output after multiple output buffersRobert Shih2014-08-221-10/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '143a951f1f19161fa12ca97f3dee85094078365a': SoftAAC2: allow reconfiguring output after multiple output buffers
| | * | | | SoftAAC2: allow reconfiguring output after multiple output buffersRobert Shih2014-08-221-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17134697 Change-Id: Iaa8bdccbf1a8ccd3f898e48cfd22a0a443710fdd
* | | | | | am 19d99c52: am ef8ae4cb: Merge "Fix SoundPool and MediaPlayerService buffer ↵Andy Hung2014-08-223-13/+57
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow" into lmp-dev * commit '19d99c521fb810aff292d9e40aa5caa415624986': Fix SoundPool and MediaPlayerService buffer overflow
| * | | | | am ef8ae4cb: Merge "Fix SoundPool and MediaPlayerService buffer overflow" ↵Andy Hung2014-08-223-13/+57
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'ef8ae4cbec0c9f49a24625d4316ec9bfde4e75c3': Fix SoundPool and MediaPlayerService buffer overflow
| | * | | | Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-devAndy Hung2014-08-223-13/+57
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix SoundPool and MediaPlayerService buffer overflowAndy Hung2014-08-213-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overflow occurs when SoundPool sample tracks cannot fit in the MediaPlayerService AudioCache buffer. Unnecessary decoding occurred with AwesomePlayer and an assert failure occurred with NuPlayer. NuPlayerRenderer is also tweaked to handle the latter case. Bug: 17122639 Change-Id: I4d25d3e2c0c62e36a91da6bf969edabddc2ebbb0
* | | | | | am 5bf363ae: am 01047680: Merge "NuPlayerDriver: include lapsed time when ↵Wei Jia2014-08-212-1/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting current position." into lmp-dev * commit '5bf363ae3c4782ed5ad0bdb8a0b41a8ad23ac210': NuPlayerDriver: include lapsed time when reporting current position.
| * | | | | am 01047680: Merge "NuPlayerDriver: include lapsed time when reporting ↵Wei Jia2014-08-212-1/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current position." into lmp-dev * commit '01047680ac57712303e259f485efd9cb97e9a99a': NuPlayerDriver: include lapsed time when reporting current position.
| | * | | | Merge "NuPlayerDriver: include lapsed time when reporting current position." ↵Wei Jia2014-08-212-1/+12
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | NuPlayerDriver: include lapsed time when reporting current position.Wei Jia2014-08-202-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17031731 Change-Id: I01962ee9194bdaa9e8ed1a51abbf365733be3c85
* | | | | | | am 5218daea: am c10b4689: Merge "disable AwesomePlayer for Ogg vorbis" into ↵Chong Zhang2014-08-212-12/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '5218daeaccff146bd6c40c6b8b7dd37c527e9168': disable AwesomePlayer for Ogg vorbis use dedicated looper for GenericSource Camera API1: Ignore the video size change during recording
| * | | | | | am c10b4689: Merge "disable AwesomePlayer for Ogg vorbis" into lmp-devChong Zhang2014-08-212-12/+14
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c10b4689be0d3a0f4ff38c544a6c86c984665d26': disable AwesomePlayer for Ogg vorbis use dedicated looper for GenericSource Camera API1: Ignore the video size change during recording