OSDN Git Service
Lajos Molnar [Wed, 13 Nov 2013 23:57:41 +0000 (15:57 -0800)]
am
069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
* commit '
069bcc5084c3d8c6f9373a2890d40a0d1a36a94e':
AwesomePlayer: Improve performance on high-fps clips
Lajos Molnar [Wed, 13 Nov 2013 23:52:37 +0000 (23:52 +0000)]
Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
Marco Nelissen [Wed, 13 Nov 2013 18:22:11 +0000 (10:22 -0800)]
am
5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sniffing" into klp-dev
* commit '
5595f6de606f51ec61fbf40a269b52312507aded':
Only initialize sniffers once, don't hold mutex while sniffing
Marco Nelissen [Wed, 13 Nov 2013 18:11:54 +0000 (18:11 +0000)]
Merge "Only initialize sniffers once, don't hold mutex while sniffing" into klp-dev
Andreas Huber [Wed, 13 Nov 2013 18:11:52 +0000 (10:11 -0800)]
am
26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
* commit '
26c8f714361bfb6403a7c457adfb8b55c89a634a':
Ignore transport stream packets with the "transport_error_indicator" bit set
Andreas Huber [Wed, 13 Nov 2013 18:06:01 +0000 (18:06 +0000)]
Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
Adam Hampson [Wed, 13 Nov 2013 17:32:00 +0000 (09:32 -0800)]
am
56477eb7: am
27ae268a: am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
56477eb724972c2fe0441dfa7baaad00b7927add':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:25:33 +0000 (09:25 -0800)]
am
27ae268a: am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
27ae268af29b25d85f83aa34e92ac8b7f6c87c6f':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:21:33 +0000 (09:21 -0800)]
am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
00cb884fc870aba4052c8d187a45e4aec50a6b43':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:14:31 +0000 (17:14 +0000)]
Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
Lajos Molnar [Wed, 23 Oct 2013 22:19:47 +0000 (15:19 -0700)]
AwesomePlayer: Improve performance on high-fps clips
- Immediately retry rendering next frame after frame skip.
- Schedule next videoEvent based on the timestamp of the
next frame.
Change-Id: Ia106382c4c225321b682c1f7c2d126d7eab7d56d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11159147
Andreas Huber [Mon, 11 Nov 2013 21:35:39 +0000 (13:35 -0800)]
Ignore transport stream packets with the "transport_error_indicator" bit set
which indicates that they contain at least one bitstream error that was
unrecoverable.
Change-Id: I10665fd190194fdd2568175fe00b6063d3fc10a5
related-to-bug:
11537029
Andreas Huber [Tue, 12 Nov 2013 18:46:11 +0000 (10:46 -0800)]
am
22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev
* commit '
22990fe1ee3531e84dbadb7ff9ffd68d5bbe9060':
Back to the old way of making sure that no more buffers are submitted
Eino-Ville Talvala [Tue, 12 Nov 2013 18:42:49 +0000 (10:42 -0800)]
am
184dfe4e: Camera API2: Add support for partial result quirk
* commit '
184dfe4ea5e2ba33951bed2b1366007aee0ce3da':
Camera API2: Add support for partial result quirk
Andreas Huber [Tue, 12 Nov 2013 18:37:46 +0000 (18:37 +0000)]
Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev
Eino-Ville Talvala [Thu, 7 Nov 2013 23:13:16 +0000 (15:13 -0800)]
Camera API2: Add support for partial result quirk
- Camera3Device: Include requestId in partial 3A results
- FrameProcessorBase: Add support for partial result listeners
- CameraDeviceClient: Listen and forward partial results to client
Bug:
11115603
Change-Id: If1cc6bbc32932742ac142c058688761ebf6a8024
Andreas Huber [Tue, 12 Nov 2013 00:26:02 +0000 (16:26 -0800)]
am
caee8747: Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev
* commit '
caee8747b7df3b1119426594d4ba1c0e300ff6db':
configure bitrate and bitrate mode at encoder initialization for VP8/9
Andreas Huber [Tue, 12 Nov 2013 00:21:51 +0000 (00:21 +0000)]
Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev
Marco Nelissen [Wed, 6 Nov 2013 18:50:17 +0000 (10:50 -0800)]
Only initialize sniffers once, don't hold mutex while sniffing
b/
11482896
Change-Id: Ie036554b4c9e7e8863cb07901d414ea457f1b2f1
(cherry picked from commit
377fce69297a0e5b7c3b266a7602b17146785635)
Lajos Molnar [Mon, 11 Nov 2013 16:20:16 +0000 (08:20 -0800)]
am
e100b813: Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev
* commit '
e100b813c4d833b48b48b74100ad0b9a82c46954':
StageFrightRecorder: do not use meta-data mode for software encoders
Lajos Molnar [Mon, 11 Nov 2013 16:16:46 +0000 (16:16 +0000)]
Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev
Eric Laurent [Mon, 11 Nov 2013 00:25:19 +0000 (16:25 -0800)]
am
a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-dev
* commit '
a72911563b0e5b21b196d40249b53975bf8d8f85':
TimedEventQueue: improve wakelock management
Eric Laurent [Mon, 11 Nov 2013 00:21:16 +0000 (00:21 +0000)]
Merge "TimedEventQueue: improve wakelock management" into klp-dev
Andreas Huber [Fri, 8 Nov 2013 18:57:34 +0000 (10:57 -0800)]
Back to the old way of making sure that no more buffers are submitted
to the component while in executing->idle state.
Change-Id: Ia207f0a112025ed0e2c4d62f404afbbfa694cbab
related-to-bug:
11557463,
11573543
Andreas Huber [Fri, 8 Nov 2013 16:23:18 +0000 (08:23 -0800)]
am
51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" into klp-dev
* commit '
51ac2d6451b8614aaad83e5bd29ccb7a3fc4651c':
Properly handle executing->idle in GraphicBufferSource
Andreas Huber [Fri, 8 Nov 2013 16:19:35 +0000 (16:19 +0000)]
Merge "Properly handle executing->idle in GraphicBufferSource" into klp-dev
Andy McFadden [Fri, 8 Nov 2013 15:27:51 +0000 (07:27 -0800)]
am
5572b3af: Replace assert with error message
* commit '
5572b3afe3e63110ef9e6d228112ca7cbfac866b':
Replace assert with error message
Eric Laurent [Tue, 5 Nov 2013 00:08:15 +0000 (16:08 -0800)]
TimedEventQueue: improve wakelock management
Do not acquire a wakelock unless the event is delayed by more
than a given time. This prevents from acquiring/releasing
wakelocks too often which has adverse effects on performance.
Bug:
11509471.
Change-Id: Id06803b393b40c4db5095a6e7ec02339fa581a38
Andy McFadden [Thu, 7 Nov 2013 22:39:03 +0000 (14:39 -0800)]
Replace assert with error message
The failure happens when vendor code sends EMPTY_BUFFER_DONE
twice on the same buffer. The second time through, we see a slot
that has already been emptied, and get very confused.
This should be handled with an error, not an assertion, so we now
log a stern complaint and carry on.
Bug
11557463
Change-Id: I76e53ff08924bca81afb6980df8e59a6012ff8fe
Andreas Huber [Thu, 7 Nov 2013 19:13:27 +0000 (11:13 -0800)]
Properly handle executing->idle in GraphicBufferSource
ACodec has initiated the transition from exectuing->idle and is waiting
for the component to return all buffers so they can be freed.
It's counter productive and with some vendors harmful to submit additional
buffers to the component from this point on.
Change-Id: I332be254a1faf94902c77b5792a373ab447e44d3
related-to-bug:
11573543
Eino-Ville Talvala [Thu, 7 Nov 2013 02:41:13 +0000 (18:41 -0800)]
am
fd6ecdd3: Camera HAL3/API1: Add support for the partial result quirk.
* commit '
fd6ecdd39bd83ea020f78b425e96310380d66c35':
Camera HAL3/API1: Add support for the partial result quirk.
Eino-Ville Talvala [Fri, 11 Oct 2013 16:51:09 +0000 (09:51 -0700)]
Camera HAL3/API1: Add support for the partial result quirk.
- Camera2Client:
- Detect partial result quirk
- Camera3Device:
- Accumulate all partial results together
- Fire off 3A-only result once all 3A states are available
- FrameProcessorBase:
- Filter out partials, don't send to listeners
- FrameProcessor:
- Skip face detect on partials
- Make sure to only handle a 3A update for a given frame once
- Trigger AF notifications when AF mode or trigger changes, to
properly detect all AF transitions.
Bug:
11115603
Change-Id: Iea8aa73c568701562a46071f7ea100624251d10b
Eric Laurent [Wed, 6 Nov 2013 17:35:00 +0000 (09:35 -0800)]
am
48b6cd98: Merge "audioflinger: fix direct output underrun" into klp-dev
* commit '
48b6cd98b23b2cf9dee88f075f7575ecb5aaf545':
audioflinger: fix direct output underrun
Eric Laurent [Wed, 6 Nov 2013 17:29:58 +0000 (17:29 +0000)]
Merge "audioflinger: fix direct output underrun" into klp-dev
Eric Laurent [Wed, 6 Nov 2013 02:22:08 +0000 (18:22 -0800)]
audioflinger: fix direct output underrun
Underruns on tracks handled by a direct or offloaded
threads were not properly reported to the applications
causing a failure to automatically recover.
Bug:
11535001.
Change-Id: I7a8696b4d646f78b16710addfe7c108d0dd0038d
Andreas Huber [Tue, 5 Nov 2013 20:36:17 +0000 (12:36 -0800)]
configure bitrate and bitrate mode at encoder initialization for VP8/9
Change-Id: I0389264db4102cabb0c6fcb4ca223d85cc9e86fb
related-to-bug:
11536167
Marco Nelissen [Tue, 5 Nov 2013 05:54:06 +0000 (21:54 -0800)]
am
f8a1169d: Merge "Notify current video size if available" into klp-dev
* commit '
f8a1169d98a09d1473f289c363353d08301576f6':
Notify current video size if available
Lajos Molnar [Tue, 5 Nov 2013 05:53:21 +0000 (21:53 -0800)]
am
065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev
* commit '
065789f24890b0a9f3614dc175e6f7664af1f2ce':
Restore NuPlayer error and EOS handling
Marco Nelissen [Mon, 4 Nov 2013 17:42:11 +0000 (17:42 +0000)]
Merge "Notify current video size if available" into klp-dev
Lajos Molnar [Fri, 1 Nov 2013 23:17:47 +0000 (23:17 +0000)]
Merge "Restore NuPlayer error and EOS handling" into klp-dev
Marco Nelissen [Fri, 1 Nov 2013 17:33:18 +0000 (10:33 -0700)]
Notify current video size if available
b/
11248101
Change-Id: I0fa3b5592efcf400c86692002267da6825e331ad
Eric Laurent [Thu, 31 Oct 2013 22:36:49 +0000 (15:36 -0700)]
am
5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
* commit '
5c7ffaed6f04b844c2e4e2024bfb0203ac2233dd':
AudioFlinger: fix duplicating thread standby.
Eric Laurent [Thu, 31 Oct 2013 22:29:50 +0000 (22:29 +0000)]
Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
Eric Laurent [Wed, 30 Oct 2013 23:57:06 +0000 (16:57 -0700)]
AudioFlinger: fix duplicating thread standby.
Commit
fd47797 fixing issue
11247103 introduced a regression
where the duplicating thread does not exit standby state as
expected. This in turn prevents the tracks sending audio to
other threads to complete their activity cycle normally.
The fix conists in clearing mStandby state also in the specialized
threadLoop_write() method of DuplicatingThread subclass.
Bug:
11451415.
Change-Id: Ie8a92c819a56a2834ea25fa70a8b7b2125721775
Igor Murashkin [Wed, 30 Oct 2013 21:16:18 +0000 (14:16 -0700)]
am
3ff5792a: Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
* commit '
3ff5792adfdbf67662a5f8064315a55690d53944':
camera: Collect stack traces when bad things happen, print with dumpsys
Igor Murashkin [Wed, 30 Oct 2013 21:09:49 +0000 (21:09 +0000)]
Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
Lajos Molnar [Mon, 28 Oct 2013 21:59:21 +0000 (14:59 -0700)]
Restore NuPlayer error and EOS handling
This was erroneously removed by commit
a73c954
Change-Id: I4742339139e770f0181c99d427875897fd60b68e
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11413439
Lajos Molnar [Wed, 30 Oct 2013 20:26:53 +0000 (13:26 -0700)]
am
c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
* commit '
c76b9f52cf4e39f6943c53f5b3657dfee65857ac':
AwesomePlayer: ensure STARTED message works after reset
Lajos Molnar [Wed, 30 Oct 2013 20:23:17 +0000 (20:23 +0000)]
Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
Lajos Molnar [Wed, 30 Oct 2013 17:02:12 +0000 (10:02 -0700)]
StageFrightRecorder: do not use meta-data mode for software encoders
Camera HAL v1 uses vendor-specific camera-source meta-data mode, but
software encoders use generic gralloc-source mode, so they are not
compatible.
Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11446505
Lajos Molnar [Wed, 30 Oct 2013 01:31:05 +0000 (18:31 -0700)]
am
eb76f318: am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
eb76f318e9daf91dbf195bcb74852b3bd736a32a':
avcenc: Prepend startcodes to output buffers
Eric Laurent [Wed, 30 Oct 2013 01:17:46 +0000 (18:17 -0700)]
am
1c594b63: Merge "audioflinger: enable effects after registration if needed" into klp-dev
* commit '
1c594b637df26499ce1dae2db34f2b3290efd838':
audioflinger: enable effects after registration if needed
Eric Laurent [Wed, 30 Oct 2013 01:13:52 +0000 (01:13 +0000)]
Merge "audioflinger: enable effects after registration if needed" into klp-dev
Lajos Molnar [Tue, 29 Oct 2013 22:41:50 +0000 (15:41 -0700)]
am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
96aed4fb18e5303b039cc7e5dc252e0827491d09':
avcenc: Prepend startcodes to output buffers
Lajos Molnar [Tue, 29 Oct 2013 22:39:25 +0000 (22:39 +0000)]
Merge "avcenc: Prepend startcodes to output buffers"
Igor Murashkin [Wed, 23 Oct 2013 23:40:06 +0000 (16:40 -0700)]
camera: Collect stack traces when bad things happen, print with dumpsys
Bug:
11324229
Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
Eric Laurent [Tue, 29 Oct 2013 00:17:03 +0000 (17:17 -0700)]
am
fd477974: AudioFlinger: more fixes for offload audio lost
* commit '
fd4779740ec3e9e865d5514464df26d015354388':
AudioFlinger: more fixes for offload audio lost
Lajos Molnar [Mon, 28 Oct 2013 22:01:15 +0000 (15:01 -0700)]
AwesomePlayer: ensure STARTED message works after reset
Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11412881
Eric Laurent [Sat, 26 Oct 2013 01:10:40 +0000 (18:10 -0700)]
AudioFlinger: more fixes for offload audio lost
mStandby being false was not a reliable indication that
something had been written to audio HAL.
Considering the last track in mActiveTracks vector as the
latest activated track was wrong as this is a SortedVector.
Bug:
11247103.
Change-Id: I397d011c5afcdd779def3fe25aaae7669a472cfc
Marco Nelissen [Sat, 26 Oct 2013 15:32:50 +0000 (08:32 -0700)]
am
9cae2170: Assign blame for playback wakelocks.
* commit '
9cae217050aa1347d4ac5053c305754879e3f97f':
Assign blame for playback wakelocks.
Marco Nelissen [Mon, 14 Jan 2013 22:12:05 +0000 (14:12 -0800)]
Assign blame for playback wakelocks.
Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.
Cherrypicked from master.
b/
9464621
Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
Andy McFadden [Thu, 24 Oct 2013 17:45:06 +0000 (10:45 -0700)]
am
be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev
* commit '
be567be3f92026f5964c1c9ecce00e30bb7df412':
Check for NULL buffer in repeat-latest
Andy McFadden [Thu, 24 Oct 2013 17:35:43 +0000 (17:35 +0000)]
Merge "Check for NULL buffer in repeat-latest" into klp-dev
Andy McFadden [Wed, 23 Oct 2013 20:39:43 +0000 (13:39 -0700)]
Check for NULL buffer in repeat-latest
Repeating the most-recent buffer appears to fail when the producer
disconnects. This adds a NULL check to avoid crashing.
Bug
10607920
Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
Vineeta Srivastava [Wed, 23 Oct 2013 20:02:58 +0000 (13:02 -0700)]
am
f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
* commit '
f3a6234ba21640cf2bc893dbcb98fb9b0fa47481':
Fix kAutoRampDurationUs overflow issue
Vineeta Srivastava [Wed, 23 Oct 2013 19:58:15 +0000 (19:58 +0000)]
Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
Elliott Hughes [Wed, 23 Oct 2013 17:30:40 +0000 (10:30 -0700)]
am
e7329bd5: am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
e7329bd564e7c5f671b786dc7d0cc684d6d11fca':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:25:57 +0000 (10:25 -0700)]
am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
d5255d1de125d15afae6cfc35701a5255b5e2933':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:22:43 +0000 (17:22 +0000)]
Merge "If dlopen("libwvm.so") fails, log the reason why."
Elliott Hughes [Wed, 23 Oct 2013 17:03:20 +0000 (10:03 -0700)]
If dlopen("libwvm.so") fails, log the reason why.
Bug:
11342992
Change-Id: I99986b6181df6d7615fdc1520d2edaadaccd9bb4
Nick Kralevich [Sun, 20 Oct 2013 16:34:04 +0000 (09:34 -0700)]
am
9857473f: am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
9857473f48abf1333ddd3454ab3c916b4e69daa4':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:31:32 +0000 (09:31 -0700)]
am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
0f4b0d238613cd98fe0b8931f7e6cbcc8b9ad7b1':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:28:47 +0000 (16:28 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergydev [Sun, 20 Oct 2013 05:51:33 +0000 (22:51 -0700)]
libeffects: do not use GNU old-style field designators
Not using a GNU extension improves portability
Change-Id: I4e8a0376c089828ca4fc7f1aaf3914bfd917d4c5
Nick Kralevich [Sat, 19 Oct 2013 02:32:44 +0000 (19:32 -0700)]
am
998c4e88: am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
998c4e88f962336472c5e1c3afbf0ed8d6d3a971':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:30:45 +0000 (19:30 -0700)]
am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
0219856e5e45c0bdd20f2199297ec92f11f0875f':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:28:09 +0000 (02:28 +0000)]
Merge "libvideoeditor: fix M4OSA_Clock header guard"
synergydev [Sat, 19 Oct 2013 02:20:59 +0000 (19:20 -0700)]
libvideoeditor: fix M4OSA_Clock header guard
CLOCK was mispelled as CLOCH
Change-Id: Ie7163fc8723d7a5b9df113f55a4a550e5465d9b5
Glenn Kasten [Fri, 18 Oct 2013 22:06:37 +0000 (15:06 -0700)]
am
95c03858: Merge "Allow releaseBuffer after flush" into klp-dev
* commit '
95c03858e2ab4fb693a2bfe47b3caa806e43c044':
Allow releaseBuffer after flush
Glenn Kasten [Fri, 18 Oct 2013 22:02:46 +0000 (22:02 +0000)]
Merge "Allow releaseBuffer after flush" into klp-dev
Vineeta Srivastava [Thu, 17 Oct 2013 21:23:00 +0000 (14:23 -0700)]
Fix kAutoRampDurationUs overflow issue
When kAutoRampDurationUs multiplies with mSampleRate, it overflows to int64.
Type cast it to int64 to make sure RampDurationUs properly.
BUg:
11162491
Change-Id: I4f93bc9acc8456e25623a9255ca7a5b206425009
Glenn Kasten [Fri, 18 Oct 2013 20:00:29 +0000 (13:00 -0700)]
Allow releaseBuffer after flush
After AudioTrack start checks for pending flush,
allow releaseBuffer on any previously obtained buffer.
For example, this can happen if the resampler has obtained
a buffer but not released the whole buffer yet.
Note that the resampler will be reading obsolete data.
Bug:
11285590
Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
Eric Laurent [Fri, 18 Oct 2013 20:00:04 +0000 (13:00 -0700)]
am
6a51d7ed: audioflinger: fix track terminated before playing
* commit '
6a51d7ed7062536ccc892c8850a34ed55cbc8d5c':
audioflinger: fix track terminated before playing
Eric Laurent [Fri, 18 Oct 2013 01:59:26 +0000 (18:59 -0700)]
audioflinger: fix track terminated before playing
When a track is terminated before any audio was written,
we should not send a drain request to the HAL. The drain
will be ignored and we will wait the async callback for ever.
Also fix a potential deadlock by not deleting a track with the
thread mutex held: mPreviousTrack changed from a sp to a raw pointer.
Bug:
11247103.
Change-Id: I0a4b47b099204c7c326d45d700234ab8f72d8eae
Glenn Kasten [Thu, 17 Oct 2013 23:19:44 +0000 (16:19 -0700)]
am
dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev
* commit '
dedc7b0fa23c21b525dc8abb572bb8161ad66a9b':
Fix flush() followed by start()
Glenn Kasten [Thu, 17 Oct 2013 23:12:05 +0000 (23:12 +0000)]
Merge "Fix flush() followed by start()" into klp-dev
Andreas Huber [Thu, 17 Oct 2013 21:16:43 +0000 (14:16 -0700)]
am
6fa20187: Make sure we get to discover that the cache is sufficiently full again
* commit '
6fa20187e4cf9ace5692979a84741484f19e3f57':
Make sure we get to discover that the cache is sufficiently full again
Andreas Huber [Thu, 17 Oct 2013 20:24:42 +0000 (13:24 -0700)]
Make sure we get to discover that the cache is sufficiently full again
by posting buffering events while in the CACHE_UNDERRUN state.
Change-Id: Ic60c8d57f0ae502aa2b6eec7160dc4224b989604
related-to-bug:
11262689
Glenn Kasten [Thu, 17 Oct 2013 18:32:39 +0000 (11:32 -0700)]
Fix flush() followed by start()
Bug:
11259166
Change-Id: I72526cdfd4e3ff4b06e6a317e577f57cc285205d
Glenn Kasten [Thu, 17 Oct 2013 01:07:33 +0000 (18:07 -0700)]
am
f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit '
f8f15b05fe051009945c9042a1a9260280e0feb2':
Fix race condition in AudioTrack::pause followed by start
Glenn Kasten [Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)]
Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
787c0d04: merge in klp-release (no-op)
* commit '
787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da':
Camera: Skip AE precapture when possible
Cleanup openRecord error handling
TimedEventQueue takes a wake lock
fix offload audio effect proxy implementation uuid
MediaCodecInfo: report supported color formats for non-native-window mode
Camera2 API: Hack: Always use async mode with GLConsumer
AudioTrack: fix music resume
Zhijun He [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit '
3defdab829de7df3a343393b2b277e99d071744c':
Camera: don't do hw support check for ZSL
Ed Heyl [Thu, 17 Oct 2013 00:42:20 +0000 (17:42 -0700)]
merge in klp-release (no-op)
Glenn Kasten [Thu, 17 Oct 2013 00:02:13 +0000 (17:02 -0700)]
Fix race condition in AudioTrack::pause followed by start
Bug:
11148722
Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
Zhijun He [Wed, 16 Oct 2013 22:47:47 +0000 (22:47 +0000)]
Merge "Camera: don't do hw support check for ZSL" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:35:35 +0000 (15:35 -0700)]
am
120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '
120a88471a607c85c4d60300d73c3be0a1e8f8c8':
AudioTrack: fix head position after restore
Eric Laurent [Wed, 16 Oct 2013 22:28:33 +0000 (22:28 +0000)]
Merge "AudioTrack: fix head position after restore" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:26:52 +0000 (15:26 -0700)]
am
d5766875: AwesomePlayer: fix concurrent pause and teardown
* commit '
d576687570f19f3956d91c1d3da10d965e34c407':
AwesomePlayer: fix concurrent pause and teardown
Eric Laurent [Wed, 16 Oct 2013 22:12:32 +0000 (15:12 -0700)]
AudioTrack: fix head position after restore
The head position transfered to the new track
by restoreTrack_l() must take into account the frames that
are dropped from the old track to avoid a non recoverable
offset in the playback head position returned to applications.
Bug:
11230062.
Change-Id: I51143a08b95e8f264ed709ae2054360315f2b8b1