OSDN Git Service
Robert Shih [Wed, 1 Oct 2014 01:17:29 +0000 (01:17 +0000)]
Merge "NuCachedSource2: fix disconnect process" into lmp-dev
Robert Shih [Tue, 30 Sep 2014 21:17:38 +0000 (14:17 -0700)]
NuCachedSource2: fix disconnect process
- clear mAsyncResult
- return early from reads if mDisconnecting is set
Bug:
17696761
Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2
Marco Nelissen [Tue, 30 Sep 2014 22:29:21 +0000 (22:29 +0000)]
Merge "Check if info for uri is available" into lmp-dev
Marco Nelissen [Tue, 30 Sep 2014 21:53:39 +0000 (14:53 -0700)]
Check if info for uri is available
before retrieving it.
Bug:
17683986
Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
Lajos Molnar [Tue, 30 Sep 2014 14:45:59 +0000 (14:45 +0000)]
Merge "mediaplayer: make frame-accurate avsync configurable" into lmp-dev
Glenn Kasten [Tue, 30 Sep 2014 01:44:18 +0000 (01:44 +0000)]
Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev
Eric Laurent [Tue, 30 Sep 2014 01:16:13 +0000 (01:16 +0000)]
Merge "audio policy: fix HW A/V sync output selection" into lmp-dev
Eric Laurent [Tue, 30 Sep 2014 01:11:19 +0000 (01:11 +0000)]
Merge "audioflinger: forward flush to direct output streams" into lmp-dev
Glenn Kasten [Sun, 28 Sep 2014 21:41:07 +0000 (14:41 -0700)]
Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
The per-thread timestamp latch was not synchronized with the per-track
released frames. Now the value of each track's released frames is
latched along with the timestamp.
Bug:
17531839
Bug:
17669342
Change-Id: I96252782911bd42a2534cc4030521b7eeb99a7b9
Eric Laurent [Mon, 29 Sep 2014 16:43:03 +0000 (09:43 -0700)]
audio policy: fix HW A/V sync output selection
commit
b732cf5a broke the selection mechanism for the
HW A/V sync direct output.
Add a rule to only select a mixed output for basic PCM
stereo content when a direct output is not explicitly requested.
Bug:
17702382.
Change-Id: I1387690ace77cd4d6a8faf0b525c3d1008fba3f1
Eric Laurent [Mon, 29 Sep 2014 20:06:46 +0000 (13:06 -0700)]
audioflinger: forward flush to direct output streams
Track flush should be forwarded to the audio HAL when playing
on a direct output stream.
Bug:
17704953.
Change-Id: Iafc94327fe9aebf1d4eaa97b76c6767b7ac5babe
Lajos Molnar [Mon, 29 Sep 2014 23:36:37 +0000 (16:36 -0700)]
mediaplayer: make frame-accurate avsync configurable
disable by default
Bug:
17686015
Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
Eino-Ville Talvala [Mon, 29 Sep 2014 22:54:40 +0000 (22:54 +0000)]
Merge "CameraService: API1: Reallocate JPEG ashmem heap if size changes" into lmp-dev
Eino-Ville Talvala [Mon, 29 Sep 2014 20:51:17 +0000 (13:51 -0700)]
CameraService: API1: Reallocate JPEG ashmem heap if size changes
Bug:
17682603
Change-Id: I7cba3365d00c33cf4267b1b59a94bd7d0bba08df
Glenn Kasten [Mon, 29 Sep 2014 19:46:52 +0000 (19:46 +0000)]
Merge "Fix tee sink" into lmp-dev
Glenn Kasten [Sun, 28 Sep 2014 20:06:06 +0000 (13:06 -0700)]
Fix tee sink
Note: this does not fix the bug below, but it helps to investigate the bug.
Bug:
17578238
Change-Id: I0fd27a477b73ba0e1c5a658bdfad17c500f5dc67
Eino-Ville Talvala [Fri, 26 Sep 2014 20:09:54 +0000 (13:09 -0700)]
Camera2Client: Revert HALv2 device behavior back to MR2
- Do not idle device before video snapshot stream configuration, to
avoid deadlock during waiting.
- Do not tear down ZSL stream
- Don't refresh ZSL stream after deletion was requested.
The v2 HAL implementations really don't like the ZSL stream being
touched ever.
Bug:
17634430
Bug:
17628507
Change-Id: I36b44a395e697be9802c4bd917a82b77c8d04be2
Eino-Ville Talvala [Sat, 27 Sep 2014 22:38:20 +0000 (22:38 +0000)]
Merge "CameraService: API1: Fix flash mode" into lmp-dev
Eino-Ville Talvala [Sat, 27 Sep 2014 21:27:45 +0000 (14:27 -0700)]
CameraService: API1: Fix flash mode
Sometimes it's useful to ensure variables are initialized in
all code paths.
Bug:
17680416
Change-Id: I9bed8a3bcb94417384bf0551fe1c0eee6cc49577
Eric Laurent [Fri, 26 Sep 2014 23:34:07 +0000 (23:34 +0000)]
Merge "audio policy: favor mixed over direct output for PCM format" into lmp-dev
Eric Laurent [Thu, 25 Sep 2014 02:08:21 +0000 (19:08 -0700)]
audio policy: favor mixed over direct output for PCM format
modify getOutputForDevice() to skip direct output selection
if the request can obviously be attached to a mixed output
This prevents from selecting a direct output profile that
can manage stereo PCM format if a mixer output is available
to reach the same device.
Bug:
17628413.
Change-Id: I02e9a0b02c9ae5f44ff5768ac4ed02ce84d521c5
Eric Laurent [Fri, 26 Sep 2014 22:59:58 +0000 (22:59 +0000)]
Merge "audio: fix stream type for accessibility usage" into lmp-dev
Eino-Ville Talvala [Fri, 26 Sep 2014 08:28:28 +0000 (08:28 +0000)]
Merge "Camera1 shim: If there's no flash, the keys need to be null." into lmp-dev
Wei Jia [Fri, 26 Sep 2014 00:19:55 +0000 (00:19 +0000)]
Merge "NuPlayer: use format obtained from source to tell if video exists." into lmp-dev
Eric Laurent [Thu, 25 Sep 2014 21:11:47 +0000 (14:11 -0700)]
audio: fix stream type for accessibility usage
Make sure that accessibility prompts are heard when
a ringtone is active by forcing stream type
to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE.
Bug:
17558149.
Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
Wei Jia [Thu, 25 Sep 2014 22:27:04 +0000 (15:27 -0700)]
NuPlayer: use format obtained from source to tell if video exists.
Bug:
17374216
Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
Marco Nelissen [Thu, 25 Sep 2014 22:14:04 +0000 (22:14 +0000)]
Merge "Fix SoftAAC2 flush" into lmp-dev
Eino-Ville Talvala [Thu, 25 Sep 2014 21:48:28 +0000 (14:48 -0700)]
Camera1 shim: If there's no flash, the keys need to be null.
Previously, we set FLASH_MODE_OFF for FLASH_MODE when a flash unit
isn't available. However, per the API documentation, the key has to
be null instead.
- Make sure that the flash mode and supported flash mode keys are null
if there's no flash unit on start
- Don't set flash mode in later setParameters calls if there is no
flash unit
- Map NULL value for flash mode key to FLASH_MODE_OFF for internal
consistency.
Bug:
17660716
Change-Id: I3033682f0b882b8c2004114e2afef31662caebda
Marco Nelissen [Thu, 25 Sep 2014 21:25:18 +0000 (14:25 -0700)]
Fix SoftAAC2 flush
If there were less than a full frame worth of samples in the ring
buffer, then flush would loop forever trying to empty the ring
buffer.
Bug:
17646525
Change-Id: I68ec87352a91ce3a96d05e9b3f60a6e7975f9156
Ruchit Sharma [Mon, 18 Aug 2014 17:48:24 +0000 (13:48 -0400)]
camera: add traces for KPI measurement
Bug:
17658101
Change-Id: I1d8035c4a8fba7b88a87f205ce57c13d812e9df5
Andy Hung [Thu, 25 Sep 2014 03:50:45 +0000 (03:50 +0000)]
Merge "NuPlayer: Fix decoder error handling" into lmp-dev
Lajos Molnar [Thu, 25 Sep 2014 03:24:23 +0000 (03:24 +0000)]
Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev
Lajos Molnar [Thu, 25 Sep 2014 01:46:45 +0000 (18:46 -0700)]
stagefright: Advertise 16x16 alignment requirement for PV codecs
Bug:
17648616
Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
Andy Hung [Tue, 23 Sep 2014 21:59:01 +0000 (14:59 -0700)]
NuPlayer: Fix decoder error handling
Upon error, release MediaCodec after flushing data.
Report errors when they occur with ALOGE.
Fix onInputBufferFilled mInputBufferIsDequeued check.
Bug:
17423087
Bug:
17622642
Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
Lajos Molnar [Thu, 25 Sep 2014 01:14:34 +0000 (01:14 +0000)]
Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-dev
Lajos Molnar [Thu, 25 Sep 2014 00:28:22 +0000 (00:28 +0000)]
Merge "stagefright: use frame height if slice height is 0" into lmp-dev
Ronghua Wu [Thu, 25 Sep 2014 00:24:54 +0000 (00:24 +0000)]
Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed." into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 18:30:21 +0000 (11:30 -0700)]
mediaplayer: handle bad input in VideoFrameScheduler
Bug:
17626098
Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
Ronghua Wu [Thu, 25 Sep 2014 00:17:59 +0000 (00:17 +0000)]
Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into lmp-dev
Robert Shih [Thu, 25 Sep 2014 00:11:20 +0000 (00:11 +0000)]
Merge "LiveSession: do not drop seek request" into lmp-dev
Wei Jia [Wed, 24 Sep 2014 23:54:22 +0000 (23:54 +0000)]
Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 23:48:22 +0000 (23:48 +0000)]
Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev
Ronghua Wu [Wed, 24 Sep 2014 21:55:23 +0000 (14:55 -0700)]
stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
Bug:
17326758
Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
Ronghua Wu [Mon, 22 Sep 2014 20:26:13 +0000 (13:26 -0700)]
SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.
Bug:
17326758
Change-Id: I7c6b85284ae0cbfa54f999851f56db84345b65bf
Wei Jia [Wed, 24 Sep 2014 21:25:19 +0000 (14:25 -0700)]
NuPlayerDecoder: release MediaBuffers when decoder is deleted.
Bug:
17454455
Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
Lajos Molnar [Wed, 24 Sep 2014 20:55:10 +0000 (13:55 -0700)]
stagefright: use frame height if slice height is 0
This is a workaround for some vendors that set slice height to 0.
Android uses slice height is the vertical stride for YUV planar
and semiplanar formats.
Bug:
13433554
Change-Id: I4da038e7a768dcd8360c33fa1a9ce95a172f16bb
Chong Zhang [Wed, 24 Sep 2014 17:41:08 +0000 (17:41 +0000)]
Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev
Jeff Tinker [Wed, 24 Sep 2014 05:24:26 +0000 (22:24 -0700)]
Fix Widevine classic playback errors with NuPlayer
bug:
17589961
Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
Ronghua Wu [Wed, 24 Sep 2014 15:39:31 +0000 (15:39 +0000)]
Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev
Chong Zhang [Wed, 24 Sep 2014 05:22:30 +0000 (22:22 -0700)]
NuCachedSource2: more fixes for source read hang
- Do not try to read from HTTP source if already disconnecting
- Let NuCachedSource2::readAt() return immediately when disconnecting
Bug:
17613805
Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
Wei Jia [Wed, 24 Sep 2014 01:39:53 +0000 (01:39 +0000)]
Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev
Eric Laurent [Wed, 24 Sep 2014 01:21:16 +0000 (01:21 +0000)]
Merge "audio policy: add hw hotword flag for inputs" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 00:49:02 +0000 (17:49 -0700)]
stagefright: return encrypted input buffer for secure codecs
Bug:
17630446
Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
Wei Jia [Tue, 23 Sep 2014 17:55:35 +0000 (10:55 -0700)]
NuPlayer: change assert to conditional check.
Bug:
17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
Ronghua Wu [Fri, 12 Sep 2014 18:57:27 +0000 (11:57 -0700)]
stagefright: add adaptive playback support to SoftHEVC decoder.
Bug:
17326758
Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
Ronghua Wu [Tue, 23 Sep 2014 18:31:26 +0000 (18:31 +0000)]
Merge "NuPlayer: add pause timeout event for offload audio." into lmp-dev
Wei Jia [Tue, 23 Sep 2014 18:25:37 +0000 (18:25 +0000)]
Merge "NuPlayer: use generation to filter out stale message from renderer." into lmp-dev
Zhijun He [Tue, 23 Sep 2014 17:47:01 +0000 (17:47 +0000)]
Merge "Camera2Client: log an error when autoFocus is called in wrong state" into lmp-dev
Zhijun He [Tue, 23 Sep 2014 06:52:54 +0000 (23:52 -0700)]
Camera2Client: log an error when autoFocus is called in wrong state
Bug:
17555612
Change-Id: Ife33da712fbc8dc44d81e1e869fc75fb21026204
Wei Jia [Mon, 22 Sep 2014 22:21:11 +0000 (15:21 -0700)]
NuPlayer will notify SeekComplete only when requested so.
Bug:
17596535
Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
Wei Jia [Tue, 23 Sep 2014 00:58:20 +0000 (00:58 +0000)]
Merge "MyHandler: set ip address to an invalid one when getsockname() returns error." into lmp-dev
Wei Jia [Mon, 22 Sep 2014 23:52:49 +0000 (16:52 -0700)]
MyHandler: set ip address to an invalid one when getsockname() returns error.
Bug:
17556472
Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
Chong Zhang [Mon, 22 Sep 2014 22:17:30 +0000 (22:17 +0000)]
Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev
Chong Zhang [Mon, 22 Sep 2014 19:25:36 +0000 (12:25 -0700)]
fix crash when makeHTTPConnection fails with null pointer
Bug:
17608108
Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
Andy Hung [Mon, 22 Sep 2014 19:01:38 +0000 (19:01 +0000)]
Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
Ronghua Wu [Tue, 9 Sep 2014 17:11:08 +0000 (10:11 -0700)]
NuPlayer: add pause timeout event for offload audio.
Bug:
17375249
Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
Andy Hung [Thu, 18 Sep 2014 21:45:57 +0000 (14:45 -0700)]
MediaCodec: Fix deallocated pointer reference when calling reset()
The name pointer argument in MediaCodec::init() was being
implicitly deallocated.
Bug:
17499622
Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
Wei Jia [Mon, 22 Sep 2014 17:16:29 +0000 (10:16 -0700)]
NuPlayer: use generation to filter out stale message from renderer.
Clean up generation number for decoders.
Bug:
17507846
Change-Id: Ibd2cfe11f89f404882d66c384b5198dc641f5e71
Wei Jia [Mon, 22 Sep 2014 16:03:02 +0000 (16:03 +0000)]
Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." into lmp-dev
Robert Shih [Mon, 22 Sep 2014 15:42:49 +0000 (15:42 +0000)]
Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev
Wei Jia [Fri, 19 Sep 2014 00:36:20 +0000 (17:36 -0700)]
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
Bug:
17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
Eric Laurent [Sat, 20 Sep 2014 02:04:57 +0000 (19:04 -0700)]
audio policy: add hw hotword flag for inputs
Audio input profiles can indicate flag AUDIO_INPUT_FLAG_HW_HOTWORD
meaning they allow capture from the same source as HW hotword
detection.
When a client requests capture with this flag, the policy will
try to find an input profile matching this request first and
fallback to a regular input if not found.
Bug:
17575019.
Change-Id: Ia463211597d7fa363527d776389f2257f0ced9a2
Lajos Molnar [Sat, 20 Sep 2014 02:00:29 +0000 (02:00 +0000)]
Merge "mediaplayer: smooth out videoplayback based on framerate" into lmp-dev
Zhijun He [Sat, 20 Sep 2014 01:06:54 +0000 (01:06 +0000)]
Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-dev
Lajos Molnar [Thu, 18 Sep 2014 21:14:29 +0000 (14:14 -0700)]
mediaplayer: smooth out videoplayback based on framerate
Bug:
14659809
Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
Marco Nelissen [Sat, 20 Sep 2014 00:41:15 +0000 (00:41 +0000)]
Merge "Make prepare properly report failure again" into lmp-dev
Zhijun He [Fri, 19 Sep 2014 22:51:04 +0000 (15:51 -0700)]
API1: ZSL buffers should be skipped for manual AF mode
ZSL counts on good auto focus (CAF). It is really tricky to enable ZSL for
manual focus mode. as it is bascically a locked focus mode, you can not tell
if the focus is good or not by reading the afstate.
Bug:
17577928
Change-Id: I68ff7d143e7d56f942bb00a8da6a9faea57b52a0
Marco Nelissen [Fri, 19 Sep 2014 22:14:37 +0000 (15:14 -0700)]
Make prepare properly report failure again
Bug:
17583084
Bug:
17548451
Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
Robert Shih [Fri, 19 Sep 2014 21:52:30 +0000 (14:52 -0700)]
NuPlayer HLS: better subtitle toggling
Bug:
17310061
Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
Lajos Molnar [Wed, 7 May 2014 22:33:04 +0000 (15:33 -0700)]
mediaplayer: schedule video frames in VSYNC valleys
Bug:
14659809
Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
Marco Nelissen [Fri, 19 Sep 2014 19:12:35 +0000 (19:12 +0000)]
Merge "Fix ringbuffer handling" into lmp-dev
Marco Nelissen [Fri, 19 Sep 2014 18:46:44 +0000 (11:46 -0700)]
Fix ringbuffer handling
Explicitly keep track of the number of samples in the ring buffer,
rather than inferring it from the difference between the read and
write pointer, since the latter cannot distinguish between a
completely full and a completely empty buffer.
Bug:
17582331
Change-Id: I24d16ce96710209b7457ffad7c4c60201451980f
Eino-Ville Talvala [Fri, 19 Sep 2014 18:30:13 +0000 (18:30 +0000)]
Merge "CameraService: Add client name/pid to device open/close logging." into lmp-dev
Glenn Kasten [Fri, 19 Sep 2014 16:05:05 +0000 (09:05 -0700)]
Reduce log spam from getTimestamp errors
Bug:
17576481
Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
Robert Shih [Sat, 30 Aug 2014 01:25:05 +0000 (18:25 -0700)]
LiveSession: do not drop seek request
Bug:
17538727
Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
Eino-Ville Talvala [Fri, 19 Sep 2014 00:24:22 +0000 (17:24 -0700)]
CameraService: Add client name/pid to device open/close logging.
Bug:
15672812
Change-Id: I1162c6d9d0a1eea1dd32949a04c295b4941d2602
Marco Nelissen [Fri, 19 Sep 2014 00:20:08 +0000 (00:20 +0000)]
Merge "Always consider first buffer to be config" into lmp-dev
Eino-Ville Talvala [Thu, 18 Sep 2014 23:57:49 +0000 (23:57 +0000)]
Merge "CameraService: Fix dump methods for two clients" into lmp-dev
Eino-Ville Talvala [Thu, 18 Sep 2014 22:52:02 +0000 (15:52 -0700)]
CameraService: Fix dump methods for two clients
Actually write dump text into the provided FD, and add a bit more
dump data into CameraDeviceClient.
Bug:
17570762
Change-Id: I37b1db85188855d4e89c8050c4b13f0d22e07e0c
Marco Nelissen [Thu, 18 Sep 2014 22:09:28 +0000 (15:09 -0700)]
Always consider first buffer to be config
for backwards compatibility. Also fix a problem where writing 0
bytes to an empty ringbuffer would treat it as overflowed.
Bug:
17567501
Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
Phil Burk [Thu, 18 Sep 2014 22:37:13 +0000 (22:37 +0000)]
Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" into lmp-dev
Jean-Michel Trivi [Thu, 18 Sep 2014 22:14:00 +0000 (22:14 +0000)]
Merge "AudioEffect acquires session" into lmp-dev
Jean-Michel Trivi [Thu, 18 Sep 2014 21:07:18 +0000 (14:07 -0700)]
AudioEffect acquires session
Currently, users of audio sessions, AudioTrack and AudioRecord,
are acquiring and releasing audio sessions according to their
life-cycle. AudioEffect instances were not counting as users
of an audio session. This caused an effect used on a session
to be purged by AudioFlinger::purgeStaleEffects_l() whenever
the last user of that session went away.
This CL makes AudioEffect acquire and release a session when
created and destroyed.
Bug
15432115
Change-Id: I922532150009988d43872f9b5928044a830ae0b3
Robert Shih [Thu, 18 Sep 2014 00:05:43 +0000 (00:05 +0000)]
Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-dev
Andy Hung [Wed, 17 Sep 2014 23:31:37 +0000 (23:31 +0000)]
Merge "NuPlayer: update timestamp handling" into lmp-dev
Lajos Molnar [Wed, 17 Sep 2014 23:15:59 +0000 (23:15 +0000)]
Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-dev
Lajos Molnar [Wed, 17 Sep 2014 23:15:27 +0000 (23:15 +0000)]
Merge "Fix AudioTrack offloaded timestamp handling." into lmp-dev
Andy Hung [Fri, 12 Sep 2014 21:43:11 +0000 (14:43 -0700)]
Fix AudioTrack offloaded timestamp handling.
getTimestamp for offloaded tracks now returns WOULD_BLOCK for
situations where the timestamp is unavailable due to the
previous track still flushing or the timestamp is stale.
It is fixed for normal playback conditions.
Bug:
14659809
Bug:
17428188
Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
Andy Hung [Fri, 12 Sep 2014 22:12:16 +0000 (15:12 -0700)]
NuPlayer: update timestamp handling
Use getTimestamp WOULD_BLOCK error return code to clean up
initial playback/start timestamp handling.
Account for pause time and seeks.
Only send notification from driver when the media time changes.
Bug:
14659809
Bug:
17428188
Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
Phil Burk [Wed, 17 Sep 2014 23:03:47 +0000 (16:03 -0700)]
mediaplayer: fix buffer aggregation when video has offloaded audio
Change conditional test so we don't accidentally do buffer aggregation
on video buffers.
Bug:
17553847
Change-Id: I746452b2e62db664315732a38f982ce7faf26212
Signed-off-by: Phil Burk <philburk@google.com>