summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge "NuPlayer: make previous decoders obsolete when reset is done." into ↵Wei Jia2014-09-091-0/+3
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | | | | | | NuPlayer: make previous decoders obsolete when reset is done.Wei Jia2014-09-091-0/+3
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17428608 Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
* | | | | | | | | | am ba8711db: am 47a13d45: Merge "[media][nuplayer] Remove debug message ↵Phil Burk2014-09-101-1/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EWOULDBLOCK" into lmp-dev * commit 'ba8711db379fe243667a0387e2e86a49e17bee68': [media][nuplayer] Remove debug message EWOULDBLOCK
| * | | | | | | | | am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into ↵Phil Burk2014-09-101-1/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '47a13d45ae3f05ddb778124484a17d4754c82b7a': [media][nuplayer] Remove debug message EWOULDBLOCK
| | * | | | | | | | Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-devPhil Burk2014-09-091-1/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [media][nuplayer] Remove debug message EWOULDBLOCKPhil Burk2014-09-091-1/+0
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A debug message that was silent during testing is now spewing messages. It was removed. Bug: 17438882 Change-Id: I9c61409cac77c7bc1fd1088815823207094606f2 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | am cce5397d: am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted ↵Rachad2014-09-091-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHECK(!mPaused) to a warning." into lmp-dev * commit 'cce5397d6896fcc30211c9aa2061d8c7d07d1a19': NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
| * | | | | | | | | am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted ↵Rachad2014-09-091-2/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHECK(!mPaused) to a warning." into lmp-dev * commit '95861b33c7dcfa450f5e10568c0767b07bc50729': NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
| | * | | | | | | | Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a ↵Rachad2014-09-091-2/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | warning." into lmp-dev
| | | * | | | | | | NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.Rachad2014-09-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17436451 Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
* | | | | | | | | | am 95821a0f: am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames ↵Marco Nelissen2014-09-092-128/+194
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per input buffer" into lmp-dev * commit '95821a0f83afc7ca1680de2eb3e9aa903d2ed9ba': Fix AAC timestamps for multiple aac frames per input buffer
| * | | | | | | | | am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames per input ↵Marco Nelissen2014-09-092-128/+194
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer" into lmp-dev * commit '8270e1d13a101fa946848871b9903b31ff11981f': Fix AAC timestamps for multiple aac frames per input buffer
| | * | | | | | | | Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-devMarco Nelissen2014-09-092-128/+194
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix AAC timestamps for multiple aac frames per input bufferMarco Nelissen2014-09-072-128/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support multiple aac frames per input buffer also for non-ADTS streams. Bug: 16715379 Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
* | | | | | | | | | | am 807ec0cb: am 2adbeda4: Merge "NuPlayer: check mSource before deferencing ↵Wei Jia2014-09-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it." into lmp-dev * commit '807ec0cb8cf4c6bd1ce4a48e3643db78ccf81534': NuPlayer: check mSource before deferencing it.
| * | | | | | | | | | am 2adbeda4: Merge "NuPlayer: check mSource before deferencing it." into lmp-devWei Jia2014-09-091-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2adbeda4f46f88ddb17519d39cc13e183741e071': NuPlayer: check mSource before deferencing it.
| | * | | | | | | | | Merge "NuPlayer: check mSource before deferencing it." into lmp-devWei Jia2014-09-091-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | NuPlayer: check mSource before deferencing it.Wei Jia2014-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17428608 Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
* | | | | | | | | | | stagefright: generic RenderScripts in MediaFilterDavid Smith2014-09-094-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for generic RenderScript filters to MediaFilter via RSFilter, which calls an RSFilterCallback object to process buffers. Bug: 17203044 Change-Id: Iadb7700c424d225fb5e98a5359cbca070c6e4283
* | | | | | | | | | | Merge "stagefright: SimpleFilter config params via msg"David Smith2014-09-098-20/+76
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stagefright: SimpleFilter config params via msgDavid Smith2014-09-058-20/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17203044 Change-Id: I659da31bddb51dd0e5246827c57234364a4c479b
* | | | | | | | | | | | am 7976568a: am 1a9ac031: Merge "[audio][nuplayer] Aggregate buffers to ↵Phil Burk2014-09-082-4/+94
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce power." into lmp-dev * commit '7976568a93fdb618d877086c7b8c4efc52ad34ff': [audio][nuplayer] Aggregate buffers to reduce power.
| * | | | | | | | | | | am 1a9ac031: Merge "[audio][nuplayer] Aggregate buffers to reduce power." ↵Phil Burk2014-09-082-4/+94
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '1a9ac031e9de8b3be1ec2c8d6d00f92bd3d59ea8': [audio][nuplayer] Aggregate buffers to reduce power.
| | * | | | | | | | | | Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-devPhil Burk2014-09-082-4/+94
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | [audio][nuplayer] Aggregate buffers to reduce power.Phil Burk2014-09-082-4/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine audio data from multiple buffers into one. This reduces churn between threads and saves battery power. Only use buffer aggregation when offloading the decoder. Pend buffer if it won't fit in the bigger buffer. Bug: 15094301 Change-Id: Iad3dac90b5d6b0fa43432b0e6776652ee2eafaa1 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | am 04a8e67f: am d3a5ff9a: Merge "Fix potential deadlock between ↵Andy Hung2014-09-081-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPolicyService and AudioSystem" into lmp-dev * commit '04a8e67f8f9aa0f6c4cd3de50789aea20d35441d': Fix potential deadlock between AudioPolicyService and AudioSystem
| * | | | | | | | | | | am d3a5ff9a: Merge "Fix potential deadlock between AudioPolicyService and ↵Andy Hung2014-09-081-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSystem" into lmp-dev * commit 'd3a5ff9afff08b3be1b2853868c0f28eefc36f19': Fix potential deadlock between AudioPolicyService and AudioSystem
| | * | | | | | | | | | Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" ↵Andy Hung2014-09-081-1/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | | | | | | | Fix potential deadlock between AudioPolicyService and AudioSystemAndy Hung2014-09-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17109761 Change-Id: I315c1c5066f62b05e1c13b04fae1272b5fbce977
* | | | | | | | | | | | | am e2b2e5fb: am 43cbe059: Merge "NuPlayerDriver: put player in paused state ↵Wei Jia2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when reaching EOS." into lmp-dev * commit 'e2b2e5fb735a2cdd93e44982539470fbec2ab36b': NuPlayerDriver: put player in paused state when reaching EOS.
| * | | | | | | | | | | | am 43cbe059: Merge "NuPlayerDriver: put player in paused state when reaching ↵Wei Jia2014-09-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EOS." into lmp-dev * commit '43cbe059b21185855465063d3767c2364f446f44': NuPlayerDriver: put player in paused state when reaching EOS.
| | * | | | | | | | | | | Merge "NuPlayerDriver: put player in paused state when reaching EOS." into ↵Wei Jia2014-09-081-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | | | | | | | | NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17352759 Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6
* | | | | | | | | | | | | am b12d6a17: am 62ce2072: Merge "Make IPowerManager native conform to .aidl ↵Glenn Kasten2014-09-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for oneway" into lmp-dev * commit 'b12d6a17d33141789c974e3bd3eacfcb0be1c1e3': Make IPowerManager native conform to .aidl for oneway
| * | | | | | | | | | | | am 62ce2072: Merge "Make IPowerManager native conform to .aidl for oneway" ↵Glenn Kasten2014-09-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '62ce207291353a13dd722855102e99684259a517': Make IPowerManager native conform to .aidl for oneway
| | * | | | | | | | | | | Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-081-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But provide a temporary escape hatch for AudioFlinger. This oneway option will be removed as soon as possible. Bug: 16408906 Change-Id: I058a50906af810787e444a96819cb781b7f639ad
* | | | | | | | | | | | | am 03e09ef5: am 835ae86b: Merge "Revert "Revert "disable AwesomePlayer for ↵Andy Hung2014-09-082-12/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ogg vorbis""" into lmp-dev * commit '03e09ef566cefa5626a4873f0a39e2b433062171': Revert "Revert "disable AwesomePlayer for Ogg vorbis""
| * | | | | | | | | | | | am 835ae86b: Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" ↵Andy Hung2014-09-082-12/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '835ae86b49da5e15a501cb12c25458f8b63e38be': Revert "Revert "disable AwesomePlayer for Ogg vorbis""
| | * | | | | | | | | | | Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-devAndy Hung2014-09-082-12/+14
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Revert "Revert "disable AwesomePlayer for Ogg vorbis""Andy Hung2014-09-032-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit da65048e8e6f65ed9b3f23cda3f4554025c76fc4. Deadlock audio issues for NuPlayer have been resolved. Change-Id: I1853d367dc771a9396a9b2d48ff34e50c78c112c
| * | | | | | | | | | | | | am ea477eff: Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; ↵Robert Shih2014-09-061-3/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workaround malformed csd" into lmp-dev * commit 'ea477effb909089401f6d1ec40fd495757d75021': DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd
| | * | | | | | | | | | | | Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround ↵Robert Shih2014-09-061-3/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | malformed csd" into lmp-dev
| | | * | | | | | | | | | | | DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csdRobert Shih2014-09-061-3/+23
| | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14895152 Change-Id: Ibfee9e176459099507589c26a5eca6c61caabd1c (cherry picked from commit bc413f6ad0023f7ad451a0129a07fc31dbc65665)
* | | | | | | | | | | | | | am f14ae397: am 2adb3f32: Merge "Cache audio attributes when player not ↵Jean-Michel Trivi2014-09-061-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available" into lmp-dev * commit 'f14ae397f726db7139e395753d88b40c1bb1f083': Cache audio attributes when player not available
| * | | | | | | | | | | | | am 2adb3f32: Merge "Cache audio attributes when player not available" into ↵Jean-Michel Trivi2014-09-051-2/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '2adb3f32d152c567a3538a709c47d9bd6cf05bc4': Cache audio attributes when player not available
| | * | | | | | | | | | | | Merge "Cache audio attributes when player not available" into lmp-devJean-Michel Trivi2014-09-051-2/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the audio attributes stored in a Parcel in the client-side MediaPlayer object if they are set through setParameter() before the server-side MediaPlayer is available. Apply them when the player is prepared. Bug 17280746 Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03
* | | | | | | | | | | | | | am 26fc3c10: am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 ↵Lajos Molnar2014-09-052-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 1" into lmp-dev * commit '26fc3c1038fad86179387f9ec81f151eb0a4dcb9': stagefright: allow P-frames spacing of 0 and 1
| * | | | | | | | | | | | | am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52c6a355503dbbe9bb134af07faee982534031dd': stagefright: allow P-frames spacing of 0 and 1
generated by cgit v1.1 at 2024-06-09 01:17:55 +0000