OSDN Git Service
Eino-Ville Talvala [Thu, 14 Nov 2013 23:49:21 +0000 (15:49 -0800)]
am
0f1ecc2e: am
d8a62e25: Camera2: Rework the FPS range vs. FPS single setting detection
* commit '
0f1ecc2e2ff84144d5293f7f79ba895538d27f9b':
Camera2: Rework the FPS range vs. FPS single setting detection
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:49:40 +0000 (08:49 -0800)]
am
307aa870: am
4215e616: Merge "audioflinger: fix offload track transition" into klp-dev
* commit '
307aa87038017dff8ae1dd0262c0ff87723894d7':
audioflinger: fix offload track transition
Eric Laurent [Thu, 14 Nov 2013 16:49:39 +0000 (08:49 -0800)]
am
b50fa77b: am
9f357f31: Merge "audioflinger: fix offload resume after drain" into klp-dev
* commit '
b50fa77b2cc7dadae1b8ebb591d42976879ac43c':
audioflinger: fix offload resume after drain
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 [Thu, 14 Nov 2013 02:47:48 +0000 (18:47 -0800)]
am
ec89a75e: am
92092b39: Merge "stagefright: limit default max-input-size for AVC" into klp-dev
* commit '
ec89a75e386c61cf4ace3bc5ab80d064562ebf11':
stagefright: limit default max-input-size for AVC
Lajos Molnar [Thu, 14 Nov 2013 02:47:47 +0000 (18:47 -0800)]
am
47afcc5f: am
069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
* commit '
47afcc5f5fb94263977717bd12433d594fbbc43f':
AwesomePlayer: Improve performance on high-fps clips
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:27:13 +0000 (10:27 -0800)]
am
0e0278e3: am
5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sniffing" into klp-dev
* commit '
0e0278e333aab7c87ae4d264d8ad1ab38c8b9b56':
Only initialize sniffers once, don't hold mutex while sniffing
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
Andreas Huber [Wed, 13 Nov 2013 18:16:53 +0000 (10:16 -0800)]
am
5274e21e: am
26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
* commit '
5274e21ea6d9e8009c13817d75f9423735964700':
Ignore transport stream packets with the "transport_error_indicator" bit set
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:35:30 +0000 (09:35 -0800)]
am
728549e3: am
56477eb7: am
27ae268a: am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
728549e39be9b8fcc701ef0f4623bc50d8726bd7':
StageFright: Removes hacks for Nvidia MPEG2 decoder
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:51:39 +0000 (10:51 -0800)]
am
073dec19: am
22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev
* commit '
073dec19db486290a02d9952e392df9cda5700ad':
Back to the old way of making sure that no more buffers are submitted
Eino-Ville Talvala [Tue, 12 Nov 2013 18:48:12 +0000 (10:48 -0800)]
am
5c2379fd: am
184dfe4e: Camera API2: Add support for partial result quirk
* commit '
5c2379fdf93029c683c8bcf41b7b663b9940c921':
Camera API2: Add support for partial result quirk
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 04:52:05 +0000 (20:52 -0800)]
am
db50cb5f: am
caee8747: Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev
* commit '
db50cb5f7ae6d2beacd8a4fa4a8991035b3c88e7':
configure bitrate and bitrate mode at encoder initialization for VP8/9
Lajos Molnar [Tue, 12 Nov 2013 04:50:31 +0000 (20:50 -0800)]
am
cc5aeced: am
e100b813: Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev
* commit '
cc5aeced30609326c7495eca1286163af3933fe1':
StageFrightRecorder: do not use meta-data mode for software encoders
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
Robert Shih [Tue, 12 Nov 2013 00:20:46 +0000 (00:20 +0000)]
Merge "Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType."
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)
Eric Laurent [Mon, 11 Nov 2013 23:23:23 +0000 (15:23 -0800)]
am
5b5f76dc: am
a7291156: Merge "TimedEventQueue: improve wakelock management" into klp-dev
* commit '
5b5f76dcb29792830baca1f25e51a732b80241df':
TimedEventQueue: improve wakelock management
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
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
Robert Shih [Fri, 8 Nov 2013 22:37:33 +0000 (14:37 -0800)]
Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.
Bug:
11534051
Change-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5
Glenn Kasten [Fri, 8 Nov 2013 22:26:14 +0000 (14:26 -0800)]
Fix build
Change-Id: I1ecccada22047d9c828152a53ad68b5599ff8827
Glenn Kasten [Fri, 8 Nov 2013 22:03:49 +0000 (22:03 +0000)]
Merge "Pull HAL reads out of RecordThread resample"
Glenn Kasten [Fri, 8 Nov 2013 22:02:46 +0000 (22:02 +0000)]
Merge "Remove default channel mask for AudioTrack"
Glenn Kasten [Mon, 19 Aug 2013 19:09:05 +0000 (12:09 -0700)]
Pull HAL reads out of RecordThread resample
Previously, the resample was indirectly calling HAL read
from within the BufferProvider's getNextBuffer. Now the HAL
read is done ahead of time into a circular buffer,
and the getNextBuffer just reads out of that memory.
This change will permit some future planned features.
Also removed the mono to mono resampling optimization,
as that optimization will no longer be valid in the future.
Change-Id: I59f5016a2df91078d697c37a7dec2d9d9f44542e
Glenn Kasten [Wed, 30 Oct 2013 18:29:27 +0000 (11:29 -0700)]
Remove default channel mask for AudioTrack
It doesn't make sense to have a default channel mask, since the caller
needs to know what format it will use when supplying data, and there
is currently no API to return the channel mask of an AudioTrack.
audio_is_output_channel() does not allow 0, so it will catch any
stragglers (I'm not aware of any).
Also move channel mask validation earlier.
Change-Id: Ia018ded8711455581a2a935f37432b049422d492
Glenn Kasten [Fri, 8 Nov 2013 19:19:00 +0000 (19:19 +0000)]
Merge "Channel counts are uint32_t"
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:25:32 +0000 (08:25 -0800)]
am
86f79f23: am
51ac2d64: Merge "Properly handle executing->idle in GraphicBufferSource" into klp-dev
* commit '
86f79f2332efad4862a4dd56f9552c93bbb52bcf':
Properly handle executing->idle in GraphicBufferSource
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:30:05 +0000 (07:30 -0800)]
am
2e496677: am
5572b3af: Replace assert with error message
* commit '
2e496677be678f5201d0e6c3712c664dd60502d9':
Replace assert with error message
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:44:05 +0000 (18:44 -0800)]
am
d9d8b7b6: am
fd6ecdd3: Camera HAL3/API1: Add support for the partial result quirk.
* commit '
d9d8b7b63514ceea143968b3f114c52755dda9ef':
Camera HAL3/API1: Add support for the partial result quirk.
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
Glenn Kasten [Tue, 20 Aug 2013 01:45:42 +0000 (18:45 -0700)]
Channel counts are uint32_t
Change-Id: I5676b6a291b72d7db6326f7eaf6d17588de51b05
Glenn Kasten [Wed, 6 Nov 2013 23:34:09 +0000 (23:34 +0000)]
Merge "Rename standby methods"
Glenn Kasten [Wed, 30 Oct 2013 21:37:29 +0000 (14:37 -0700)]
Simplify track 'needs' bits
Use more standard coding convention for bit masks,
and add a FIXME about max channel count.
Change-Id: I856784016703417ee480b92ae73757c472f9cf95
Glenn Kasten [Wed, 30 Oct 2013 21:36:47 +0000 (14:36 -0700)]
Remove redundant this->
Change-Id: Id783201e802b6ce294fa92f4bbe492adfb446686
Glenn Kasten [Wed, 30 Oct 2013 21:37:10 +0000 (14:37 -0700)]
Remove dead code
Change-Id: Ide9196aa348cd3846b5c71d51fe6538f38ea8dc2
Glenn Kasten [Wed, 6 Nov 2013 22:06:58 +0000 (22:06 +0000)]
Merge "Fix race condition in initializing downmix"
Changwan Ryu [Wed, 6 Nov 2013 18:48:03 +0000 (18:48 +0000)]
Merge "Support TS + AC3 for ATSC standard"
Changwan Ryu [Wed, 6 Nov 2013 18:44:46 +0000 (18:44 +0000)]
Merge "Support AC3 in stagefright"
Glenn Kasten [Wed, 30 Oct 2013 21:37:01 +0000 (14:37 -0700)]
Fix race condition in initializing downmix
The code that initializes downmix GUID searches for an effect of
the right type. If two or more AudioMixers are created, there is a
possibility that the GUID will temporarily have the wrong value.
Now the initialization is only done once, regardless of how many
AudioMixers there are.
Other minor changes:
- use naming convention of leading 's' for static member variables
- log message for no downmix effect is now a warning instead of an error,
since it is not an error until there is actual content to downmix
without a downmix effect
Change-Id: I33ab0e51cf9d24ecaf8ae868883736b0772178c4
Glenn Kasten [Wed, 6 Nov 2013 17:51:46 +0000 (17:51 +0000)]
Merge "Move local declarations to point of first use"
Eric Laurent [Wed, 6 Nov 2013 17:46:53 +0000 (09:46 -0800)]
am
44dc9155: am
48b6cd98: Merge "audioflinger: fix direct output underrun" into klp-dev
* commit '
44dc91554521eaab478674a7f812cb8a4fa4f809':
audioflinger: fix direct output underrun
Glenn Kasten [Wed, 6 Nov 2013 17:38:02 +0000 (17:38 +0000)]
Merge "Rename TrackPaused to trackPaused"
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
Glenn Kasten [Wed, 6 Nov 2013 17:13:15 +0000 (17:13 +0000)]
Merge "Use const more places"
Glenn Kasten [Wed, 6 Nov 2013 16:34:32 +0000 (16:34 +0000)]
Merge "Clean up channel mask handling"
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
Changwan Ryu [Mon, 28 Oct 2013 02:08:44 +0000 (11:08 +0900)]
Support TS + AC3 for ATSC standard
Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
Changwan Ryu [Mon, 28 Oct 2013 01:53:48 +0000 (10:53 +0900)]
Support AC3 in stagefright
Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
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:59:12 +0000 (21:59 -0800)]
am
92168885: am
f8a1169d: Merge "Notify current video size if available" into klp-dev
* commit '
921688852b72bfa921913b8afe18c0d749c6797d':
Notify current video size if available
Lajos Molnar [Tue, 5 Nov 2013 05:59:11 +0000 (21:59 -0800)]
am
2922d230: am
065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev
* commit '
2922d230155cb1be7acc0c11bef6f0ca0345bdb7':
Restore NuPlayer error and EOS handling
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
Glenn Kasten [Mon, 19 Aug 2013 15:40:07 +0000 (08:40 -0700)]
Rename standby methods
ThreadBase::standby() returns the value of mStandby.
RecordThread::standby() "overrode" ThreadBase::standby(), but with a
different meaning and no return value. This meant you couldn't
access the parent's class definition within RecordThread.
This could be confusing, so this CL renames RecordThread::standby()
to standbyIfNotAlreadyInStandby().
Change-Id: I9196ee12701dd2dccdfaed922af2d7b8e8774676
Glenn Kasten [Mon, 19 Aug 2013 15:40:21 +0000 (08:40 -0700)]
Move local declarations to point of first use
Change-Id: I8a078386e371caab5174fc07b47f48fb9f21609a
Glenn Kasten [Mon, 19 Aug 2013 16:58:50 +0000 (09:58 -0700)]
Rename TrackPaused to trackPaused
Change-Id: I3b38e0c9a6bbb6e18cb5b1f72670139a3071cb8f
Glenn Kasten [Mon, 19 Aug 2013 19:03:11 +0000 (12:03 -0700)]
Use const more places
Change-Id: Ibc068d319d6fff26f2d11248e17481d8f7f027e0
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:39:14 +0000 (15:39 -0700)]
am
4cf799fb: am
5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
* commit '
4cf799fbbb74de102d34ccb014ba7fbd9bfa5e14':
AudioFlinger: fix duplicating thread standby.