summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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
* | 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
* | | 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
* | | Merge "audio policy: fix output stream selection" into lmp-devEric Laurent2014-09-092-6/+27
|\ \ \
| * | | audio policy: fix output stream selectionEric Laurent2014-09-082-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that all outputs considered by selectOutput() when called from AudioPolicyManager::getOutputForDevice() support the requested audio format. Bug: 17340382. Change-Id: I76520ce60e9a8fe4d2d23125d6143bb016522754
* | | | 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>
* | | | | 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
* | | | | Merge "Camera2: reconfigure video snapshot size if needed" into lmp-devYin-Chia Yeh2014-09-085-4/+93
|\ \ \ \ \
| * | | | | Camera2: reconfigure video snapshot size if neededYin-Chia Yeh2014-09-085-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recording fails to start due to stream configuration failed, try configure stream again by setting jpeg stream to video size. Bug: 16162133 Change-Id: Ib20271e787ae07719ce419f0b15c7f86434f7ebb
* | | | | | 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
* | | | | | Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-082-6/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-052-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But provide a temporary escape hatch for AudioFlinger. This oneway option will be removed as soon as possible. Bug: 16408906 Change-Id: I058a50906af810787e444a96819cb781b7f639ad
* | | | | | Merge "audiopolicy: fix direct output profile probing" into lmp-devEric Laurent2014-09-081-7/+39
|\ \ \ \ \ \
| * | | | | | audiopolicy: fix direct output profile probingEric Laurent2014-09-071-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not select maximum sampling rate and channel count when opening a direct output for the first time to make sure that the combination of sampling rate and channel count is supported by the connected sink. Bug: 17047809. Change-Id: I077a3c1436158378f2762343469ceb39fab9775e
* | | | | | | 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
* | | | | | | | Merge "Fix "invalid device combination" in system audio mode." into lmp-devJungshik Jang2014-09-061-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix "invalid device combination" in system audio mode.Jungshik Jang2014-09-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDMI-CEC system audio mode removes speaker from output list. It also has multiple outputs by connected outputs. However, getDeviceForVolume() doesn't cover multiple output with no speaker or bluetooth case. This change picks one of system audio outputs in order. Bug: 17400026 Change-Id: I102fd0052c9c4c9543f9e8f3b16ec6815d7485d8
* | | | | | | | | 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)
* | | | | | | | Merge "Cache audio attributes when player not available" into lmp-devJean-Michel Trivi2014-09-052-2/+20
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-052-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | stagefright: allow P-frames spacing of 0 and 1Lajos Molnar2014-09-042-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17387418 Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848
* | | | | | | | | Merge "GenericSource: refactor track selection for dedicated looper" into ↵Robert Shih2014-09-052-16/+189
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | GenericSource: refactor track selection for dedicated looperRobert Shih2014-09-032-16/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move getFormatMeta, getSelectedTrack, selectTrack, and seekTo to dedicated looper - start & dequeueAccessUnit posts readBuffer requests instead of reading directly - call internal doGetFormatMeta in onPrepareAsync Bug: 16892748 Change-Id: I5d5e34381f1dfceca655c52a201627b53454ad22
* | | | | | | | | Merge "Camera API1: fix AE state check in precapture state" into lmp-devZhijun He2014-09-051-5/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera API1: fix AE state check in precapture stateZhijun He2014-09-031-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is legal to transit to CONVERGED or FLASH_REQUIRED after a AE precapture trigger. Bug: 17365185 Change-Id: Id041eff5eac564c32d09b547a0139d24807336f4
* | | | | | | | | | Merge "NuPlayer: Restrict seek on video texture changes" into lmp-devAndy Hung2014-09-051-1/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | NuPlayer: Restrict seek on video texture changesAndy Hung2014-09-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer::setVideoSurfaceTexture() should generate seek to refresh display only if player is started and has video. Bug: 17379148 Bug: 17404923 Change-Id: I5f55dc40943e4419d08be6fdab964b8a2c5ee519
* | | | | | | | | | Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-devAndy Hung2014-09-052-1/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | NuPlayer: Discard seeks when source and decoders are NULLAndy Hung2014-09-042-1/+9
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occurs when loop mode asynchronously seeks to the start of the source after a MediaPlayer::reset(). Bug: 17379148 Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae
* | | | | | | | | Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-devChong Zhang2014-09-053-67/+134
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Split CEA-608 Closed caption into 4 tracks CC1~CC4Chong Zhang2014-09-033-67/+134
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16463078 Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb
* | | | | | | | Merge "audio policy service: filter out delayed audio patch commands if ↵Eric Laurent2014-09-051-1/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | needed." into lmp-dev
| * | | | | | | | audio policy service: filter out delayed audio patch commands if needed.Eric Laurent2014-09-051-1/+35
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As for set parameters commands, create or release audio patch commands modifying the same patch handle should be filtered by the audio policy service command thread so that an immediate command is not overridden by a pending delayed command. Bug: 17379728. Change-Id: I6aa4652b4bfec59eebd3c3cb7d1d9ac1bc1d6e49
* | | | | | | | Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-devEric Laurent2014-09-051-0/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix to parse audio_source_t member of audio_attributes_tHyejin Kim2014-09-051-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When unmarshalling audio_attributes_t typed data, it didn't parse the audio_source_t member between content_type and flags. Bug: 16906307 Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
* | | | | | | Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into ↵Robert Shih2014-09-041-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | lmp-dev
| * | | | | | PlaylistFetcher: do not reset mStartTimeUs if we are resumingRobert Shih2014-09-031-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 17376049 Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6
* | | | | | Merge "Fix the bug that same video frame has been decoded twice during port ↵hkuang2014-09-032-32/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | reconfig." into lmp-dev
| * | | | | | Fix the bug that same video frame has been decoded twice during port reconfig.hkuang2014-09-032-32/+38
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not hurt normal video playback. But in adaptive playback, this will lead to a little bit delay for some clips. Bug: 17202935 Change-Id: I5af0a5911e28a1597c74d79960fac25faf72c9d2
generated by cgit v1.1 at 2025-08-05 07:46:00 +0000