OSDN Git Service
Glenn Kasten [Wed, 27 Jul 2011 21:45:28 +0000 (14:45 -0700)]
Merge "Bug
4599730 Get audio channel count on MediaPlayer"
Glenn Kasten [Mon, 25 Jul 2011 16:26:22 +0000 (09:26 -0700)]
Bug
4599730 Get audio channel count on MediaPlayer
Related changes:
- Fix bug in get/setParameter* to recycle Parcels when done with them.
Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
Iliyan Malchev [Wed, 27 Jul 2011 07:58:25 +0000 (00:58 -0700)]
libstagefright: add destroyOMXPlugin and use C linkage for symbols
Add a destroyOMXPlugin() to complemenet createOMXPlugin(). Since the latter is
an opaque call into a library, it is not safe to assume that the object thus
returned may be destroyed by calling delete. This patch will call
destroyOMXPlugin() in libstagefrighthw.so, if the symbol is defined there.
Otherwise, it will default to a delete as before.
Also, prefer C linkage for the symbol names. Using mangled C++ symbols is not
very safe and makes it hard to grep for those symbols through the code. We
attempt to locate createOMXPlugin as a C symbol then try it as a mangled C++
one. We only use C linkage for destroyOMXPlugin since this symbol is new.
Change-Id: Ied23c910486856a0f18056df049c871234797c5c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Tue, 26 Jul 2011 22:56:44 +0000 (15:56 -0700)]
libcameraservice: call put_parameters on camera HAL
Change-Id: I492d1034ade50f9e157141debaa9783a90a04a91
Signed-off-by: Iliyan Malchev <malchev@google.com>
Eric Laurent [Wed, 27 Jul 2011 16:48:47 +0000 (09:48 -0700)]
Merge "AudioFlinger: fix crash when deleting pre process."
Eric Laurent [Wed, 27 Jul 2011 16:02:47 +0000 (09:02 -0700)]
Merge "Fix issue
4604090: notification sound interrupted."
Eric Laurent [Wed, 27 Jul 2011 15:56:08 +0000 (08:56 -0700)]
Merge "AudioRecord: Fix getInput()"
Kristian Monsen [Wed, 27 Jul 2011 12:33:33 +0000 (05:33 -0700)]
Merge "Fix for bug
5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests"
Eric Laurent [Wed, 27 Jul 2011 03:54:46 +0000 (20:54 -0700)]
AudioFlinger: fix crash when deleting pre process.
If a pre processing effect is detroyed while enabled and capture is active,
there was a possibility that the effect engine is released by the framework
while still processed by the audio HAL.
The fix consists in not releasing the engine in EffectModule::removeHandle()
but just flag the effect as being detroyed to avoid further calls to functions
on the engine effect interface.
The effect interface is then removed from the audio HAL safely in
EffectChain::removeEffect_l() while holding the EffectChain mutex.
Change-Id: I71fab30d9145062af8644f545a1f1d4d3e7e7f02
Eric Laurent [Wed, 27 Jul 2011 03:32:28 +0000 (20:32 -0700)]
AudioRecord: Fix getInput()
AudioRecord::getInput() was issuing a query to get a new input stream from
audio policy service instead of returning the cached input stream in AudioRecord.
Change-Id: Ice324b7c60bc0898149023797bcb56a72091b9d3
Wu-cheng Li [Thu, 21 Jul 2011 18:37:11 +0000 (02:37 +0800)]
Add camera face detection API.
API are still hidden.
bug:
4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
Eric Laurent [Fri, 22 Jul 2011 16:04:31 +0000 (09:04 -0700)]
Fix issue
4604090: notification sound interrupted.
The problem is that the audio HAL fails to acquire the wake lock when playing the notification.
This is because of a change that removed the mediaserver process form the system group for honeycomb.
The fix consists in requesting the wake lock from PowerManagerService when AudioFlinger mixer
wakes up.
A consequence of this change is that audio HALs or pcm drivers do not have to hold wake locks
anymore as in the past.
Change-Id: I4fb3cc84816c9c408ab7fec75886baf801e1ecb5
Gloria Wang [Mon, 25 Jul 2011 23:36:20 +0000 (16:36 -0700)]
Merge "Fix for bug
4371230. - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client"
Gloria Wang [Thu, 21 Jul 2011 22:10:22 +0000 (15:10 -0700)]
Fix for bug
4371230.
- Generate unique ID for each DrmManagerClient in native side
- Fix the bug where multiple clients could use the same ID
- Return the correct unique ID back to Java
- Add a flag in the unique ID to separate native client and Java client
Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
Pannag Sanketi [Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)]
Merge "Adding Metadata mode to SurfaceMediaSource"
Eric Laurent [Mon, 25 Jul 2011 21:43:05 +0000 (14:43 -0700)]
Merge "Added APIs for audio preprocessing"
Eric Laurent [Sun, 24 Jul 2011 20:36:09 +0000 (13:36 -0700)]
Added APIs for audio preprocessing
Added APIs to control pre processes applied on captured audio.
Those APIs are still hidden until reviewed by API council.
Three types of standard pre processes are supported:
- Automatic Gain Control (AGC) by AutomaticGainControl class
- Acoustic Echo Cancellation (AEC) by AcousticEchoCanceler class
- Noise Suppression (NS) by NoiseSuppressor class
A method is added to AudioEffect class to query audio pre processings
applied by default by the platform on a given AudioRecord session ID.
Change-Id: I0b9fceeb8c704dd06319c3b52b85c96fe871d51d
James Dong [Mon, 25 Jul 2011 21:21:14 +0000 (14:21 -0700)]
Merge "Do not support still image capture mode for timelapse video recording"
Eric Laurent [Mon, 25 Jul 2011 19:20:23 +0000 (12:20 -0700)]
Merge "AudioFlinger: add dump of audio pre processing."
Eric Laurent [Mon, 25 Jul 2011 00:49:51 +0000 (17:49 -0700)]
AudioFlinger: add dump of audio pre processing.
Dump of media.audio_flinger service was only listing effects on output threads.
Moved the dump of effect chains from PlaybackThread to ThreadBase class so that
pre processings on RecordThread are also listed.
Change-Id: If8bc74023c12b9c2371f1b300743b156ceca7b87
James Dong [Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)]
Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
Jean-Michel Trivi [Sun, 24 Jul 2011 19:59:35 +0000 (12:59 -0700)]
Merge "QueryCodecs() signature change"
Gloria Wang [Sun, 24 Jul 2011 19:07:20 +0000 (12:07 -0700)]
Merge "Do not change the number of bytes while converting 8-bit samples to 16-bit, because this number will be used later to calculate mCurrentPos. Fix for bug
5063703."
James Dong [Wed, 29 Jun 2011 23:56:52 +0000 (16:56 -0700)]
Do not support still image capture mode for timelapse video recording
related-to-bug:
4973779
Change-Id: Ica665217ab10247b2242acc4e93d4fe9f83e3f45
Pannag Sanketi [Thu, 14 Jul 2011 21:37:47 +0000 (14:37 -0700)]
Adding Metadata mode to SurfaceMediaSource
SurfaceMediaSource operates in metadata mode only, i.e. just the
metadata is stored in videobuffers. SurfaceMediaSource passes the Gralloc
buffer handle along with a 4 byte 'type' (indicating that the metadata
is of type GrallocSource) to the encoder as opposed to the
GrallocBuffer itself.
Related to bug id:
4529323
Change-Id: I83aebc0dd10f317658cdf70be5802dfc35a1e72d
Pannag Sanketi [Fri, 22 Jul 2011 23:42:41 +0000 (16:42 -0700)]
Merge "Connect MediaRecorder Native to SurfaceMediaSource"
Jean-Michel Trivi [Fri, 22 Jul 2011 16:52:39 +0000 (09:52 -0700)]
QueryCodecs() signature change
Restore QueryCodecs() signature exactly as used by third-party libs.
Add an alternative function to select HW only codecs.
Change-Id: Ibb2cb4dd36fc0c6599eb93aa5751c216397e3b6f
Gloria Wang [Fri, 22 Jul 2011 21:42:28 +0000 (14:42 -0700)]
Do not change the number of bytes while converting 8-bit samples to 16-bit,
because this number will be used later to calculate mCurrentPos.
Fix for bug
5063703.
Change-Id: I75a78ef694482aa426d82a6c5f3d2ce570a9c19e
Jamie Gennis [Tue, 19 Jul 2011 19:08:33 +0000 (12:08 -0700)]
SurfaceTexture: add the abandon method.
This change adds the 'abandon' method to the SurfaceTexture C++ class.
This method may be used to put the SurfaceTexture in an abandoned state,
causing all ISurfaceTexture methods to fail.
Change-Id: Ibd261f7b73f44e2bec36a8508bf92113cfb7cf95
Pannag Sanketi [Sat, 2 Jul 2011 00:39:39 +0000 (17:39 -0700)]
Connect MediaRecorder Native to SurfaceMediaSource
Making a connection from MediaRecorder Native layer to the
SurfaceMediaSource for the purpose of encoding GL Frames. This will be
called from the java side inside the Mobile Filter Framework.
The mediarecorder native layer (client), when set the videosource to
option VIDEO_SOURCE_FRAMES, asks the StageFrightRecorder on the mediaserver
side to create a SurfaceMediaSource object and pass it back as a
sp<ISurfaceTexture> object. Using that, the client side will dequeue and
queue buffers. Connecting the GL Frames to the obtained
sp<ISurfaceTexture> is not part of this CL.
Related to bug id:
4529323
Change-Id: I651bec718dd5b935779e7d7a050b841c2d0b0fcd
Jamie Gennis [Fri, 22 Jul 2011 21:00:37 +0000 (14:00 -0700)]
SurfaceMediaSource: remove getAllocator method
This change removes the getAllocator method from SurfaceMediaSource
because that method is no longer a part of the ISurfaceTexture
interface.
Change-Id: I0e2f0bc3bc1c8cd3c1b4b14246f07b9b4e3066c3
Pannag Sanketi [Fri, 22 Jul 2011 18:49:36 +0000 (11:49 -0700)]
Merge "Renaming SurfaceEncoder to SurfaceMediaSource"
Pannag Sanketi [Fri, 22 Jul 2011 18:49:21 +0000 (11:49 -0700)]
Merge "Adding SurfaceEncoder for encoding FilterFrames"
Eric Laurent [Fri, 22 Jul 2011 18:04:07 +0000 (11:04 -0700)]
Merge "Fix issue
4988574: 8 bit PCM audio playback broken."
Andreas Huber [Fri, 22 Jul 2011 17:25:24 +0000 (10:25 -0700)]
Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)."
James Dong [Fri, 22 Jul 2011 17:09:22 +0000 (10:09 -0700)]
Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."
Andreas Huber [Mon, 18 Jul 2011 20:47:55 +0000 (13:47 -0700)]
Retry datasource fetches a few times before giving up (NuCachedSource2).
Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b
related-to-bug:
3405354
Kristian Monsen [Fri, 22 Jul 2011 13:11:31 +0000 (14:11 +0100)]
Fix for bug
5049763 HLS: Cookies set in main playlist request aren't being passed to subsequent HTTP requests
Cookies should be store between requests in memory with this.
Tell me if you want to store the cookies on disk as well.
Change-Id: I9afe5796a3d395afcf54d669c86cf7da432f8d9a
Eric Laurent [Fri, 22 Jul 2011 02:35:01 +0000 (19:35 -0700)]
Fix issue
4988574: 8 bit PCM audio playback broken.
Fixed regression in audio track control block frame size
calculation introduced by commit
c310dcb.
Change-Id: Ia731b946ae4e43316b98d80229e3b08a696e47d6
James Dong [Fri, 22 Jul 2011 00:32:55 +0000 (17:32 -0700)]
Log setVideoSurface() and setVideoSurfaceTexture() failures.
Change-Id: Iaea34e74a0cf569fc85b926949253dea6baa6142
related-to-bug:
5063370
Pannag Sanketi [Thu, 30 Jun 2011 22:30:03 +0000 (15:30 -0700)]
Renaming SurfaceEncoder to SurfaceMediaSource
Related to bug id:
4529323
Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
Pannag Sanketi [Sat, 11 Jun 2011 01:30:30 +0000 (18:30 -0700)]
Adding SurfaceEncoder for encoding FilterFrames
Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.
SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.
Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.
The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.
Related to bug id:
4529323
Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
Pannag Sanketi [Wed, 20 Jul 2011 00:14:53 +0000 (17:14 -0700)]
Adding AndoirdOpaque Colorformat to OMX
Adding an enum to indicate an android opaque OMX
colorformat. This will inform the encoder that
the actual colorformat will be relayed by the
Frames read from the GRAlloc Buffers
Related to bug id:
4529323
Change-Id: Iddc5bd1ce8ca2b2506a57aadf5fc91ff0c7b78ef
Hong Teng [Thu, 21 Jul 2011 18:13:43 +0000 (11:13 -0700)]
Merge "fix for issue
4142219 Don't hard code platform-specific limitations-jni/java part"
Jeff Brown [Thu, 21 Jul 2011 01:03:47 +0000 (18:03 -0700)]
Merge "Untangle MediaScanner error handling. Bug:
5056917"
Eric Laurent [Thu, 21 Jul 2011 00:45:37 +0000 (17:45 -0700)]
Merge "Audio framework: support for audio pre processing"
Jeff Brown [Wed, 20 Jul 2011 23:38:43 +0000 (16:38 -0700)]
Untangle MediaScanner error handling.
Bug:
5056917
Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
Hong Teng [Thu, 7 Jul 2011 01:33:09 +0000 (18:33 -0700)]
fix for issue
4142219
Don't hard code platform-specific limitations-jni/java part
Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
James Dong [Wed, 20 Jul 2011 23:08:32 +0000 (16:08 -0700)]
Merge "Let the media recording framework release the Camera object when it is the owner"
James Dong [Wed, 20 Jul 2011 03:24:22 +0000 (20:24 -0700)]
Let the media recording framework release the Camera object when it is the owner
related-to-bug:
5050535,
5036813,
5051707
Change-Id: I88e10f65f087931e7f95ab26a018d59f7361103e
Jamie Gennis [Wed, 20 Jul 2011 17:47:04 +0000 (10:47 -0700)]
Merge "MediaPlayer: add a disconnect from ANativeWindow"
Andreas Huber [Wed, 20 Jul 2011 15:05:06 +0000 (08:05 -0700)]
Merge "Content found in the wild violated the MPEG4 systems specs"
Andreas Huber [Tue, 19 Jul 2011 23:05:50 +0000 (16:05 -0700)]
Content found in the wild violated the MPEG4 systems specs
but other players apparently worked around it as well, so we do to.
Change-Id: I8269d2344b010d1d704028c8a9c05bddab53828d
related-to-bug:
5049979
Andreas Huber [Tue, 19 Jul 2011 22:33:25 +0000 (15:33 -0700)]
Merge "More HLS fixes"
Andreas Huber [Tue, 19 Jul 2011 22:04:53 +0000 (15:04 -0700)]
More HLS fixes
properly expand URLs where the "new" URL is an absolute path.
properly include any extra headers even when fetching the key files.
Change-Id: I7cd8879015ea8e3d3e2334f4e7e16b8c1a5d48e9
Jamie Gennis [Tue, 19 Jul 2011 21:50:43 +0000 (14:50 -0700)]
MediaPlayer: add a disconnect from ANativeWindow
This change makes MediaPlayer::disconnect disconnect from the
ANativeWindow once the player has been disconnected.
Change-Id: I6744559030d1edc520cf77402d1f5ce841742340
Wu-cheng Li [Tue, 19 Jul 2011 21:47:20 +0000 (14:47 -0700)]
Merge "Disconnect the native window in CameraService::Client::disconnect."
Wu-cheng Li [Tue, 19 Jul 2011 21:35:02 +0000 (05:35 +0800)]
Disconnect the native window in CameraService::Client::disconnect.
bug:
5048372
Change-Id: I6886907a672ddf5580b988ca5bc13e3dc26d4385
Mathias Agopian [Mon, 18 Jul 2011 23:15:08 +0000 (16:15 -0700)]
use SurfaceTexture new scaling mode in SF
SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size
Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
James Dong [Mon, 18 Jul 2011 22:56:20 +0000 (15:56 -0700)]
Remove PV AVC decoder
Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
Conley Owens [Mon, 18 Jul 2011 23:57:04 +0000 (16:57 -0700)]
am
e5143d6c: am
a4aef41a: am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:55:33 +0000 (16:55 -0700)]
am
a4aef41a: am
a74774fd: am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:52:26 +0000 (16:52 -0700)]
am
4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '
4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
Conley Owens [Mon, 18 Jul 2011 23:49:43 +0000 (16:49 -0700)]
Merge "stagefright aacenc: Mark codeWord as UWord16"
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:26 +0000 (15:46 -0700)]
am
3ab6ccda: am
2acddc54: am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:21 +0000 (15:46 -0700)]
am
b32af642: am
31140598: am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
b32af642454f3113cb1539821eb3b0dbf4174974':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:18 +0000 (15:46 -0700)]
am
d4dee1a5: am
29fd8cdb: am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
d4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:46:14 +0000 (15:46 -0700)]
am
b7f0d825: am
691257b1: am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:03 +0000 (15:44 -0700)]
am
2acddc54: am
89bac182: am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:44:01 +0000 (15:44 -0700)]
am
31140598: am
16db83c2: am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
31140598866c668047fc6dede7944e146aa21a0a':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:58 +0000 (15:43 -0700)]
am
29fd8cdb: am
80ef1745: am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:43:54 +0000 (15:43 -0700)]
am
691257b1: am
68e37dac: am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
691257b1812ffd8172b01c17b9ba23a48eb76594':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:30 +0000 (15:38 -0700)]
am
88409911: Merge "stagefright: Include stdlib.h for malloc/free"
* commit '
88409911aebed6c3663e51d51fca67f527c0c2fb':
stagefright: Include stdlib.h for malloc/free
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:27 +0000 (15:38 -0700)]
am
eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"
* commit '
eb07c531498f4dc881ad2b4d1a32cacab25950ff':
stagefright amrwbenc: Remove a duplicate, unused file
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:25 +0000 (15:38 -0700)]
am
c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit '
c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
stagefright aacenc: Make the mem_malloc function 64-bit safe
Deckard Autoverifier [Mon, 18 Jul 2011 22:38:22 +0000 (15:38 -0700)]
am
55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
* commit '
55f115a3214343c826acf27fcbc4bf2927049083':
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:41 +0000 (15:23 -0700)]
Merge "stagefright: Include stdlib.h for malloc/free"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:31 +0000 (15:23 -0700)]
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:20 +0000 (15:23 -0700)]
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
Deckard Autoverifier [Mon, 18 Jul 2011 22:23:09 +0000 (15:23 -0700)]
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
Jamie Gennis [Mon, 18 Jul 2011 22:19:20 +0000 (15:19 -0700)]
Merge "CameraService: (dis)connect from preview windows"
Jamie Gennis [Mon, 18 Jul 2011 22:18:43 +0000 (15:18 -0700)]
Merge "MediaPlayer: add ANativeWindow (dis)connect calls"
Conley Owens [Mon, 18 Jul 2011 19:55:22 +0000 (12:55 -0700)]
am
f139965e: (-s ours) am
45ddd425: am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:47:50 +0000 (12:47 -0700)]
am
45ddd425: am
3edba93f: am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
45ddd42544167494cee7213ecddcb6f8057c86c0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:42:42 +0000 (12:42 -0700)]
am
98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Conley Owens [Mon, 18 Jul 2011 19:37:16 +0000 (12:37 -0700)]
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
Jean-Michel Trivi [Mon, 18 Jul 2011 18:07:47 +0000 (11:07 -0700)]
Merge "Add option to query hardware decoders only"
Jean-Michel Trivi [Sun, 17 Jul 2011 23:35:11 +0000 (16:35 -0700)]
Add option to query hardware decoders only
Add an option to OMXCodec::QueryCodecs() to filter out
software codecs.
Update stagefright command line tool to list the roles of codecs.
Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
Eric Laurent [Sat, 18 Jun 2011 04:29:58 +0000 (21:29 -0700)]
Audio framework: support for audio pre processing
Audio effect framework is extended to suport effects on
output and input audio path.
AudioFlinger: Support for audio effects and effect chains is
moved from PlaybackThread class to ThreadBase class so that
RecordThread can manage effects.
Effects of type pre processing are allowed on record thread
only. When a pre processing is enabled, the effect interface handle is
passed down to the input stream so that the audio HAL can call the
process function. The record thread loop calls the effect chain process
function that will only manage the effect state and commands and skip the
process function.
AudioRecord: The audio session is allocated before calling getInput() into
audio policy serice so that the session is known before the input theead is
created and pre processings can be created on the correct session.
AudioPolicyService: default pre processing for a given input source are
loaded from audio_effects.conf file.
When an input is created, corresponding effects are created and enabled.
Change-Id: Id17119e0979b4dcf189b5c7957fec30dc3478790
Andreas Huber [Mon, 18 Jul 2011 16:04:28 +0000 (09:04 -0700)]
Merge "Always consider playlists corresponding to different bandwidths different."
Andreas Huber [Mon, 18 Jul 2011 16:04:22 +0000 (09:04 -0700)]
Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started"
The Android Open Source Project [Mon, 18 Jul 2011 15:10:06 +0000 (08:10 -0700)]
Reconcile with gingerbread-release
Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
Mike Lockwood [Mon, 18 Jul 2011 07:05:24 +0000 (00:05 -0700)]
Merge "MTP: Use a single packet for the data phase"
Eric Laurent [Sat, 18 Jun 2011 03:17:17 +0000 (20:17 -0700)]
Audio preprocessing wrapper for webrtc.
This wrapper implements the interworking layer between the audio effect
interface defined by the effect framework for audio preprocessing
and the native interface of webrtc audio processing module.
Change-Id: I3f9319730c102599cdf0dda520a53d90b4165114
Mike Lockwood [Fri, 15 Jul 2011 01:00:02 +0000 (21:00 -0400)]
MTP: Use a single packet for the data phase
instead of sending 12 byte header in a separate packet.
PTP on the Mac is much happier with this approach.
Change-Id: I7d1ca498f6346afd88876d24332187b466fc469c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Andreas Huber [Fri, 15 Jul 2011 23:53:31 +0000 (16:53 -0700)]
Always consider playlists corresponding to different bandwidths different.
Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
Glenn Kasten [Fri, 15 Jul 2011 23:27:13 +0000 (16:27 -0700)]
Merge "Log CPU usage"
Andreas Huber [Fri, 15 Jul 2011 23:25:41 +0000 (16:25 -0700)]
Fix seek behaviour at startup and teardown of media session that hasn't been started
Nuplayer specific.
Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
James Dong [Fri, 15 Jul 2011 22:25:36 +0000 (15:25 -0700)]
Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens
o Deal with vendor codec hang bug
Change-Id: Ic8449afd43045f09a9e0bd3d1be9a320e59ccabe
Gloria Wang [Fri, 15 Jul 2011 21:20:45 +0000 (14:20 -0700)]
Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."