summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* MediaPlayerService: allow next player to be NULLWei Jia2016-08-301-1/+1
| | | | | | | Bug: 31155917 Bug: 30204103 Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c (cherry picked from commit 282841278723166e74039329ca56e444ad472daf)
* MediaPlayerService: avoid invalid static castRobert Shih2016-08-252-0/+11
| | | | | | Bug: 30204103 Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028 (cherry picked from commit ee0a0e39acdcf8f97e0d6945c31ff36a06a36e9d)
* Add bound checks to utf16_to_utf8Sergio Giro2016-07-211-1/+2
| | | | | | Bug: 29250543 Change-Id: I3518416e89ed901021970958fb6005fd69129f7c (cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)
* Resolve a merge issue between lmp and lmp-mr1+Dave Weinstein2016-06-141-1/+1
| | | | | | Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503 (cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0) (cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)
* MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as ↵Wei Jia2016-05-271-14/+20
| | | | | | | | | | | | | | | track. GenericSource: return error when no track exists. SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor. Bug: 21657957 Bug: 23705695 Bug: 22802344 Bug: 28799341 Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04 (cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)
* Clear unused pointer field when sending across binderMarco Nelissen2016-05-271-0/+1
| | | | | Bug: 28377502 Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
* NuPlayerStreamListener: NULL and bounds check before memcpyRobert Shih2016-03-251-1/+10
| | | | | Bug: 27533704 Change-Id: I992a7709b92b1cbc3114c97bec48a3fc5b22ba6e
* GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
| | | | | Bug: 25070434 Change-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484
* GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-191-0/+1
| | | | | Bug: 25070434 Change-Id: Iade3472c496ac42456e42db35e402f7b66416f5b
* NuPlayerDecoder: report error in case of audio sink open error.Eric Laurent2015-10-141-1/+4
| | | | | | Bug: 21093153. Change-Id: I77e03a620b43967991dcee9d6ca01f67c8b7a02e (cherry picked from commit 15ce09dddf830d6a6ca097c5ec0a7ec7c35b6b3a)
* NuPlayerRenderer: do not send rendering started message when pausedAndy Hung2015-10-132-1/+11
| | | | | | | Delay until resume. Bug: 23669269 Change-Id: I0a805812d80b1aad561425442bca0fc05a05752f
* Merge "Don't send OnCompletion events when looping" into mnc-dr-devMarco Nelissen2015-10-131-1/+2
|\
| * Don't send OnCompletion events when loopingMarco Nelissen2015-10-131-1/+2
| | | | | | | | | | | | | | AwesomePlayer never did, and neither should NuPlayer. Bug: 18656047 Change-Id: Ia9abe42cfe6ea643633cec859e9da770092569bb
* | NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.Wei Jia2015-10-131-0/+6
| | | | | | | | | | | | Bug: 24749881 Change-Id: I0d3a757262446ac702dfebd464d5e59f1a98eba8 (cherry picked from commit 3261f0db54e31e652af9bd3b76a8e85174f5ee87)
* | Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-devWei Jia2015-10-131-1/+1
|\ \
| * | NuPlayerDriver: acquire mLock when needed.Wei Jia2015-10-131-1/+1
| |/ | | | | | | | | | | Bug: 24338126 Change-Id: Ic55d1a551c18255423423079b6c2bf045dea6e44 (cherry picked from commit f3631d2921ee0738f87427848e38873370ef9ec0)
* | NuPlayerRenderer: always update MediaClock with max media duration.Wei Jia2015-10-131-9/+7
|/ | | | | | Bug: 24345295 Change-Id: I868c9c44ea22de98a083432262e485d0f134203f (cherry picked from commit d005c5ddb4842369979df7b76f1d0f5f1380fcd9)
* Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-devAndy Hung2015-09-151-0/+5
|\
| * NuPlayerRenderer: Do not drain audio during teardownAndy Hung2015-09-111-0/+5
| | | | | | | | | | Bug: 23748678 Change-Id: I8b65786f25f4524e5e2e9476ecc2a4f4ab3aea9e
* | Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into ↵Andy Hung2015-09-142-1/+19
|\ \ | |/ |/| | | mnc-dr-dev
| * NuPlayerRenderer: Do not deliver audio too soon after stopAndy Hung2015-09-012-1/+19
| | | | | | | | | | | | | | | | | | | | For non-offloaded audio, do not deliver audio data too soon after stop when in paused mode. Otherwise the audio MixerThread will keep the track playing, instead of inactivating the track. Bug: 23167401 Change-Id: If376148c742fde2d20dc5d23bf0b894fe378e71a (cherry picked from commit b03dcb34cd44d77e5fe1559e72323e03c59931db)
* | am b946648c: Protect data source access with mutex during disconnectRobert Shih2015-09-092-8/+24
|\ \ | | | | | | | | | | | | * commit 'b946648cc63a4d328318b56215214ead575bc54a': Protect data source access with mutex during disconnect
| * | Protect data source access with mutex during disconnectRobert Shih2015-09-082-8/+24
| | | | | | | | | | | | | | | Bug: 23658148 Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
* | | NuPlayerRenderer: avoid divison by zero when sample rate is 0.Wei Jia2015-09-031-0/+5
| | | | | | | | | | | | | | | | | | | | | Also close AudioSink when failing to set playback rate. Bug: 23624664 Change-Id: I5bf8bcca4a21c26fb52821db597d61f7f1273d5c
* | | nuplayer: let non-offload AudioSink to handle the reconnect when there's video.Ronghua Wu2015-09-021-1/+9
| |/ |/| | | | | | | Bug: 23707144 Change-Id: Ie0e2db8dc91a78f82fb935d165aa11abe73697a3
* | am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is ↵Wei Jia2015-08-281-1/+3
|\ \ | |/ | | | | | | | | | | still in shutdown process." into mnc-dev * commit '5d76e54d2f3b02b52be035e37681fde0caf15eaa': NuPlayer: do not create audio decoder if the player is still in shutdown process.
| * NuPlayer: do not create audio decoder if the player is still in shutdown ↵Wei Jia2015-08-271-1/+3
| | | | | | | | | | | | | | process. Bug: 23350795 Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b
* | AudioSink: Fix for gapless offload playbackPreetam Singh Ranawat2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gapless mode is not working for offload playback due to mismatch in flags of current track and next track to be played. AUDIO_OUTPUT_FLAG_DIRECT is added in AudioTrack flags for current track which does not match exactly with requested flags for next track. Because of this mismatch, reuse of the AudioTrack is not allowed. To fix this, update audio sink flags with requested flags and use track flags only to setPlaybackRate if AUDIO_OUTPUT_FLAG_DIRECT flag is not set. Bug: 23221273 authored-by: Preetam Singh Ranawat <apranawat@codeaurora.org> Change-Id: I52761ccd854b66a7bc218e83c9b44598771c46f7
* | am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an ↵Eric Laurent2015-08-181-1/+4
|\ \ | |/ | | | | | | | | | | offloaded track" into mnc-dev * commit 'c08872f977fc52c015cc17438dd3bd7981dfc0dc': NuPlayerRenderer: handle error when resuming an offloaded track
| * NuPlayerRenderer: handle error when resuming an offloaded trackEric Laurent2015-08-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | Make sure that an offloaded audio track is torn down if start() returns an error in onResume(). This makes sure that a track invalidated due to a potential audio path change while paused is re created on the correct output. Bug: 22256441. Change-Id: I6c7bfec6e7322415daffc0451bab46d0c558522a
* | Merge "RTSPSource::pause mHandler NULL check" into mnc-dr-devRobert Shih2015-08-141-1/+3
|\ \ | |/ |/|
| * RTSPSource::pause mHandler NULL checkRobert Shih2015-08-131-1/+3
| | | | | | | | | | Bug: 23151568 Change-Id: I2dba3e7388b1b84b8b762dbc82c8e5330a158d97
* | NuPlayer: set video surface directly when NuPlayer has not started yet.Wei Jia2015-08-101-2/+5
|/ | | | | Bug: 22119956 Change-Id: Ie174f4fc495ab8418993ff7887aaa6ae721c6008
* Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-devRobert Shih2015-08-053-5/+10
|\
| * NuPlayer:seek handling on kWhatAudioTearDownRobert Shih2015-08-053-5/+10
| | | | | | | | | | | | | | | | Restart from previous seek time on kWhatAudioTearDown if mRenderer didn't supply a useful positionUs. Bug: 22662968 Change-Id: Ic21957f676ba25fb92694f71093bed60b630390b
* | stagefright: disable automatic experimentsLajos Molnar2015-07-291-1/+6
|/ | | | | | | allow manually-enabled experiments only in eng and userdebug builds Bug: 20894667 Change-Id: Ie6c93e9482a84ed3aaf6aa0abd909f14cfea4e9b
* Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable ↵Robert Shih2015-07-252-2/+10
|\ | | | | | | offload audio" into mnc-dev
| * NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audioRobert Shih2015-07-242-2/+10
| | | | | | | | | | Bug: 22662910 Change-Id: I8fb4a9fce801295a4b251e27965aef048d217da6
* | MediaPlayerService: prevent audio_attributes_t race conditionsJean-Michel Trivi2015-07-232-5/+22
|/ | | | | | | | | | | | Access to audio attributes fields in Client and AudioOutput was not always locked. Audio attributes field in AudioOutput cannot share the same pointer as Client because it can be indepently accessed. Save the attributes inside AudioOutput instead. Bug 22672670 Change-Id: Ib1002b57b45cea44ff5e6eb115d581dc3beec006
* libmediaplayerservice: propagate caller pid to MediaCodec.Ronghua Wu2015-07-219-18/+27
| | | | | Bug: 22630317 Change-Id: I0337d74f4ef04bf96f2de83f33d98d0d7da47c12
* Merge "MediaRecorder: enable audio for slow motion recording" into mnc-devChong Zhang2015-07-172-40/+59
|\
| * MediaRecorder: enable audio for slow motion recordingChong Zhang2015-07-172-40/+59
| | | | | | | | | | | | bug:22460747 Change-Id: I23f773ecf7b86928a8eacd25a481636e645affbe
* | Merge "RTSP: clear data/eos status before returning from seek" into mnc-devRobert Shih2015-07-172-3/+54
|\ \
| * | RTSP: clear data/eos status before returning from seekRobert Shih2015-07-162-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original RTSP seek implementation involves pausing and restarting a session. This change clears data/eos status after an rtsp session is paused for a seek, and delays the seek to return after data/eos status are cleared. Bug: 22207372 Change-Id: I1bdf65653f90436f7ee5d7fe85eeadc1598a0d56
* | | stagefright: MediaSync: use VideoFrameSchedulerLajos Molnar2015-07-164-584/+1
| |/ |/| | | | | | | | | | | Move VideoFrameScheduler to libstagefright as part of this change. Bug: 22234976 Change-Id: Ib23fb52399cb700a1dcf789e8486b94a3edf9d95
* | Merge "mediaplayer: fix audio attributes override by stream type" into mnc-devEric Laurent2015-07-162-2/+17
|\ \
| * | mediaplayer: fix audio attributes override by stream typeEric Laurent2015-07-152-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that when audio attributes are set, the stream type is always derived from them. Bug: 22481669. Change-Id: Ia10c7017eb27e7753faf97a42dd4f44e15f2c986
* | | Merge "NuPlayer: fix handling of teardown event during flushing or shutting ↵Wei Jia2015-07-151-4/+24
|\ \ \ | | | | | | | | | | | | down." into mnc-dev
| * | | NuPlayer: fix handling of teardown event during flushing or shutting down.Wei Jia2015-07-151-4/+24
| | | | | | | | | | | | | | | | | | | | Bug: 22481669 Change-Id: I9114c16c081fd7907508e9c776607d653ae18612
* | | | Merge "NuPlayer: pull more video buffers in advance in GenericSource" into ↵Chong Zhang2015-07-151-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | mnc-dev
generated by cgit v1.1 at 2024-05-04 20:47:28 +0000