OSDN Git Service
The Android Open Source Project [Thu, 5 Dec 2013 20:38:14 +0000 (12:38 -0800)]
Marco Nelissen [Thu, 28 Nov 2013 17:26:16 +0000 (17:26 +0000)]
Merge "NuPlayer: Use a software renderer when using software codecs"
Marco Nelissen [Tue, 26 Nov 2013 02:10:18 +0000 (02:10 +0000)]
Merge "Fix SIGABRT when playing mp4 file"
Marco Nelissen [Mon, 25 Nov 2013 16:39:56 +0000 (08:39 -0800)]
Fix SIGABRT when playing mp4 file
If the track duration was shorter than the segment duration, the calculated
encoder padding would be negative, resulting in a crash.
b/
11823061
https://code.google.com/p/android/issues/detail?id=62610
Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
Marco Nelissen [Mon, 25 Nov 2013 16:34:06 +0000 (16:34 +0000)]
Merge "Fixed data offset at parsing IPMP Descriptors"
Ichitaro Kohara [Thu, 6 Jun 2013 03:19:17 +0000 (12:19 +0900)]
Fixed data offset at parsing IPMP Descriptors
MPEG4Extractor::parseDrmSINF() miscalculated data offset in parsing
IPMP Descriptors. This commit makes it to take in 2 bytes which is
the size of IPMPS_Type field.
Change-Id: I42cbb6793af9d9b2f14dbfdd7a616096002793f9
The Android Open Source Project [Fri, 22 Nov 2013 18:35:20 +0000 (10:35 -0800)]
Marco Nelissen [Fri, 15 Nov 2013 22:21:32 +0000 (14:21 -0800)]
am
24605338: Merge "Fix metadata access" into klp-dev
* commit '
246053380a9f628405a29a055a3f1f4fba13ed5b':
Fix metadata access
Marco Nelissen [Fri, 15 Nov 2013 21:58:45 +0000 (21:58 +0000)]
Merge "Fix metadata access" into klp-dev
Marco Nelissen [Fri, 15 Nov 2013 21:49:58 +0000 (13:49 -0800)]
Fix metadata access
Metadata string pointers become invalid after setting more metadata,
so don't cache them.
b/
11692062
Change-Id: Iaf1afb24cf53f7fa36f49ce759355693494076e5
Eric Laurent [Fri, 15 Nov 2013 21:09:54 +0000 (13:09 -0800)]
am
d7e59228: audioflinger: do not use raw pointer for tracks
* commit '
d7e59228caad3867794d847f6bf163c6495e9506':
audioflinger: do not use raw pointer for tracks
Eric Laurent [Fri, 15 Nov 2013 20:02:28 +0000 (12:02 -0800)]
audioflinger: do not use raw pointer for tracks
Commit
9da3d95 surfaced a problem caused by the use of a raw
pointer to a track in offload thread implementation.
Pointers to tracks should always be weak or strong pointers.
Bug:
11708529.
Change-Id: Ic48632532d186c9be8261f73cefdf824b9fbbd2b
Eric Laurent [Fri, 15 Nov 2013 16:25:13 +0000 (08:25 -0800)]
am
7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev
* commit '
7dae71d606ded1dbc2aa9733c3d98ffac57988f2':
AwesomePlayer: correct stream type for offload
Eric Laurent [Fri, 15 Nov 2013 15:34:11 +0000 (15:34 +0000)]
Merge "AwesomePlayer: correct stream type for offload" into klp-dev
Eric Laurent [Fri, 15 Nov 2013 01:28:47 +0000 (17:28 -0800)]
AwesomePlayer: correct stream type for offload
canOffloadStream() function in stagefright utils forces the
stream type to AUDIO_STREAM_MUSIC when querying the audio policy
manager if a particular track is offloadable or not.
This causes MP3 ringtones to be offloaded which is not a validated use case.
The fix consists in using the actual stream type read from the AudioSink.
Bug:
11410937.
Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
Eino-Ville Talvala [Thu, 14 Nov 2013 23:44:42 +0000 (15:44 -0800)]
am
d8a62e25: Camera2: Rework the FPS range vs. FPS single setting detection
* commit '
d8a62e25ba6520c2531c7a3d32cc8066e1dab776':
Camera2: Rework the FPS range vs. FPS single setting detection
Eino-Ville Talvala [Thu, 14 Nov 2013 18:32:13 +0000 (10:32 -0800)]
Camera2: Rework the FPS range vs. FPS single setting detection
Give up on current approach of writing out consistent FPS values
into parameters that will be read back by the app.
- Preserve app's latest set parameters exactly, and compare against
them when detecting if a new FPS range or single FPS value has been
selected.
- Since get() returns exactly what was set(), it doesn't matter if the
app calls getParameters() before its next setParameters(), in terms
of retriggering FPS selection logic. Before, the behavior varied
depending on whether the app re-read the parameters.
- As before, if app changes both range and single FPS in a single set
call, the range set wins. Otherwise, the value that has changed more
recently is used.
Bug:
11570973
Change-Id: I72b5e60c3f60e88d55127dd1bda87e26eaf929c6
Eric Laurent [Thu, 14 Nov 2013 16:47:42 +0000 (08:47 -0800)]
am
4215e616: Merge "audioflinger: fix offload track transition" into klp-dev
* commit '
4215e6166fca9f87a6e9e848b3dfd4ab0d25c954':
audioflinger: fix offload track transition
Eric Laurent [Thu, 14 Nov 2013 16:47:42 +0000 (08:47 -0800)]
am
9f357f31: Merge "audioflinger: fix offload resume after drain" into klp-dev
* commit '
9f357f319205d52c04a2c8b5cc9d518ddcfdea94':
audioflinger: fix offload resume after drain
Eric Laurent [Thu, 14 Nov 2013 16:43:19 +0000 (16:43 +0000)]
Merge "audioflinger: fix offload track transition" into klp-dev
Eric Laurent [Thu, 14 Nov 2013 16:42:30 +0000 (16:42 +0000)]
Merge "audioflinger: fix offload resume after drain" into klp-dev
Lajos Molnar [Wed, 13 Nov 2013 23:57:42 +0000 (15:57 -0800)]
am
92092b39: Merge "stagefright: limit default max-input-size for AVC" into klp-dev
* commit '
92092b395d59e8943a461d344f617f1dc85375a3':
stagefright: limit default max-input-size for AVC
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:53:42 +0000 (23:53 +0000)]
Merge "stagefright: limit default max-input-size for AVC" into klp-dev
Lajos Molnar [Wed, 13 Nov 2013 23:52:37 +0000 (23:52 +0000)]
Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
Lajos Molnar [Wed, 13 Nov 2013 22:11:41 +0000 (14:11 -0800)]
stagefright: limit default max-input-size for AVC
AVC has a compression ratio of at least 2. Account for this, as
some codecs refuse exorbitant max-input-size requests.
Change-Id: Ib68b485879ba33a12a486f2ce18fe100be977699
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11599364
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
Eric Laurent [Wed, 13 Nov 2013 03:25:43 +0000 (19:25 -0800)]
audioflinger: fix offload track transition
Make sure that when transitioning from one active
offloaded track to the next we flush DSP content
if both tracks are not on the same audio session.
This happens when switching between two applications
playing the same type of content (e.g MP3, stereo, 44.1).
In this case, we reuse the same output thread because the track
formats are compatible.
Bug:
11247103.
Change-Id: I2b9031591149adeb70766da5e0d21ff2933a37e8
Eric Laurent [Wed, 13 Nov 2013 03:10:17 +0000 (19:10 -0800)]
audioflinger: fix offload resume after drain
When pausing and resuming during the drain,
the drain sequence number shuold not be modified
otherwise the drain callback will be ignored.
This causes failure to notify end of stream to audio
player and transition to next song.
Bug:
11247103.
Change-Id: I2a35c5cc3fd6aa667cdd257f9e9cc8715cef5159
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