OSDN Git Service
Andreas Huber [Wed, 12 Sep 2012 23:25:14 +0000 (16:25 -0700)]
Various improvements to cleanly shutdown a wfd session.
Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
Andreas Huber [Wed, 12 Sep 2012 21:06:17 +0000 (14:06 -0700)]
Audio and video bitrate are now configurable through system properties
adb shell setprop media.wfd.audio-bitrate 64000
adb shell setprop media.wfd.video-bitrate
10000000
are the defaults.
Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
Andreas Huber [Wed, 12 Sep 2012 19:15:18 +0000 (12:15 -0700)]
Use proper number of video buffers to be acquired simultaneously from
SurfaceMediaSource, this should match the number of encoder input buffers.
Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
Andreas Huber [Wed, 12 Sep 2012 19:08:55 +0000 (12:08 -0700)]
Throttle SurfaceMediaSource.
Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
The Android Automerger [Thu, 13 Sep 2012 13:59:41 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 12 Sep 2012 17:42:10 +0000 (10:42 -0700)]
Camera2: Fix ZSL bugs.
The ZSL processor was discarding buffers too often, and waiting for
new buffers with mutexes held.
Also adds basic fallback to regular capture in case the ZSL queue
doesn't contain a suitable buffer.
Bug:
7147043
Change-Id: I5721267ef08dbc87ef9d8ec47f333db5f67e41c1
Jean-Baptiste Queru [Wed, 12 Sep 2012 22:42:30 +0000 (15:42 -0700)]
am
a923dd4e: am
1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '
a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Jean-Baptiste Queru [Wed, 12 Sep 2012 22:26:28 +0000 (15:26 -0700)]
am
1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '
1b0ae9e47273357e19a9beb22466319753e8242d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Jean-Baptiste Queru [Wed, 12 Sep 2012 21:24:19 +0000 (14:24 -0700)]
Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
Andreas Huber [Wed, 12 Sep 2012 17:54:33 +0000 (10:54 -0700)]
Merge "Various improvements to the wifi display implementation." into jb-mr1-dev
Andreas Huber [Wed, 12 Sep 2012 17:19:54 +0000 (10:19 -0700)]
Various improvements to the wifi display implementation.
Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.
Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
Elliott Hughes [Wed, 12 Sep 2012 15:59:26 +0000 (08:59 -0700)]
am
fd07d616: am
fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit '
fd07d61614e4b358349d1d46a32f9477784404c4':
Don't include <linux/socket.h> directly.
Elliott Hughes [Wed, 12 Sep 2012 15:55:32 +0000 (08:55 -0700)]
am
fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit '
fbe1cc92d9e8930700c15f68717dd66fc1523177':
Don't include <linux/socket.h> directly.
Elliott Hughes [Wed, 12 Sep 2012 15:50:35 +0000 (08:50 -0700)]
Merge "Don't include <linux/socket.h> directly."
The Android Automerger [Wed, 12 Sep 2012 13:59:36 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Wed, 12 Sep 2012 01:47:53 +0000 (18:47 -0700)]
Don't include <linux/socket.h> directly.
In newer versions of Linux, stuff you need isn't in that file any more.
Change-Id: I62923ed2d92a75ff3182ba2ae27578ce7bde8356
Eino-Ville Talvala [Wed, 12 Sep 2012 01:25:27 +0000 (18:25 -0700)]
Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-dev
Eino-Ville Talvala [Wed, 12 Sep 2012 01:25:17 +0000 (18:25 -0700)]
Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev
Edwin Wong [Wed, 12 Sep 2012 00:52:59 +0000 (17:52 -0700)]
Merge "Add getError and setError to propagate error code from WVMMediaExtractor up to player." into jb-mr1-dev
Eino-Ville Talvala [Wed, 12 Sep 2012 00:23:48 +0000 (17:23 -0700)]
Camera2: Use full pixel array for ZSL stream
For efficiency, use full pixel array size for the ZSL output/input
streams, instead of the final picture size.
Bug:
7139362
Change-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3
Eino-Ville Talvala [Tue, 11 Sep 2012 23:51:32 +0000 (16:51 -0700)]
Camera2: Configure ZSL at the right time.
ZSL enable was too early in the camera startup sequence, resulting it
being turned off most of the time.
Bug:
7148012
Change-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772
Eino-Ville Talvala [Tue, 11 Sep 2012 18:37:17 +0000 (11:37 -0700)]
Merge "Camera1: Fix enable shutter sound command error handling." into jb-mr1-dev
Eino-Ville Talvala [Tue, 11 Sep 2012 18:01:18 +0000 (11:01 -0700)]
Camera1: Fix enable shutter sound command error handling.
Return the error codes from calls to enableShutterSound to the caller,
and don't call the HAL with the enable shutter sound command.
Change-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5
Eino-Ville Talvala [Tue, 11 Sep 2012 18:20:19 +0000 (11:20 -0700)]
Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev
Edwin Wong [Thu, 6 Sep 2012 21:07:37 +0000 (14:07 -0700)]
Add getError and setError to propagate error code from WVMMediaExtractor up to player.
The two virtual functions provides a path for the player(AwesomePlayer) to retrieve
the last error from WVMMediaExtractor container.
Change-Id: Iee8d4a3eccf82af95eb3d4d465f069daced4aa1a
related-to-bug:
7073630
Jean-Michel Trivi [Tue, 11 Sep 2012 17:33:28 +0000 (10:33 -0700)]
Merge "Communicate audio session ID to downmixer" into jb-mr1-dev
Elliott Hughes [Tue, 11 Sep 2012 17:08:26 +0000 (10:08 -0700)]
am
ed757e97: am
290ac693: Merge "Stop building the unused host libmtp static library."
* commit '
ed757e9729b325f00e70f506ad6e217910563d0a':
Stop building the unused host libmtp static library.
Elliott Hughes [Tue, 11 Sep 2012 17:04:48 +0000 (10:04 -0700)]
am
290ac693: Merge "Stop building the unused host libmtp static library."
* commit '
290ac69379e649a2fed1d9441a17e39c6a912d8c':
Stop building the unused host libmtp static library.
Elliott Hughes [Tue, 11 Sep 2012 16:57:54 +0000 (09:57 -0700)]
Merge "Stop building the unused host libmtp static library."
Elliott Hughes [Tue, 11 Sep 2012 16:33:46 +0000 (09:33 -0700)]
Stop building the unused host libmtp static library.
This removes the need to support the bionic mktime_tz and localtime_tz
extensions on glibc, which makes my life easier.
Bug:
7012465
Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
Eric Laurent [Tue, 11 Sep 2012 15:33:52 +0000 (08:33 -0700)]
Merge "Limit maximum equalizer gain." into jb-mr1-dev
The Android Automerger [Tue, 11 Sep 2012 13:59:28 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Tue, 11 Sep 2012 01:58:27 +0000 (18:58 -0700)]
Communicate audio session ID to downmixer
The audio downmixer effect might need the audio session Id, pass it
from the track creation in AudioFlinger to the downmix effect
creation in AudioMixer.
Change-Id: I5e29540542ae89cf4a0cdb537b3e67f04442a20a
Eino-Ville Talvala [Tue, 11 Sep 2012 01:44:37 +0000 (18:44 -0700)]
Merge "Camera2: Temporarily stop pre-allocation of recording stream." into jb-mr1-dev
Eino-Ville Talvala [Tue, 11 Sep 2012 01:44:33 +0000 (18:44 -0700)]
Merge "Camera2: Clean up the right streams." into jb-mr1-dev
Eric Laurent [Mon, 10 Sep 2012 23:27:35 +0000 (16:27 -0700)]
Limit maximum equalizer gain.
Limit maximum gain in all EQ bands according to current volume so that
total gain (current volume + band gain) does not exceed a certain limit.
The gain difference between bands is preserved.
Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
Eric Laurent [Mon, 10 Sep 2012 23:46:31 +0000 (16:46 -0700)]
Merge "audio effects: no audio preprocessing by default" into jb-mr1-dev
Eric Laurent [Sat, 8 Sep 2012 00:31:18 +0000 (17:31 -0700)]
audio effects: no audio preprocessing by default
The audio preprocessings are not included in the default
audio_effect.conf file anymore as the audio HAL has to provide
support for them.
Each product implementing one or more audio pre processing must
provide a specific audio_effects.conf file.
Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
Eino-Ville Talvala [Mon, 10 Sep 2012 23:07:03 +0000 (16:07 -0700)]
Camera2: Temporarily stop pre-allocation of recording stream.
When recordingHint is set, don't pre-allocate recording stream on
preview start.
Bug:
7137947
Change-Id: I06b5f6d7dbb21d4d0747974ba001b0c8929a0b02
Eino-Ville Talvala [Mon, 10 Sep 2012 16:53:09 +0000 (09:53 -0700)]
Camera2: Sanity check inputs better.
Bug:
7132141
Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b
Eino-Ville Talvala [Mon, 10 Sep 2012 20:30:43 +0000 (13:30 -0700)]
Camera2: Clean up the right streams.
Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48
Eino-Ville Talvala [Mon, 10 Sep 2012 18:59:12 +0000 (11:59 -0700)]
Camera: Add HDR scene mode constants.
Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
Andreas Huber [Mon, 10 Sep 2012 18:36:44 +0000 (11:36 -0700)]
Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev
Jean-Baptiste Queru [Mon, 10 Sep 2012 18:30:18 +0000 (11:30 -0700)]
am
f755a506: am
d81be6d6: Merge "aacenc: Mark some global arrays const"
* commit '
f755a506335df3bfb32c062096deceaf045044ed':
aacenc: Mark some global arrays const
Andreas Huber [Mon, 10 Sep 2012 18:27:23 +0000 (11:27 -0700)]
Enable audio streaming to a wifi display. Remove startup delay hack.
Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca
Jean-Baptiste Queru [Mon, 10 Sep 2012 18:26:55 +0000 (11:26 -0700)]
am
d81be6d6: Merge "aacenc: Mark some global arrays const"
* commit '
d81be6d670f0d89aa6048a82fbbff82c584e9922':
aacenc: Mark some global arrays const
Jean-Baptiste Queru [Mon, 10 Sep 2012 18:08:23 +0000 (11:08 -0700)]
Merge "aacenc: Mark some global arrays const"
Eino-Ville Talvala [Fri, 7 Sep 2012 21:26:29 +0000 (14:26 -0700)]
Camera2: Use face priority scene mode when face detect is enabled.
Per API specs, enabled face detection implies that metering, etc is
done based on faces.
Bug:
6243944
Change-Id: Ie35162226d70cc0f437e92e37be138e71e45e738
Eino-Ville Talvala [Mon, 10 Sep 2012 16:53:09 +0000 (09:53 -0700)]
Camera2: Sanity check inputs better.
Bug:
7132141
Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b
The Android Automerger [Mon, 10 Sep 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Sun, 9 Sep 2012 23:11:37 +0000 (16:11 -0700)]
am
e7c992c6: am
5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit '
e7c992c675e0075cd60b0b11c06d5956e3ddd7a3':
Fix libmedia and libstagefright to get expat header files from the approved location.
Elliott Hughes [Sun, 9 Sep 2012 23:07:48 +0000 (16:07 -0700)]
am
5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit '
5abc91d61718e334e05c6d4858bd868bd5a5769c':
Fix libmedia and libstagefright to get expat header files from the approved location.
Elliott Hughes [Sun, 9 Sep 2012 22:11:49 +0000 (15:11 -0700)]
Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
Elliott Hughes [Sun, 9 Sep 2012 21:58:14 +0000 (14:58 -0700)]
Fix libmedia and libstagefright to get expat header files from the approved location.
Found during a libexpat upgrade.
Change-Id: I9e5abd502a884975d898486edde374fb2519164e
Glenn Kasten [Sun, 9 Sep 2012 16:52:13 +0000 (09:52 -0700)]
Merge "Add outlier statistics for fast mixer cycle times" into jb-mr1-dev
Jean-Michel Trivi [Sun, 9 Sep 2012 17:27:08 +0000 (10:27 -0700)]
Fix buffer size issue for multichannel HE-AAC
Decoding of HE-AAC fails due to output buffer size being too small.
Size output buffer size according to maximum number of channels.
Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
The Android Automerger [Sun, 9 Sep 2012 14:00:08 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Martin Storsjo [Sun, 9 Sep 2012 13:33:52 +0000 (16:33 +0300)]
aacenc: Mark some global arrays const
This gets rid of initialized writeable data in the library.
Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
Jeff Brown [Sun, 9 Sep 2012 07:16:45 +0000 (00:16 -0700)]
Revert max buffers change.
Attempting to use 31 buffers crashes on Prime.
Bug:
7131413
Change-Id: Ib85aef9b1da01f7243bd781a0efa47de2970412d
Jeff Brown [Sat, 8 Sep 2012 00:38:58 +0000 (17:38 -0700)]
Add a permission for controlling wifi display.
Change-Id: I321b6c1a0223e0c3d5df04fde7a13ab91c08c7bc
Eric Laurent [Fri, 7 Sep 2012 23:46:39 +0000 (16:46 -0700)]
Merge "Fix headroom management in equalizer" into jb-mr1-dev
James Painter [Fri, 7 Sep 2012 23:36:50 +0000 (16:36 -0700)]
Fix build
Change-Id: Ia4bebc4ecc850b42ebd4edd1ffed07e9bc2ec300
James Painter [Thu, 6 Sep 2012 01:02:32 +0000 (18:02 -0700)]
Camera2: Add a burst mode skeleton.
Bug:
6243944
Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
Andreas Huber [Fri, 7 Sep 2012 23:02:47 +0000 (16:02 -0700)]
Merge "Less verbose logging, lots of references." into jb-mr1-dev
Andreas Huber [Fri, 7 Sep 2012 22:46:41 +0000 (15:46 -0700)]
Less verbose logging, lots of references.
Change-Id: Idcb76848883b113e956d7e6266da882771a053b8
Eric Laurent [Fri, 7 Sep 2012 22:09:57 +0000 (15:09 -0700)]
Fix headroom management in equalizer
Fix a bug resetting the headroom parameters when
calling the bundle process function for the first time.
Change-Id: Ie05f97606f415954340ff2a4e48cd7b0a97a063b
Andreas Huber [Fri, 7 Sep 2012 22:08:22 +0000 (15:08 -0700)]
Merge "Make wfd code work with both old and new dongles." into jb-mr1-dev
Andreas Huber [Fri, 7 Sep 2012 22:05:53 +0000 (15:05 -0700)]
Make wfd code work with both old and new dongles.
Change-Id: Idc750dc334c47a171791587dd7e7281d565ff566
Eric Laurent [Fri, 7 Sep 2012 21:53:06 +0000 (14:53 -0700)]
Merge "audioflinger: changes for new audio devices enums" into jb-mr1-dev
John Grossman [Fri, 7 Sep 2012 20:41:15 +0000 (13:41 -0700)]
Merge "Fix iTunSMPB parsing for AAC tracks encoded with Nero" into jb-mr1-dev
John Grossman [Fri, 7 Sep 2012 18:41:07 +0000 (11:41 -0700)]
Fix iTunSMPB parsing for AAC tracks encoded with Nero
Make sure to clear out the mean/name/data state when parsing
apple-style metadata from tracks every time we have a full set, not
just when we find an iTunSMPB set.
AAC tracks encoded from WAV by Nero tend to put in an additional apple
style metadata tag (cdec) before the iTunSMPB tag. The sequence in
the file goes something like
mean : "com.apple.iTunes"
name : "cdec"
data : "ndaudio 1.5.4.0 / -2pass -br 320000"
mean : "com.apple.iTunes"
name : "iTunSMPB"
data : "
00000000 00000A40 000000B8 <etc...>"
If the internal state was not cleared after the first set, then when
the second instance of "name" is encountered, an attempt is made to
parse the previous data entry as an iTunSMPB tag when it is actually a
cdec tag. Afterwards, mean, name and data are all cleared, and when
the second data is encountered there is no current mean or name
present, so the gapless metadata gets skipped. By clearing the
metadata state every time we have a full set of mean/name/data, we
make sure that we are always interpreting the data field as the proper
type.
Change-Id: I196e2e3f83e434f15d5ee55ae40a74a92d5a1845
Glenn Kasten [Fri, 7 Sep 2012 19:58:38 +0000 (12:58 -0700)]
Add outlier statistics for fast mixer cycle times
Change-Id: I31c964caeb8b5d9ae0a426224f030cdcb01114a0
Alexander Ray [Fri, 7 Sep 2012 19:35:09 +0000 (12:35 -0700)]
Merge "Camera2: Increase zoom steps." into jb-mr1-dev
Eino-Ville Talvala [Thu, 30 Aug 2012 01:06:32 +0000 (18:06 -0700)]
Camera2: Use the recordingHint parameter.
Use recordingHint to create recording and still capture streams up
front, and to use the recording template when doing preview.
Bug:
6243944
Change-Id: Ifeb624794849f734784b53a1a10ff2bfe8f1a357
Eino-Ville Talvala [Thu, 6 Sep 2012 02:02:43 +0000 (19:02 -0700)]
Camera2: Delete all streams and stop all threads during shutdown.
Bug:
6243944
Change-Id: If13a1f91e8a07c1ec4f91183d1a4b261ec4f6d52
Eino-Ville Talvala [Fri, 7 Sep 2012 17:55:30 +0000 (10:55 -0700)]
Merge "Camera2: Play shutter and recording sounds." into jb-mr1-dev
Eric Laurent [Tue, 28 Aug 2012 21:26:53 +0000 (14:26 -0700)]
audioflinger: changes for new audio devices enums
The ThreadBase class now has a separate member for input
and output devices (mInDevice, mOutDevice).
Only query get_supported_devices() from audio HAL if the function
is exposed and if the audio policy manager did not specify the
audio module to open.
Also fixed bug in AEC preprocessing that would reset
to default output device when an input device was given.
Change-Id: I19d4d06aeb920b068e3ef31e6e6be6345ce5d67a
Eric Laurent [Fri, 7 Sep 2012 16:18:43 +0000 (09:18 -0700)]
Merge "AudioRecord: Fix minimum frame count calculation." into jb-mr1-dev
Eino-Ville Talvala [Fri, 7 Sep 2012 01:26:58 +0000 (18:26 -0700)]
Camera2: Play shutter and recording sounds.
Bug:
6987540
Change-Id: Icd441a757c4b68fc4988b3bfbef428adb8d1ba28
Eino-Ville Talvala [Fri, 7 Sep 2012 01:08:16 +0000 (18:08 -0700)]
Camera2: Increase zoom steps.
10 is too low for smooth zoom; increase number to improve smoothness.
Bug:
7120794
Change-Id: I178cd3890ef37beeff97cadb9e92ceab6d2cad06
Eric Laurent [Fri, 7 Sep 2012 01:04:59 +0000 (18:04 -0700)]
Merge "AudioFlinger: send audio source to audio effects" into jb-mr1-dev
John Grossman [Fri, 24 Aug 2012 21:47:25 +0000 (14:47 -0700)]
Add a small hook to support gapless in AAH.
Change-Id: Ie07eca6b45142bdd83412ee0e38d732a4c355630
John Grossman [Thu, 6 Sep 2012 19:32:37 +0000 (12:32 -0700)]
Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev
Eric Laurent [Thu, 6 Sep 2012 18:52:36 +0000 (11:52 -0700)]
AudioRecord: Fix minimum frame count calculation.
AudioRecord::set() was calling getMinFrameCount() with
a channel count instead of a channel mask.
Change-Id: Iabace7686426430fd53deac0c71b0c36aa64171c
Eino-Ville Talvala [Mon, 3 Sep 2012 17:03:26 +0000 (10:03 -0700)]
Camera2: Move locked states out of AE/AWB mode
Bug:
6243944
Change-Id: I7b609cc6c04c957d1f48c1a996263fa9c7b94000
Eino-Ville Talvala [Thu, 30 Aug 2012 00:37:16 +0000 (17:37 -0700)]
Camera2: Basic ZSL and precapture trigger support.
- Add capture sequencer to control still image capture process
- Use precapture trigger for standard capture in sequencer
- Add infrastructure for reprocessing streams
- Add ZSL processor to maintain ZSL queue
- Add ZSL capture sequence to sequencer
This patch sets up ZSL mode and precapture triggers.
For now, to enable zsl mode, set the system property camera.zsl_mode
to 1.
Bug:
6243944
Change-Id: Icf8cb1a83a7c11a152a11007c8f3c54f8ea1c70c
John Grossman [Wed, 29 Aug 2012 21:51:01 +0000 (14:51 -0700)]
Fix calculations for an obscure combo of MPEG audio options.
MPEGv2 and MPEGv2.5 Layer 2 audio payloads should 1152 samples per
access unit, not 576. Adjust the frame size and samples out
calculations accordingly.
Also, adjust the max frame size in the MP3Extractor's MediaSource to
be closer to the theoretical worst case max frame size. The
theoretical worst case for MPEG audio is 2881 bytes per frame, but the
max frame size being used was 32kB. It has been changed to be 4kB in
order to remain a power of 2 allocation, but to be the power of 2
closest to the worst case.
Change-Id: If11f5a843b06e70151bbe8298cc54f954938d9d7
Jeff Brown [Thu, 6 Sep 2012 17:15:30 +0000 (10:15 -0700)]
Merge "Update remote display API." into jb-mr1-dev
The Android Automerger [Thu, 6 Sep 2012 13:33:58 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Thu, 6 Sep 2012 02:49:52 +0000 (19:49 -0700)]
Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev
Marco Nelissen [Thu, 6 Sep 2012 02:19:52 +0000 (19:19 -0700)]
Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev
Marco Nelissen [Thu, 6 Sep 2012 02:19:23 +0000 (19:19 -0700)]
Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev
Jeff Brown [Thu, 6 Sep 2012 00:48:03 +0000 (17:48 -0700)]
Update remote display API.
Renamed disconnect() to dispose() to emphasize the fact that
this method is intended to clean up the IRemoteDisplay
completely, not just temporarily disconnect the current client
(which might be useful someday).
Other minor tweaks.
Change-Id: I1209639eb0cd8af09c724206642d7e52aab48257
James Dong [Wed, 5 Sep 2012 23:46:36 +0000 (16:46 -0700)]
Fix an issue where the "mFrameCount" field was accessed without its containing object
Change-Id: I6077b61b3e718b9b44ff86ca669a59f96b0b256f
Marco Nelissen [Wed, 5 Sep 2012 23:22:16 +0000 (16:22 -0700)]
Merge "Fragmented mp4 extractor" into jb-mr1-dev
Marco Nelissen [Tue, 28 Aug 2012 22:09:49 +0000 (15:09 -0700)]
Fragmented mp4 extractor
Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.
Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
Andreas Huber [Wed, 5 Sep 2012 17:26:52 +0000 (10:26 -0700)]
Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.
Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
Jeff Brown [Wed, 5 Sep 2012 04:38:42 +0000 (21:38 -0700)]
Implement remote display service stubs.
Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
Andreas Huber [Wed, 5 Sep 2012 15:36:11 +0000 (08:36 -0700)]
Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev
The Android Automerger [Wed, 5 Sep 2012 13:33:49 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev