summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CameraService: intercept Camera moduleYin-Chia Yeh2015-03-1721-61/+259
| | | | | | | | Wrap camera module returned from HAL so get_camera_info returns static_camera_characteristics processed by framework, which generates keys added after HAL3.2 is released. Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
* camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-03-171-4/+4
| | | | | | | | - submitRequest*(): res is the request ID and not always equals to NO_ERROR. - cancelRequest() and flush(): the result of reading last frame number should be put in resFrameNumber, not in res. Change-Id: Ic81c58f4ac14c05b3db4bdc5c99f48d00665d3fc Signed-off-by: John Lin <jolin@mozilla.com>
* am faefd08b: (-s ours) Revert "DO NOT MERGE: stagefright: add support for ↵Lajos Molnar2015-02-110-0/+0
|\ | | | | | | | | | | | | Intel\'s YUV420SP format in SoftwareRenderer" * commit 'faefd08b11d1f4955b5da6c10e1a9be1a5cbefad': Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
| * Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format ↵Lajos Molnar2015-02-111-3/+1
| | | | | | | | | | | | | | | | | | in SoftwareRenderer" This reverts commit 7a9510dcf637cc1e5c953d77c7bd4409c80a820f. Bug: 19317169 Change-Id: I881ce6b1592b7250f423a561dadd40d379e16104
* | am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ↵Lajos Molnar2015-02-105-2/+190
|\ \ | |/ | | | | | | | | | | into lmp-mr1-dev * commit '0c11f31b610534754f48b40d0a6ccdd311d43fcf': nuplayer: acquire wakelock during offload pause timeout
| * Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-devLajos Molnar2015-02-105-2/+190
| |\
| | * nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-065-2/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl ↵Lajos Molnar2015-02-09290-332/+4575
|\ \ \ | |/ / | | | | | | | | | | | | | | | sources" into lmp-mr1-dev * commit '0c11001c58526cddc7f6135982f456fff6e34aeb': stagefright: change licensing headers on h264dec omxdl sources
| * | Merge "stagefright: change licensing headers on h264dec omxdl sources" into ↵Lajos Molnar2015-02-07290-332/+4575
| |\ \ | | |/ | |/| | | | lmp-mr1-dev
| | * stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
| | | | | | | | | | | | | | | Bug: 19030684 Change-Id: I6d4674fad126c26d3b6819fde91277a92dfd8862
* | | am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-091-0/+108
|\ \ \ | |/ / | | | | | | | | | * commit '17e95f40a534101e2df48f077a8029430adef6c3': stagefright: add media_codecs_google_video_le.xml
| * | stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-061-0/+108
| | | | | | | | | | | | | | | | | | | | | This can be used by low-end devices Bug: 19027495 Change-Id: I2cf90bf5a9a95b3f38c32eef2a950c9e33c70a7a
* | | am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
|\ \ \ | |/ / | | | | | | | | | * commit '41d3f579d2c166984958263533284209b90c87d5': Fix GSM WAV playback
| * | Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| |/ | | | | | | | | Bug:19289381 Change-Id: If7bbf1ecf1cb8796188e61bc2c42f8a099510424
* | am 35395ea6: (-s ours) DO NOT MERGE: stagefright: add support for Intel\'s ↵Lajos Molnar2015-02-060-0/+0
|\ \ | |/ | | | | | | | | | | YUV420SP format in SoftwareRenderer * commit '35395ea6ad11824a4a89cc1ab9ee84f936188296': DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
| * DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in ↵Lajos Molnar2015-02-061-1/+3
|/ | | | | | | | | SoftwareRenderer This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar Bug: 19246722 Change-Id: Ief41bfaf997426a6900c3632dadaf8f4a6a38baf
* allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-051-0/+10
| | | | | bug: 19284568 Change-Id: I2ccf1c5952c13d1332b6a91f967af0bd3ee67451
* stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanarLajos Molnar2015-02-051-4/+5
| | | | | Bug: 19179927 Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
* stagefright: set consumer usage flags and desribe YV12 HAL formatLajos Molnar2015-02-052-4/+52
| | | | | | | Bug: 17906609 Bug: 19179288 Bug: 19179927 Change-Id: I3713d4e894d3350d46e25dc0206b21c0ff3b9009
* Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-devChong Zhang2015-02-041-1/+3
|\
| * reuse CCDecoder on video discontinuityChong Zhang2015-02-041-1/+3
| | | | | | | | | | bug: 19266084 Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
* | Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-devLajos Molnar2015-02-043-20/+83
|\ \
| * | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-043-20/+83
| | | | | | | | | | | | | | | | | | | | | Use software renderer if codec cannot support flex-YUV on a surface Bug: 17906609 Change-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a
* | | Merge "httplive: Set start time and segment start time in conjunction." into ↵Robert Shih2015-02-042-6/+14
|\ \ \ | |/ / |/| | | | | lmp-mr1-dev
| * | httplive: Set start time and segment start time in conjunction.Robert Shih2015-02-042-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add comments describing how start time and segment start time are used. Based on AOSP CL https://android-review.googlesource.com/127653 by Joakim Johansson <joakim.c.johansson@sonymobile.com> but uses the lowest segment start time instead of highest. Bug: 18821145 Change-Id: I14cf1186d0daf517a24e8423c3a708b4c9ba06c4
* | | Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-devLajos Molnar2015-02-043-40/+95
|\ \ \
| * | | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-043-40/+95
| | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
* | | | audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Device disconnect notifications are sent from audiopolicy to the HALs. Send connect notifications as well. Bug: 19249796. Bug: 17785277. Change-Id: Ia823ed154d6a0c7ceb84b0a94f0c3b78392faaf6
* | | NuPlayer: pause playback when buffering is lowChong Zhang2015-02-036-34/+251
| |/ |/| | | | | | | | | | | also fix buffering percentage report (should be the buffered position) bug: 18730095 Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
* | Merge "Acodec: reset sideband handle for all non tunneled mode video ↵Rachad2015-01-311-0/+9
|\ \ | | | | | | | | | playback" into lmp-mr1-dev
| * | Acodec: reset sideband handle for all non tunneled mode video playbackRachad2015-01-311-0/+9
| | | | | | | | | | | | | | | Bug: 19202023 Change-Id: I414847d72a3c9fd79f858c4ee457270ec65470b6
* | | Merge "Acodec: Send framerate information to OMX decoder if available" into ↵Rachad2015-01-312-3/+16
|\ \ \ | |/ / | | | | | | lmp-mr1-dev
| * | Acodec: Send framerate information to OMX decoder if availableRachad2015-01-292-3/+16
| | | | | | | | | | | | | | | Bug: 19110889 Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
* | | Merge "Wrong format used in seamless check" into lmp-mr1-devRobert Shih2015-01-311-4/+4
|\ \ \
| * | | Wrong format used in seamless checkjoakim johansson2015-01-301-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targetFormat that is sent to supportsSeamlessFormatChange function corresponds to the data in mInputFormat but the format provided is the output format, so the check will always return false. Use the input format instead. Bug: 18821145 Change-Id: Iea3cbd59e423da5f2f813e98505b40dc341061b8
* | | Merge "PlaylistFetcher: clear packet sources when adjusting starting ↵Robert Shih2015-01-311-0/+4
|\ \ \ | | | | | | | | | | | | sequence number" into lmp-mr1-dev
| * | | PlaylistFetcher: clear packet sources when adjusting starting sequence numberRobert Shih2015-01-301-0/+4
| | |/ | |/| | | | | | | | | | Bug: 19215971 Change-Id: I4ad29cf0ac24dea330017a1b0159b06922d768ae
* | | httplive: Defer switch down if a switch is in progressApurupa Pattapu2015-01-301-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bandwidth switch down is triggered if the buffered duration in any of the current packet sources is below a threshold. When a switch is in progress, all the packet sources are drained until they are empty or until stop time is dequeued. Hence buffered duration keeps going down during switch. Defering check switch down will avoid unnecessary switches. Do not switch down if estimated bandwidth index is more than the current one. Bug: 18821145 Change-Id: I655a308462503cf9df10672ecd904a51b2cba691
* | Merge "audio policy: add fallback for output selection" into lmp-mr1-devEric Laurent2015-01-301-0/+4
|\ \
| * | audio policy: add fallback for output selectionEric Laurent2015-01-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When getOutputForDevice() finds a matching direct output profile but fails to open it, try to fallback to downmix on mixer output when format is PCM and sampling rate allows it. Bug: 19197137. Change-Id: I197b9b202504265b6928e69740875cb7aba5c2c5
* | | Merge "audio policy: match attached device to declared devices" into lmp-mr1-devEric Laurent2015-01-302-28/+46
|\ \ \
| * | | audio policy: match attached device to declared devicesEric Laurent2015-01-292-28/+46
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that when a new audio device is connected, and a specific profile for this device is listed in audio_policy.conf, this particular profile is used instead of a default generic profile. Bug: 19188567. Change-Id: I5f576fcd697adc041b2cfbd2bac7a51bcc2143b9
* | | Merge "Fix FLAG_BEACON regression" into lmp-mr1-devJean-Michel Trivi2015-01-291-0/+3
|\ \ \ | |/ / |/| |
| * | Fix FLAG_BEACON regressionJean-Michel Trivi2015-01-291-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | Fix regression where FLAG_BEACON is not honored anymore in terms of routing and muting behavior When converting from AudioAttributes to stream types, also look at FLAG_BEACON for mapping to STREAM_TTS Bug 19185342 Change-Id: I5871c1b94480ae3da544aef99ea9ab4dff97443d
* | stagefright: httplive: Decouple block size from bandwidth estimateLeena Winterrowd2015-01-286-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A very small block size in PlaylistFetcher can lead to framework overhead and difficulty streaming high bitrate content, but since HTTPBase keeps a constant history of the past 100 HTTP reads, the block size directly affects bandwidth estimation and in turn, switching latency. Add setBandwidthHistorySize() to HTTPBase to allow setting the history size for bandwidth estimation. Call this within LiveSession based on the current block size to ensure that the number of bytes used for estimating bandwidth does not change if the block size is changed in PlaylistFetcher. Since a single TCP/IP packet can contain up to 64k of data, increase the block size in PlaylistFetcher from 2k to lcm(188, 1024) or 47k to avoid inaccuracies in read timings due to up to a comparable 47 reads from the same locally-cached packet instead of from the network. Also make HTTPBase::addBandwidthMeasurement() virtual to allow bandwidth estimation extensions that do not rely on a history list. Bug: 18821145 Change-Id: I5f957be01f5346e74cfb7eeb150ca4b397ad5798
* | stagefright: httplive: Reduce memcpy calls for chunked contentLeena Winterrowd2015-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Streams using http chunking will not report the segment's total content-length. In this case, a 64k buffer is allocated and is increased by 32k each time the buffer is filled again. For high bitrate content, this can lead to a large number of copies that affect the HLS framework delay. Increase fetchFile buffer size exponentially by 50% or at least 32k instead of by 32k each time to reduce the number of memcpy calls. Example for a chunked 6 MB 1080p segment (ie ~3s): Adding 32k: 190 copies with 572.97 MB copied Increasing by 50%: 12 copies with 16.09 MB copied Bug: 18821145 Change-Id: Iedf0e4437e96026a58d50bce2660f85ac90d0ada
* | httplive: Dont resume if we have almost fetched till stop timeApurupa Pattapu2015-01-282-3/+10
| | | | | | | | | | | | | | | | | | | | - Use the last enqueued instead of last dequeued time in ResumeUntil. - Set duration in access unit meta as timestamp difference between the last two queued access units. Bug: 18821145 Change-Id: If53ddee1d87775905a6d4f11a6219fe66f498450
* | stagefright: httplive: Propagate target duration to LiveSessionLeena Winterrowd2015-01-281-0/+5
| | | | | | | | | | | | | | | | | | LiveSession's switch-down monitor requires the 'targetDuration' key to evaluate the switching threshold. Ensure that this key is set in the access unit metadata. Bug: 18821145 Change-Id: Ib30f3b4bd8185a77a06abd755822f96644968a21
* | httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create duplicate of metadata in queueAccessUnit so that it is available even after all the buffers are erased from packet source. During a bandwidth switch httplive streaming Source uses last enqueued timestamp as the start time for the new streams, and this switch can occur at a time when all the packets are dequeued from the current packet source. This is one of the scenarios when the last enqueued time was showing a invalid timestamp. Creating a copy will retain the timestamp value until the packet source is active. Bug: 18821145 Change-Id: I4d4ee700705cee58773da4660f8769f56018f9e4
* | stagefright: httplive: Fix deadlock for low duration clipsLeena Winterrowd2015-01-282-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | PlaylistFetcher buffers up to 3 * target-duration bytes of data, but if a stream is slow (ie due to bad network conditions), a buffer threshold of 10s is used to resume playback. This results in an indefinite freeze as PlaylistFetcher has stopped buffering before this threshold. Reduce the 10s threshold to be more in-sync with PlaylistFetcher's buffering size. Bug: 18821145 Change-Id: Ife846e7c5b4f9645895873d08250c4bee0164972