1174 Commits

Author SHA1 Message Date
Andreas Huber
f2275078bd Merge "Squashed commit of the following:" 2010-01-14 15:12:36 -08:00
Andreas Huber
5a37232239 Merge "Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation." 2010-01-14 15:12:29 -08:00
Andreas Huber
34d30d3342 Merge "Squashed commit of the following:" 2010-01-14 15:01:22 -08:00
Andreas Huber
140d4edf9b Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation. 2010-01-14 14:49:19 -08:00
Andreas Huber
0ffc90f6ed Squashed commit of the following:
commit cb11364feefc200f10af6a01f776803acba2792a
Author: Andreas Huber <andih@google.com>
Date:   Thu Jan 14 14:05:36 2010 -0800

    Even if the decoder didn't extract the thumbnail at the specified time, accept it for now.

commit a54c0244b305caf11e67db49b7d3d8dba5f77751
Author: Andreas Huber <andih@google.com>
Date:   Thu Jan 14 11:37:15 2010 -0800

    Add some checks to make sure we extract the correct thumbnail frame, also revert to the hardware decoders for thumnbail extraction if the software decoders failed.
2010-01-14 14:15:33 -08:00
Andreas Huber
909255a9cf Squashed commit of the following:
commit 0014ab17f2e0986044327a5ab22159de50b81e0a
Author: Andreas Huber <andih@google.com>
Date:   Thu Jan 14 14:05:09 2010 -0800

    Another instance of returning an error instead of asserting makes sense.

commit d2cac8c498a65b449a25ec216601830d23c165e7
Author: Andreas Huber <andih@google.com>
Date:   Thu Jan 14 13:34:33 2010 -0800

    Instead of asserting on invalid data (incomplete NAL unit), return an error.
2010-01-14 14:13:15 -08:00
Andreas Huber
dbcb2c68ee Workaround for some hardware decoders not properly signaling end-of-output-stream properly. 2010-01-14 14:09:58 -08:00
Andreas Huber
1cb02bf661 Support for determining the mime type of media via metadata extraction. 2010-01-13 11:30:34 -08:00
Andreas Huber
3a3656ce8a More metadata support. 2010-01-13 10:45:49 -08:00
Andreas Huber
85fbfee4c9 Merge "Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size." 2010-01-12 16:42:47 -08:00
Andreas Huber
db5d662254 Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size.
related-to-bug: 2363596
2010-01-12 16:30:44 -08:00
Marco Nelissen
9643b1e49c Merge "b/2353646 Fix music visualizations to also work with audiotrack callbacks, which stagefright uses. This slightly changes the way the data is stored, since before we were relying on the buffers being written always being at least 4K, whereas the callbacks are generally for smaller amounts of data. Now we append all the data to a big circular buffer, then return chunks of that buffer for visualization. When there are multiple things playing at the same time, this will give the wrong result, but (1) that was the case before as well, and (2) will be fixed once we start visualizing the mixer output instead of the mixer inputs." 2010-01-12 15:28:50 -08:00
Andreas Huber
5c1fe318eb Make sure to release the buffer we're not using in case of an error.
related-to-bug: 2366606
2010-01-12 11:58:28 -08:00
Marco Nelissen
e274db1efd b/2353646
Fix music visualizations to also work with audiotrack callbacks, which
stagefright uses. This slightly changes the way the data is stored,
since before we were relying on the buffers being written always
being at least 4K, whereas the callbacks are generally for smaller
amounts of data. Now we append all the data to a big circular buffer,
then return chunks of that buffer for visualization. When there are
multiple things playing at the same time, this will give the wrong
result, but (1) that was the case before as well, and (2) will be
fixed once we start visualizing the mixer output instead of the
mixer inputs.
2010-01-12 10:27:04 -08:00
Andreas Huber
aee3c6394a Squashed commit of the following:
commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
Date:   Mon Jan 11 14:55:56 2010 -0800

    Support for duration metadata, midi and ogg-vorbis files (in mediascanner)

commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39
Author: Andreas Huber <andih@google.com>
Date:   Mon Jan 11 14:20:45 2010 -0800

    Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor.

commit f9818dfac39c96e5fefe8c8295e60580692d5990
Author: Andreas Huber <andih@google.com>
Date:   Fri Jan 8 14:26:09 2010 -0800

    A first pass at supporting metadata through ID3 tags.

commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
Date:   Thu Jan 7 15:48:44 2010 -0800

    Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright.

