OSDN Git Service
Martin Storsjo [Wed, 18 May 2011 09:30:22 +0000 (12:30 +0300)]
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Initially, this code gave a warning "comparison is always
false due to limited range of data type" if long was 64 bit.
Additionally, the output from the AMR encoder was mostly noise.
This was committed on the master branch of the opencore
repository in commit
f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10904.
Change-Id: I822dcc74beeae548d3032ffda759de9c8cd1fcfe
Jean-Baptiste Queru [Thu, 12 May 2011 16:46:49 +0000 (09:46 -0700)]
Tweak audio APIs for better forward/backward/sideways compatibility.
Change-Id: I293e99107aed260db68edccad35cdc15ed88c1d3
Andreas Huber [Mon, 18 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am
f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '
f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Andreas Huber [Thu, 14 Apr 2011 17:01:41 +0000 (10:01 -0700)]
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247
related-to-bug:
4286618
Brad Fitzpatrick [Thu, 7 Apr 2011 16:08:58 +0000 (09:08 -0700)]
am
ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '
ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler
Jim Huang [Wed, 6 Apr 2011 06:19:29 +0000 (14:19 +0800)]
audioflinger: Enable ARMv5TE optimized resampler
Previously, the optimized asm option is only enabled when
__ARM_ARCH_5E__ is defined, which is assigned in armv5te.mk
rather than armv7-a series targets. This patch checks the ARM CPU
feature about half-word multiply instructions to enable ARMv5TE
resampler optimization routines properly.
Change-Id: I4c5a5d8c932416f23bedb0b389db958349f21ea4
James Dong [Mon, 4 Apr 2011 21:42:05 +0000 (14:42 -0700)]
am
ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
* commit '
ea5d2c584490424be6bbc27dec58b4f9868d631e':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
Russell Brenner [Fri, 1 Apr 2011 01:55:20 +0000 (18:55 -0700)]
am
49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '
49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
Russell Brenner [Thu, 31 Mar 2011 20:20:52 +0000 (13:20 -0700)]
Added include/private/hwui/DrawGlInfo.h
Change-Id: If50ccabb8761a994fa1f7aef4fbdb668c6160b0c
James Dong [Wed, 30 Mar 2011 23:04:09 +0000 (16:04 -0700)]
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32
related-to-bug:
4195127
James Dong [Fri, 11 Mar 2011 22:31:37 +0000 (14:31 -0800)]
am
68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '
68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
James Dong [Fri, 11 Mar 2011 19:02:17 +0000 (11:02 -0800)]
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.
o Speed up MP3Extractor using cached reads
bug -
4083532
Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
Lorenzo Colitti [Wed, 9 Mar 2011 23:09:20 +0000 (15:09 -0800)]
am
bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit '
bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
Lorenzo Colitti [Wed, 9 Mar 2011 23:09:04 +0000 (15:09 -0800)]
am
b9da16a1: Support IPv6 in HTTP streaming.
* commit '
b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
Lorenzo Colitti [Fri, 4 Feb 2011 00:41:34 +0000 (16:41 -0800)]
Support IPv6->IPv4 fallback in HTTP streaming.
Bug:
4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
Lorenzo Colitti [Tue, 4 Jan 2011 00:10:34 +0000 (16:10 -0800)]
Support IPv6 in HTTP streaming.
Bug:
4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
James Dong [Mon, 7 Mar 2011 23:10:26 +0000 (15:10 -0800)]
am
d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
* commit '
d581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
James Dong [Mon, 7 Mar 2011 22:48:58 +0000 (14:48 -0800)]
Add missing copyright headers for a couple of files. DO NOT MERGE
Cherry-picked from other branch...
bug -
4025673
Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
Andreas Huber [Wed, 16 Feb 2011 22:24:53 +0000 (14:24 -0800)]
am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
Andreas Huber [Wed, 16 Feb 2011 21:20:02 +0000 (13:20 -0800)]
DO NOT MERGE: Respond to RTSP server->client requests.
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug:
3353752
Andreas Huber [Wed, 16 Feb 2011 17:02:08 +0000 (09:02 -0800)]
am
8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '
8db7a7bfadc7bdfa30f60bb06063f91b19234096':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Andreas Huber [Tue, 15 Feb 2011 21:32:42 +0000 (13:32 -0800)]
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
and continue even if we were unable to poke a hole into the firewall.
Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug:
3457201
Andreas Huber [Tue, 15 Feb 2011 19:49:03 +0000 (11:49 -0800)]
am
d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
* commit '
d1ba051a465518fa4325c364ed77025fc1a2a794':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Andreas Huber [Tue, 15 Feb 2011 18:39:48 +0000 (10:39 -0800)]
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.
They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...
Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug:
3452103
Brad Fitzpatrick [Fri, 4 Feb 2011 18:27:54 +0000 (10:27 -0800)]
am
b083d3b8: Merge "Initialize resampling buffer per track."
* commit '
b083d3b816378ef3b9dceb33b2c2e20510b2632b':
Initialize resampling buffer per track.
Yuuhi Yamaguchi [Fri, 4 Feb 2011 14:24:34 +0000 (15:24 +0100)]
Initialize resampling buffer per track.
When resampling too short sound, AudioMixer uses previous
tracks buffer. So we re-initialize the temporary buffer per
loop to avoid it.
Change-Id: I55a59a3b14faa8445e09c450478fe79cef704760
Andreas Huber [Fri, 28 Jan 2011 18:42:10 +0000 (10:42 -0800)]
am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Andreas Huber [Fri, 28 Jan 2011 17:19:12 +0000 (09:19 -0800)]
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug:
3217210
Eric Laurent [Fri, 28 Jan 2011 02:40:42 +0000 (18:40 -0800)]
am
0ef57993: Merge "Fix issue
2988031." into gingerbread
* commit '
0ef579939e6c96fcd2b42b164c5debf535a6a53b':
Fix issue
2988031.
Eric Laurent [Thu, 27 Jan 2011 19:32:34 +0000 (11:32 -0800)]
Fix issue
2988031.
Limit SYSTEM stream volume when a headset is connected and music is playing.
Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
Andreas Huber [Thu, 27 Jan 2011 00:40:04 +0000 (16:40 -0800)]
am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Andreas Huber [Wed, 26 Jan 2011 23:40:56 +0000 (15:40 -0800)]
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
And now we're just ignoring them. Yay standards.
Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749
related-to-bug:
3353752
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:18 +0000 (14:05 -0800)]
am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Jean-Michel Trivi [Mon, 15 Nov 2010 20:11:32 +0000 (12:11 -0800)]
do not merge bug
3370834 Cherrypick from master
Cherripick from master CL 79833, 79417, 78864, 80332, 87500
Add new audio mode and recording source for audio communications
other than telelphony.
The audio mode MODE_IN_CALL signals the system the device a phone
call is currently underway. There was no way for audio video
chat or VoIP applications to signal a call is underway, but not
using the telephony resources. This change introduces a new mode
to address this. Changes in other parts of the system (java
and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
state variable directly, but to use two new convenience methods,
isInCall() and isStateInCall(int) instead.
Add a recording source used to designate a recording stream for
voice communications such as VoIP.
Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.
SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
Audio mode MODE_IN_CALL is reserved for telephony.
SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.
Note that this CL is intentionally not correcting the
getAudioSourceMax() return value in MediaRecorder.java as the
new source is hidden here.
Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
Mathias Agopian [Tue, 25 Jan 2011 22:46:40 +0000 (14:46 -0800)]
am
239fd805: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '
239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Marco Nelissen [Tue, 25 Jan 2011 18:11:09 +0000 (10:11 -0800)]
am
c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '
c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
Marco Nelissen [Tue, 25 Jan 2011 18:06:16 +0000 (10:06 -0800)]
Merge "Increase the number of useful bits in the spectrum." into gingerbread
Andreas Huber [Tue, 25 Jan 2011 00:30:12 +0000 (16:30 -0800)]
am
efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit '
efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Andreas Huber [Mon, 24 Jan 2011 21:36:30 +0000 (13:36 -0800)]
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug:
3384367
Marco Nelissen [Wed, 19 Jan 2011 00:44:28 +0000 (16:44 -0800)]
Increase the number of useful bits in the spectrum.
Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
Eric Laurent [Fri, 21 Jan 2011 05:46:21 +0000 (21:46 -0800)]
am
c5694ebd: Merge "do not merge - Fix issue
3371096." into gingerbread
* commit '
c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue
3371096.
Dave Sparks [Fri, 21 Jan 2011 01:41:30 +0000 (17:41 -0800)]
am
65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '
65d39eeb9b032e5507a01daa25afff62b29bffe4':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
Eric Laurent [Thu, 20 Jan 2011 02:36:13 +0000 (18:36 -0800)]
do not merge - Fix issue
3371096.
EffectModule::process() was copying effect chain input buffer to
output buffer if no effect was active instead of accumulating it.
Change-Id: If4ca75601ea69a088d0f71d88aec53e90a1dec89
Andreas Huber [Wed, 19 Jan 2011 23:07:19 +0000 (15:07 -0800)]
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.
Change-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172
related-to-bug:
3362836
Andreas Huber [Wed, 19 Jan 2011 16:23:47 +0000 (08:23 -0800)]
am
e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit '
e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
Andreas Huber [Tue, 18 Jan 2011 23:26:40 +0000 (15:26 -0800)]
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
if the network interface is shutdown while connecting.
Change-Id: I168c6026de24812efa9b7e607a9eb83efded8c1f
related-to-bug:
3362836
Jean-Baptiste Queru [Sat, 15 Jan 2011 02:33:51 +0000 (18:33 -0800)]
merge
83fdc69e from gingerbread - do not merge
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
Gloria Wang [Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)]
am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
Gloria Wang [Thu, 13 Jan 2011 18:51:13 +0000 (10:51 -0800)]
Merge "Initial OMA DRM forward lock contribution"
James Dong [Fri, 3 Dec 2010 01:42:08 +0000 (17:42 -0800)]
Squash commits of the following patches, cherry-picked from other branch - do not merge.
o Prepare for publishing MediaMetadataRetriever as public API
step one:
o replaced captureFrame with getFrameAtTime
o removed getMode
o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
as part of the preparation for publishing MediaMetadataRetriever as public Java API
o Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method
o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java
o Publish MediaMetadataRetriever.java as public API
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc
o part of a multi-project change.
bug -
3309041
Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
Andreas Huber [Wed, 12 Jan 2011 18:35:18 +0000 (10:35 -0800)]
am
7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit '
7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Andreas Huber [Wed, 12 Jan 2011 17:57:23 +0000 (09:57 -0800)]
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf
related-to-bug:
3338518
Andreas Huber [Wed, 12 Jan 2011 00:22:33 +0000 (16:22 -0800)]
am
7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '
7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
Andreas Huber [Wed, 12 Jan 2011 00:01:33 +0000 (16:01 -0800)]
DO NOT MERGE: Fix Matroska issues
related-to-bug:
3331623
Squashed commit of the following:
commit
8484811f3784564ce962ec1b6311bac532d73ffc
Author: Andreas Huber <andih@google.com>
Date: Tue Jan 11 11:56:06 2011 -0800
Properly parse Matroska lacing flags and extract all frames contained in a block.
related-to-bug:
3331623
commit
38f1f39381a01659577461b3d35bd22db45ba317
Author: Andreas Huber <andih@google.com>
Date: Mon Nov 15 15:10:34 2010 -0800
Proper support for variable NALsize lengths of AVC content in .mkv files.
related-to-bug:
3197442
Change-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f
repo sync [Tue, 11 Jan 2011 23:26:51 +0000 (15:26 -0800)]
resolved conflicts for merge of
e7fbfb6b to gingerbread-plus-aosp
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
Andreas Huber [Tue, 11 Jan 2011 17:51:34 +0000 (09:51 -0800)]
DO NOT MERGE: Fix parsing of ntp= PLAY response.
related-to-bug:
3340186
Squashed commit of the following:
commit
b61c36b7228aec9f5360883b1e1c1e0530488974
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 27 13:59:59 2010 -0700
Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames > 1 and the sub frames did not align with RTP packet boundaries.
commit
b10f322c07e5bebcaf032e8624cb4a5d733dfc15
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 25 09:40:52 2010 -0700
We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.
commit
0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 20 15:00:34 2010 -0700
Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.
related-to-bug:
3084183
Change-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534
James Dong [Mon, 10 Jan 2011 20:09:09 +0000 (12:09 -0800)]
am
13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
* commit '
13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
James Dong [Mon, 10 Jan 2011 16:55:02 +0000 (08:55 -0800)]
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
cherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89
bug -
3336424
Change-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a
Gloria Wang [Fri, 7 Jan 2011 23:34:08 +0000 (15:34 -0800)]
am
0544d059: Merge "DRM Framework bug fixes."
* commit '
0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
Gloria Wang [Fri, 7 Jan 2011 19:10:49 +0000 (11:10 -0800)]
Merge "DRM Framework bug fixes."
Marco Nelissen [Fri, 7 Jan 2011 04:29:11 +0000 (20:29 -0800)]
am
ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/
3311831
* commit '
ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/
3311831
Marco Nelissen [Thu, 6 Jan 2011 19:12:17 +0000 (11:12 -0800)]
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/
3311831
Change-Id: Iba1152013b7577168af71f947d7249560419fa05
James Dong [Thu, 6 Jan 2011 01:55:27 +0000 (17:55 -0800)]
am
35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
* commit '
35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
Pravat Dalbehera [Wed, 5 Jan 2011 08:02:51 +0000 (09:02 +0100)]
Initial OMA DRM forward lock contribution
OMA DRM forward lock agent is plugged into the
Open DRM framework. Forward lock agent implementation contains:
- Forward lock engine to communicate with framework
- Converter to encrypt the original file into a special format
- Decoder to feed the decrypted data for rendering
- Lightweight unique key-encryption mechanism
- Documentation
Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
James Dong [Wed, 5 Jan 2011 01:34:44 +0000 (17:34 -0800)]
Suppress the recording sound in the recorded video
bug -
3309194
Change-Id: Ib8fb248943bc22f963d67537bfdbc6056c5a159b
Eric Laurent [Fri, 17 Dec 2010 00:05:16 +0000 (16:05 -0800)]
am
5a756fb0: Merge "Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit '
5a756fb0f1f3f8cd7612284c889dfc69875577a8':
Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
Eric Laurent [Thu, 16 Dec 2010 03:09:42 +0000 (19:09 -0800)]
Fix issue
2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
The problem is that when an input stream is opened for record over bluetooth SCO, the kernel
mono audio device should be opened in RW mode to allow further use of this same device by an output stream
also routed to bluetooth SCO.
This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true
when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).
Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
James Dong [Thu, 9 Dec 2010 00:20:16 +0000 (16:20 -0800)]
am
1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
* commit '
1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
James Dong [Wed, 8 Dec 2010 23:28:42 +0000 (15:28 -0800)]
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
bug -
3264094
Change-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01
James Dong [Mon, 6 Dec 2010 23:36:04 +0000 (15:36 -0800)]
am
d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '
d57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
James Dong [Mon, 6 Dec 2010 23:02:28 +0000 (15:02 -0800)]
Fixed a race condition where some recording frames may not be released
bug -
3258924
Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
James Dong [Thu, 2 Dec 2010 18:21:06 +0000 (10:21 -0800)]
am
d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
* commit '
d4c5478a8664f64ff66db9ae25250afac78b7a74':
Be conservative in estimating the file size limit.
James Dong [Thu, 2 Dec 2010 18:13:36 +0000 (10:13 -0800)]
Merge "Be conservative in estimating the file size limit." into gingerbread
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:59:49 +0000 (07:59 -0800)]
am
077bc4ac: Merge from open-source master
* commit '
077bc4ac019ad33abd613448e11d3ad501218991':
Fix HTTP redirect missing statuscode 303 and 307
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:54:49 +0000 (07:54 -0800)]
Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
Eric Laurent [Thu, 2 Dec 2010 00:04:09 +0000 (16:04 -0800)]
am
78d81851: Merge "Fix issue
2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit '
78d81851a8ef6691541215afb19e5bc690a4c3c0':
Fix issue
2641884: Bluetooth volume is dependent on in call volume.
Eric Laurent [Wed, 1 Dec 2010 22:25:39 +0000 (14:25 -0800)]
Fix issue
2641884: Bluetooth volume is dependent on in call volume.
The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces
voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream
volume did not actually change. So even if we re apply volumes when switching to bluetooth
device, the volume voice volume is not changed and remains what it was when routed to earpiece
What makes things worse on Passion is that stream volumes are limited when connected to bluetooth
and their actual value does not change as soon as they exceed the limit threshold.
Change-Id: Id7c317db45b392a1c20dca2859678e3c64a371ed
Eric Laurent [Wed, 1 Dec 2010 19:28:54 +0000 (11:28 -0800)]
am
e23212bc: Merge "Fix issue
3142808." into gingerbread
* commit '
e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
Fix issue
3142808.
Eric Laurent [Tue, 2 Nov 2010 19:02:20 +0000 (12:02 -0700)]
Fix issue
3142808.
There is a bug in the way audio policy manager handles A2DP interface suspend/restore
when SCO is used. This bug is not new but has been triggered by a change in the timing
of the events received by audio policy manager when a call is setup and torn down
introduced by commit
164a8f86c7e48992691368c4895709c3bdb835a4.
The fix consists in grouping the control of A2DP suspended state in a single function
that is called systematically when conditions affecting this state are changed:
- call state change
- device connection/disconnection
- change in forced usage.
Change-Id: I46ee2399ee5547b60511fc6cfd32e2720091b0f8
James Dong [Wed, 1 Dec 2010 02:18:08 +0000 (18:18 -0800)]
Be conservative in estimating the file size limit.
bug -
3045580
Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
Andreas Huber [Tue, 30 Nov 2010 22:32:09 +0000 (14:32 -0800)]
am
30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
* commit '
30c818444d876dd868b84adec2416308c90f32e3':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
Andreas Huber [Tue, 30 Nov 2010 22:30:00 +0000 (14:30 -0800)]
Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
Andreas Huber [Tue, 30 Nov 2010 22:08:56 +0000 (14:08 -0800)]
am
a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
* commit '
a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
Andreas Huber [Tue, 30 Nov 2010 22:06:26 +0000 (14:06 -0800)]
Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
Andreas Huber [Thu, 28 Oct 2010 17:50:47 +0000 (10:50 -0700)]
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
DO NOT MERGE
related-to-bug:
3141937
Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
Andreas Huber [Thu, 18 Nov 2010 19:03:48 +0000 (11:03 -0800)]
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
DO NOT MERGE
Change-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6
related-to-bug:
3205131
Andreas Huber [Tue, 30 Nov 2010 21:07:56 +0000 (13:07 -0800)]
am
567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
* commit '
567b2bd1469b1c37e6249637d313253b7d84971e':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
Andreas Huber [Tue, 30 Nov 2010 19:53:01 +0000 (11:53 -0800)]
am
b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
* commit '
b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
Andreas Huber [Fri, 29 Oct 2010 22:47:52 +0000 (15:47 -0700)]
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5
related-to-bug:
3152363
Chia-chi Yeh [Tue, 30 Nov 2010 19:45:54 +0000 (11:45 -0800)]
am
683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
* commit '
683a7ff922409d2aa6c944bc4e08de32029e80e5':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
Andreas Huber [Fri, 12 Nov 2010 16:57:12 +0000 (08:57 -0800)]
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
Change-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd
related-to-bug:
3188835
Takeshi Aimi [Tue, 30 Nov 2010 07:27:42 +0000 (16:27 +0900)]
DRM Framework bug fixes.
- Make sure to clean-up obsolete listeners.
- Close cursor after using it.
- Add virtual destructor to the base class of OnInfoListener.
Changes are made by SEMC and Sony.
Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
Chia-chi Yeh [Tue, 30 Nov 2010 06:56:56 +0000 (22:56 -0800)]
Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
Per Osbäck [Mon, 29 Nov 2010 14:59:12 +0000 (15:59 +0100)]
Fix HTTP redirect missing statuscode 303 and 307
Change-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c
Gloria Wang [Tue, 23 Nov 2010 05:26:13 +0000 (21:26 -0800)]
am
4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '
4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
Gloria Wang [Tue, 23 Nov 2010 05:25:56 +0000 (21:25 -0800)]
am
d9334934: Merge "Update of DRM Framework."
* commit '
d93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
Gloria Wang [Tue, 23 Nov 2010 05:15:07 +0000 (21:15 -0800)]
Merge "Notify the playback status to DRM agents before the playback starts"
Gloria Wang [Tue, 23 Nov 2010 05:14:09 +0000 (21:14 -0800)]
Merge "Update of DRM Framework."
Gloria Wang [Fri, 5 Nov 2010 00:38:39 +0000 (17:38 -0700)]
Notify the playback status to DRM agents before the playback starts
Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a