summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-devMarco Nelissen2015-06-132-0/+4
|\
| * Serialize calls to getFrameAtTime in the mediaserverMarco Nelissen2015-06-122-0/+4
| | | | | | | | | | | | | | to avoid running out of memory. Bug: 21277449 Change-Id: I7210806a24958f38d86aadab0310fc263e4c0edf
* | Merge "stagefright: post audio EOS in NuPlayerRenderer if getPosition fails" ↵Chong Zhang2015-06-122-0/+35
|\ \ | | | | | | | | | into mnc-dev
| * | stagefright: post audio EOS in NuPlayerRenderer if getPosition failsChong Zhang2015-06-122-0/+35
| |/ | | | | | | | | bug: 20071480 Change-Id: I81f2a1fea0daa694a61be7f4a6d70d6847e9f183
* | NuPlayerDriver: add more logging.Wei Jia2015-06-111-1/+2
|/ | | | Change-Id: Ib80a42b4e46b4e2bea02d9a002228a058d1fa211
* NuPlayer: print player stats at the end of playbackPraveen Chavan2015-06-101-8/+27
| | | | | | | Print stats at the end of playback if the shell property persist.debug.sf.stats is set Change-Id: Ie4250bf86b12af75c16f108ca09ad02b3e44fd29
* NuPlayer: Enhance dumpsys statisticsPraveen Chavan2015-06-109-45/+86
| | | | | | | | Account for dropped output-frames (rather than input-frames) in percentage dropped frames. Print mime and component name for each active track Change-Id: I3491d336c696d8ed0fd1503b80afe1df47c787c8
* mediaplayer: remove use-awesomeplayer developer optionLajos Molnar2015-06-101-6/+0
| | | | | Bug: 17108024 Change-Id: Id6429eb58226fe955f091f661fcb2f21a5f6ce5e
* NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when ↵Wei Jia2015-06-101-3/+8
| | | | | | | AudioSink is opened in callback mode. Bug: 21723010 Change-Id: Iddab8c1cbdf87714aa53315feba064fe101d8f98
* Merge "NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink ↵Wei Jia2015-06-091-1/+1
|\ | | | | | | reports WOULD_BLOCK on writing." into mnc-dev
| * NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports ↵Wei Jia2015-06-091-1/+1
| | | | | | | | | | | | | | WOULD_BLOCK on writing. Bug: 21726662 Change-Id: I4aa63df7f21e06473594dda30a935e0f1cb745ac
* | Merge "AudioSink: use flags granted by AudioTrack, instead of the requested ↵Wei Jia2015-06-091-2/+4
|\ \ | | | | | | | | | flags." into mnc-dev
| * | AudioSink: use flags granted by AudioTrack, instead of the requested flags.Wei Jia2015-06-091-2/+4
| |/ | | | | | | | | | | | | Do not call AudioTrack::setPlaybackRate when DIRECT flag is set. Bug: 17459982 Change-Id: Ib8fb07be72558234519590bcc3bb88c4f6edfa37
* | Camera1 API: Support SW encoders for new camera HALsEino-Ville Talvala2015-06-082-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Support new set video format/dataspace command in camera service - HALv3: Select gralloc usage flags based on format - HALv1: Pass format command directly to HAL layer - Use format/dataspace command in CameraSource - Switch all API1 recording to use metadata mode - Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer Bug: 13222807 Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
* | NuPlayer: Allow audio drain to fill buffer when pausedAndy Hung2015-06-031-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a pause lasts more than a few seconds, the audio device enters standby. When the audio device comes out of standby, it typically requests a large amount of data to fill its buffers (especially severe for deep buffer PCM mode). To avoid a glitch, continue to fill the buffer (until no more data can be written) when paused. Also, we do not start the audio sink if we are paused to avoid audio playback in video preview mode. Bug: 19062223 Bug: 21198655 Change-Id: Ifb3f181d5e810283381b65f2af16a4c71df0b04f
* | NuPlayer: Allow audio callback to fill buffer when pausedAndy Hung2015-06-031-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a pause lasts more than a few seconds, the audio device enters standby. When the audio device comes out of standby, it typically requests a large amount of data to fill its buffers (especially severe for deep buffer PCM mode). To avoid a glitch, continue to service the audio callback when paused. Also, we do not start the audio sink if we are paused to avoid audio playback in video preview mode. Bug: 19062223 Bug: 21198655 Change-Id: I987337a87e6c875aeb381df8ad37c7139c42dc72
* | NuPlayer: Add audio deep buffer configurationAndy Hung2015-06-032-3/+12
| | | | | | | | | | | | | | | | Disabled for video streams now. Enabled by property media.stagefright.audio.deep 1 Bug: 21198655 Change-Id: I03f3b43091f950637d46779e2e74c1321b2cd268
* | NuPlayer: Add audio sink buffer configurationAndy Hung2015-06-033-17/+43
| | | | | | | | | | | | | | | | Property media.stagefright.audio.sink (in milliseconds) Also change the default buffer size for PCM playback to 500 ms. Bug: 21198655 Change-Id: I5781288f59bf08fbecd9263a26c919570b58be0f
* | Merge "MediaPlayerService: Reset the bytes written in AudioSink stop and ↵Andy Hung2015-06-031-0/+2
|\ \ | | | | | | | | | flush" into mnc-dev
| * | MediaPlayerService: Reset the bytes written in AudioSink stop and flushAndy Hung2015-06-031-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | When playing in non-offloaded mode with gapless playback it is necessary to reset AudioSink's bytes written on stop and flush (e.g. seeking) so the frames written can be correctly retrieved for the subsequent song in NuPlayer::Renderer::onAudioSinkChanged(). Without this change, seeks performed during playback will cause a time position offset of the subsequent song in Play Music. Bug: 21198655 Change-Id: I0fb6cc94b5a0ff106dc8a71571ed85d75fb00660
* | Merge "NuPlayer: Add audio callback mode for PCM audio." into mnc-devAndy Hung2015-06-032-13/+59
|\ \
| * | NuPlayer: Add audio callback mode for PCM audio.Andy Hung2015-06-032-13/+59
| |/ | | | | | | | | | | | | Disabled for now. Enabled by property media.stagefright.audio.cbk 1 Bug: 21198655 Change-Id: I8f117b089fe019009f1615908d33720a93e1b21e
* | MediaPlayerService: Remove unnecessary zero writes to AudioSinkAndy Hung2015-06-031-10/+17
|/ | | | | | | | | | | | Causes glitches in PCM playback for NuPlayer callback mode. Not sure the original intention of this with AwesomePlayer, as zeroes are only placed under EOS condition for AudioSink targets, not AudioTrack targets. Does not seem useful anymore as AwesomePlayer appears to call stop() which should send the remaining track data out. Bug: 21198655 Change-Id: Iab80dd7bc6e2e341f92406c5d8f8085e9d877bcd
* Merge "Track camera and flashlight usage in battery stats." into mnc-devRuben Brunk2015-06-022-12/+5
|\
| * Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-012-12/+5
| | | | | | | | | | | | Bug: 15986092 Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
* | Explicit log for AudioTrack::EVENT_UNDERRUNGlenn Kasten2015-06-011-0/+9
| | | | | | | | | | | | | | Prompted by this bug, but not a fix for the bug Bug: 21352202 Change-Id: I350d9d8660a367470450c9f54d7c541d4896ebda
* | Merge "Deprecations are warnings not errors" into mnc-devGlenn Kasten2015-05-281-1/+1
|\ \
| * | Deprecations are warnings not errorsGlenn Kasten2015-05-281-1/+1
| | | | | | | | | | | | Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
* | | Merge "libmediaplayerservice: get isStreaming info from source." into mnc-devRonghua Wu2015-05-274-4/+13
|\ \ \
| * | | libmediaplayerservice: get isStreaming info from source.Ronghua Wu2015-05-274-4/+13
| |/ / | | | | | | | | | | | | Bug: 19061436 Change-Id: I0fc0d6207b0d3297d64aadab3e81448e3f3fa1de
* | | GenericSource should report -1 instead of 0 for unknown durationMarco Nelissen2015-05-271-1/+1
|/ / | | | | | | | | | | | | | | If the underlying source never reported a duration, GenericSource would report a duration of 0. The right value to return is -1. Bug: 21391417 Change-Id: Ie53045f819727b0ac79ed6719991724c069d7650
* | Merge "libmediaplayerservice: try to open audio sink in offload mode in ↵Ronghua Wu2015-05-226-33/+52
|\ \ | | | | | | | | | error." into mnc-dev
| * | libmediaplayerservice: try to open audio sink in offload mode in error.Ronghua Wu2015-05-226-33/+52
| | | | | | | | | | | | | | | | | | Bug: 19061432 Bug: 21370108 Change-Id: Iaa757555ef37fd1ac87b6e2d5a9969bb58cc5ebc
* | | mediaplayer: display one frame when seek is called before start.Wei Jia2015-05-213-19/+33
| | | | | | | | | | | | | | | Bug: 18608164 Change-Id: I83252421278aeeb1c1611138994bfdaf86d7a363
* | | Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL ↵Wei Jia2015-05-191-0/+5
|\ \ \ | | | | | | | | | | | | buffer from MediaCodec." into mnc-dev
| * | | mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer ↵Wei Jia2015-05-181-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | from MediaCodec. MediaCodec could send out message of input buffer available right before it hits an error and clears its buffers. Bug: 14433407 Change-Id: I32494f4cb2a8537fac12449fd68a74c021f5c9e1
* | | Merge "libmediaplayerservice: queue discontinuity when seek to eos." into ↵Ronghua Wu2015-05-192-11/+20
|\ \ \ | |_|/ |/| | | | | mnc-dev
| * | libmediaplayerservice: queue discontinuity when seek to eos.Ronghua Wu2015-05-192-11/+20
| | | | | | | | | | | | | | | Bug: 19063416 Change-Id: I23d1a3788006a0d68effa01fe9ee1d92fe06739c
* | | Clear mAudioRecord and mAudioTrack on set() failureGlenn Kasten2015-05-181-0/+1
| |/ |/| | | | | | | | | Bug: 20818955 Bug: 20890069 Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
* | Merge "mediaplayer: remove unused parameter needNotify in ↵Wei Jia2015-05-162-13/+10
|\ \ | | | | | | | | | NuPlayer::performSeek." into mnc-dev
| * | mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.Wei Jia2015-05-152-13/+10
| | | | | | | | | | | | Change-Id: I5ee4c3ba968a2ac52266cda0425d1a709e5c0fb2
* | | Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-devRobert Shih2015-05-151-13/+11
|\ \ \ | |/ / |/| |
| * | HTTPLiveSource: fix non timed id3 track selectionRobert Shih2015-05-151-13/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non timed id3 track selection generates INVALID_OPERATION when performed on the last track. The buggy logic reads: if (not last track) { // non-timed-id3 related work } else if (has timed id3) { // timed id3 related work } // last track but non timed id3 not handled It should read: if (has no timed id3 || not last track) { // non-timed-id3 track related work } else { // timed id3 related work } Bug: 21195284 Change-Id: I2ddb5d8e2a1ecba4cc071c7ee14c6697fe8e220d
* | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" ↵Chong Zhang2015-05-134-6/+7
|\ \ | | | | | | | | | into mnc-dev
| * | stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-134-6/+7
| |/ | | | | | | | | | | | | | | and clear persistent surface pointer when MediaRecorder is reset bug: 21045118 bug: 21045402 Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
* | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." ↵Ronghua Wu2015-05-131-0/+11
|\ \ | | | | | | | | | into mnc-dev
| * | libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
| |/ | | | | | | | | Bug: 21086224 Change-Id: Icebd8eab70570e818ff7f5fc3a32e1801c3b92d2
* | mediaplayer: get/set PlaybackRate only when AudioSink has been opened.Wei Jia2015-05-121-3/+3
|/ | | | Change-Id: I676567fc029b9f82d039990e629374bd48168cec
* Merge "nuplayer: fixes for subtitle pause/resume" into mnc-devChong Zhang2015-05-072-5/+18
|\
| * nuplayer: fixes for subtitle pause/resumeChong Zhang2015-05-062-5/+18
| | | | | | | | | | | | | | | | | | | | - pause after the current block when select track - ignore metadata timestamps as they're too sparse - use smaller range when searching for next segment to prevent resumeUntil from downloading too much data bug: 20500732 Change-Id: Ibda57a39ec86efd96a8dd0db95adeb92d076697a