related-to-bug: 2295456
2010-01-12 09:14:15 -08:00
Andreas Huber
593c6a5516 Merge "The mp3 decoder should not assert that decoding was successful but return an error instead." 2010-01-11 16:08:56 -08:00
Andreas Huber
b6d5d1b7b3 Merge "Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string." 2010-01-11 14:56:39 -08:00
Andreas Huber
afce2158a2 The mp3 decoder should not assert that decoding was successful but return an error instead. 2010-01-11 14:21:26 -08:00
Andreas Huber
5ebc8898d7 Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string.
related-to-bug: 2366619
2010-01-11 13:30:08 -08:00
San Mehat
0f5525ad3b framework: asec: Rename 'Cache' -> 'Container'
Signed-off-by: San Mehat <san@google.com>
2010-01-11 10:15:16 -08:00
Eric Laurent
84b42b8368 am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629'

* commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 16:28:21 -08:00
Romain Guy
980a938c1c Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:38 -08:00
Eric Laurent
d31d7397ba am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Andreas Huber
e4a838051d Reorganize some of the stagefright implementation related to metadata. 2010-01-08 11:54:36 -08:00
Eric Laurent
663ec30880 Fix issue 2361949: A2DP suspend parameters set wrongly.
Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to
BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService.
Previous implementation could cause a false reset of suspend state if a new sink attempted to
connect while A2DP was suspended.
New implementation only resets A2DP suspend state when a new sink is actually connected.
2010-01-08 08:48:18 -08:00
James Dong
a3452ad9be Merge "Add MPEG to the file extensions that scanner cares" 2010-01-06 17:26:01 -08:00
San Mehat
d1265febc4 Merge "framework: MountService: Add initial support for Android Secure External Caches" 2010-01-06 14:30:56 -08:00
Jean-Baptiste Queru
f66de3cd8e Fix typo: test -> tests in makefile tags
Change-Id: Icf23b5ae5d84f6ba9032d1707635a75352f920d2
2010-01-06 14:00:36 -08:00
San Mehat
3697229cc7 framework: MountService: Add initial support for Android Secure External Caches
Signed-off-by: San Mehat <san@google.com>
2010-01-06 13:54:41 -08:00
James Dong
1b50044a27 Add MPEG to the file extensions that scanner cares 2010-01-06 12:18:02 -08:00
Andreas Huber
89e91f7696 Quick and dirty implementation to follow http redirects in stagefright. 2010-01-05 13:39:04 -08:00
Andreas Huber
364b42170d Merge "Protect against possible temporary objects going away before we get at their data." 2010-01-05 11:28:58 -08:00
Andreas Huber
dd0359f7a2 Protect against possible temporary objects going away before we get at their data. 2010-01-05 11:13:08 -08:00
Andreas Huber
6b39ab4c52 Merge "I must have broken raw-audio decoding in the recent past, this fixes it." 2010-01-05 11:08:21 -08:00
Andreas Huber
c79827a76f I must have broken raw-audio decoding in the recent past, this fixes it.
related-to-bug: http://b/issue?id=2352199
2010-01-05 10:54:55 -08:00
Andreas Huber
67aee053ba Use stagefright for http streaming if the right property is set. 2010-01-05 09:27:02 -08:00
Marco Nelissen
7eca501433 Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING" 2010-01-04 15:10:33 -08:00
Marco Nelissen
9a488b44cb MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING 2010-01-04 15:09:03 -08:00
Andreas Huber
1a08ad1cae Merge "Make metadata support through stagefright property dependent until it's ready." 2010-01-04 15:08:32 -08:00
Andreas Huber
c4273482e0 Merge "Fix mpeg4/h.263 software decoder." 2010-01-04 15:07:36 -08:00
Andreas Huber
7782fdf5b7 Make metadata support through stagefright property dependent until it's ready. 2010-01-04 15:02:02 -08:00
Andreas Huber
2039bd93ed Fix mpeg4/h.263 software decoder. 2010-01-04 14:51:49 -08:00
Andreas Huber
6be8b14e25 Fix avc software decoder to properly handle SEI nalType and access unit delimiter. 2010-01-04 14:51:01 -08:00
Eric Laurent
a0b517609d am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'

* commit '68e9014e47f7350b3889e1704dde809b2a926968':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-27 16:33:17 -08:00
Dave Sparks
3c56221af7 Fix SoundPool restart problem CheckJNI issue. 2009-12-23 17:22:57 -08:00
Dave Sparks
1905530bb1 Replace sine with organ for some SoundPool tests. 2009-12-23 09:55:21 -08:00
Dave Sparks
d94466c4c8 Add SoundPool test 2009-12-23 09:47:12 -08:00
Android (Google) Code Review
011a3dfd85 Merge change I9120be33
* changes:
  Add OnLoadCompleteListener to SoundPool.
2009-12-23 09:45:23 -08:00
Dave Sparks
f6e43bf290 Add OnLoadCompleteListener to SoundPool. 2009-12-23 09:11:29 -08:00
Eric Laurent
cf4fc6263c am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'

* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
  Fix issues 2333450 and 2333559:
2009-12-22 23:46:16 -08:00