2503 Commits

Author SHA1 Message Date
Kenny Root
206c62ed34 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
2011-03-11 15:45:34 -08:00
James Dong
7d93b7574f am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
2011-03-11 14:31:37 -08:00
James Dong
070b2e1a5c 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
2011-03-11 11:02:17 -08:00
Chih-Wei Huang
c2d68c9096 Remove unnecessary SkImageDecoder_libjpeg.cpp
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
2011-03-10 17:52:31 +08:00
Lorenzo Colitti
8df2477c4e am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a':
  Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:09:20 -08:00
Lorenzo Colitti
e4a02b6129 am b9da16a1: Support IPv6 in HTTP streaming.
* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
  Support IPv6 in HTTP streaming.
2011-03-09 15:09:04 -08:00
Lorenzo Colitti
bd0e806a61 Support IPv6->IPv4 fallback in HTTP streaming.
Bug: 4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
2011-03-08 15:01:15 -08:00
Lorenzo Colitti
b9da16a1e3 Support IPv6 in HTTP streaming.
Bug: 4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
2011-03-08 15:01:15 -08:00
James Dong
b1be086e1d 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...
2011-03-07 15:10:26 -08:00
James Dong
d581c04722 Add missing copyright headers for a couple of files. DO NOT MERGE
Cherry-picked from other branch...

bug - 4025673

Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
2011-03-07 14:50:40 -08:00
Andreas Huber
79a9748949 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:24:53 -08:00
Andreas Huber
dbe09da6ac 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
2011-02-16 13:37:19 -08:00
Andreas Huber
16d94f580a 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
2011-02-16 09:02:08 -08:00
Andreas Huber
ea47cb4ede 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
2011-02-15 14:02:34 -08:00
Andreas Huber
e0c9f2757b 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.
2011-02-15 11:49:03 -08:00
Andreas Huber
d1ba051a46 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
2011-02-15 11:02:43 -08:00
Andreas Huber
70888c00a0 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.
2011-01-28 10:42:10 -08:00
Andreas Huber
b6c2e2b46c DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug: 3217210
2011-01-28 09:58:11 -08:00
Andreas Huber
586096a957 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.
2011-01-26 16:40:04 -08:00
Andreas Huber
2dce338e01 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
2011-01-26 16:03:33 -08:00
Jean-Michel Trivi
1155efdc71 am 2ba92c71: do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Jean-Michel Trivi
2ba92c71b5 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
2011-01-26 11:20:01 -08:00
Marco Nelissen
4b44026879 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.
2011-01-25 10:11:09 -08:00
Marco Nelissen
c929677e01 Merge "Increase the number of useful bits in the spectrum." into gingerbread 2011-01-25 10:06:16 -08:00
Andreas Huber
ca1cf59f49 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
2011-01-24 16:30:12 -08:00
Andreas Huber
efebdf4bd4 DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37
related-to-bug: 3384367
2011-01-24 15:59:14 -08:00
Brad Fitzpatrick
23a813e17d am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '996de2dd41498a48be6821cfa0a81b16c0b3975c':
  Avoid using String.format in MediaRecorder
2011-01-24 14:03:48 -08:00
Henrik Backlund
2450830c0c Avoid using String.format in MediaRecorder
String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
2011-01-24 17:55:46 +01:00
Marco Nelissen
dbc0fe985f Increase the number of useful bits in the spectrum.
Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
2011-01-24 08:47:55 -08:00
Dave Sparks
b6e89affd5 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.
2011-01-20 17:41:30 -08:00
Andreas Huber
a2ab9aace3 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
2011-01-19 15:44:23 -08:00
Andreas Huber
66e35c240e 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"
2011-01-19 08:23:47 -08:00
Andreas Huber
0e49d20107 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
2011-01-18 15:52:31 -08:00
Jean-Baptiste Queru
9286cfe501 merge 83fdc69e from gingerbread - do not merge
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
2011-01-14 18:33:51 -08:00
James Dong
9efe47374b 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
2011-01-12 17:12:46 -08:00
Andreas Huber
c88b2c4411 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.
2011-01-12 10:35:18 -08:00
Andreas Huber
7c6153606c Fail to parse duration instead of asserting, if the server response cannot be parsed.
Change-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf
related-to-bug: 3338518
2011-01-12 09:57:23 -08:00
Andreas Huber
0ef0d76a9d am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
  DO NOT MERGE: Fix Matroska issues
2011-01-11 16:22:33 -08:00
Andreas Huber
7e2f9cc81d 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
2011-01-11 16:02:31 -08:00
repo sync
d439ac396e resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
2011-01-11 15:26:51 -08:00
Andreas Huber
549f12ad04 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
2011-01-11 09:53:30 -08:00
James Dong
0569e58988 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
2011-01-10 12:09:09 -08:00
James Dong
6328185b6c 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
2011-01-10 10:27:02 -08:00
Yu Shan Emily Lau
5619da8d8b am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
  Fix the test application orientation. Bug# 3205196
2011-01-07 09:40:18 -08:00
Yu Shan Emily Lau
2af4e71dd4 Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 2011-01-07 09:38:24 -08:00
Marco Nelissen
2888208b0b am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
  Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
2011-01-07 09:22:57 -08:00
Marco Nelissen
d1da80a4b3 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
2011-01-06 20:29:11 -08:00
Marco Nelissen
f13d450139 Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: Idb630866e960338ce2795dcc128cafaf6c9c27f2
2011-01-06 16:37:03 -08:00
Marco Nelissen
ba77a3f9cb 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
2011-01-06 15:05:06 -08:00
Yu Shan Emily Lau
d97943d5d0 Fix the test application orientation. Bug# 3205196
Change-Id: I57085d6507482ce15dbf3b167965be4af43b3d88
2011-01-04 20:57:09 -08:00