3529 Commits

Author SHA1 Message Date
James Dong
089971eaba am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit 'c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
  Add audio encoding parameters check
2011-01-13 10:24:44 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Marco Nelissen
f679ba7d94 Cherrypick from GB. Do Not Merge.
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: I67deb044800a6cb626c69bf3d54d51df4bf830f2
2011-01-13 07:17:20 -08:00
James Dong
54815a78af Add audio encoding parameters check
bug - 3345296

Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
2011-01-12 20:45:16 -08:00
James Dong
7f08308fda am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
  Remove legacy code that should not be used
2011-01-12 16:41:36 -08:00
James Dong
4507cef05e Remove legacy code that should not be used
Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
2011-01-12 16:38:45 -08:00
Marco Nelissen
18aa2da202 am a8a656b0: Fix scanning of modified files.
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
  Fix scanning of modified files.
2011-01-12 15:03:28 -08:00
Marco Nelissen
a8a656b0c5 Fix scanning of modified files.
When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.

Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
2011-01-12 14:46:49 -08:00
Andreas Huber
156a3c9ba7 am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 14:35:46 -08:00
James Dong
999fb5a5a9 am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
  Publish MediaMetadataRetriever.java as public API
2011-01-12 14:35:35 -08:00
Andreas Huber
7928ca6f87 Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb 2011-01-12 14:33:51 -08:00
James Dong
068b41d5d4 Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 2011-01-12 14:31:34 -08:00
Mike Lockwood
0b44f6f588 am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database
* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
  MediaScanner: Do not update the file path when updating records already in the database
2011-01-12 14:30:53 -08:00
Mike Lockwood
7ff08aeb7e am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
  Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
2011-01-12 14:28:37 -08:00
Mike Lockwood
0dd9f4de3e MediaScanner: Do not update the file path when updating records already in the database
The path should never change (media scanner treats renames as a delete and an insert)
and we want to preserve the mixed case paths in the database to avoid exposing the
lowercase squashing to MTP.

Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 17:27:37 -05:00
Mike Lockwood
a29464335a Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 2011-01-12 14:25:13 -08:00
James Dong
11eab056dd 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 - 2433195

Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
2011-01-12 14:14:11 -08:00
James Dong
5df82ef953 am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb
* commit 'cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
  Speed up MP3Extractor using cached reads
2011-01-12 11:56:01 -08:00
James Dong
cb0f6d0b42 Merge "Speed up MP3Extractor using cached reads" into honeycomb 2011-01-12 11:54:32 -08:00
Andreas Huber
4bca5e19d5 Fail to parse duration instead of asserting, if the server response cannot be parsed.
Change-Id: I42324468edca5ccce29486059091da8e64f36326
related-to-bug: 3338518
2011-01-12 10:31:04 -08:00
James Dong
31d8a03e44 Speed up MP3Extractor using cached reads
Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
2011-01-12 09:49:15 -08:00
Mike Lockwood
1c4e88d0b0 Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
This rips out some complicated code that was added since gingerbread
that is no longer necessary.

Change-Id: Iab5ecb7314c06221475ce01ef483f34f17003b06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 12:48:13 -05:00
Glenn Kasten
5ac80dde04 am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
  Fix race in buffer ref counting.
2011-01-12 09:36:00 -08:00
Glenn Kasten
4e26bc686b Fix race in buffer ref counting.
Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
2011-01-12 09:22:07 -08:00
Andreas Huber
d22f714973 am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb
* commit '0827e697a9965195ca12ba593332c555702aa94a':
  Increase cache size and low-watermark threshold, also
2011-01-11 15:22:46 -08:00
Andreas Huber
850e76b426 am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
* commit '7f92be88e0d89a693bed4d620a83aea1a989c68e':
  Properly parse Matroska lacing flags and extract all frames contained in a block.
2011-01-11 15:22:42 -08:00
Andreas Huber
0827e697a9 Merge "Increase cache size and low-watermark threshold, also" into honeycomb 2011-01-11 15:20:39 -08:00
Andreas Huber
7f92be88e0 Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 2011-01-11 15:16:04 -08:00
Andreas Huber
52c7832e35 Increase cache size and low-watermark threshold, also
MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).

Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
2011-01-11 15:05:28 -08:00
Yu Shan Emily Lau
513f3ab050 am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
* commit '5619da8d8b66337db182a016619efa1f31266a78':
  Fix the test application orientation. Bug# 3205196
2011-01-11 14:21:59 -08:00
Marco Nelissen
9356e6093e am 2888208b: 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 '2888208b0bb38ac93bb6b500992869c8a6bf244c':
  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-11 13:53:34 -08:00
Andreas Huber
6fe6b4c6f3 Properly parse Matroska lacing flags and extract all frames contained in a block.
Change-Id: I1aca46b2e28b9cad88bf4a296f675e81e66ee095
related-to-bug: 3331623
2011-01-11 13:05:36 -08:00
James Dong
530069031e Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb 2011-01-11 11:23:47 -08:00
James Dong
545c22ffd2 Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp
bug - 3334999

Change-Id: I1c83080713696221048da9b1a9f8c2ee48849ade
2011-01-10 20:43:33 -08:00
Andreas Huber
b736cb28ab Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
2011-01-10 11:57:30 -08:00
Andreas Huber
748ba9a951 Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb 2011-01-10 11:26:38 -08:00
Andreas Huber
7caa130a98 NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d
related-to-bug: 3336496
2011-01-10 10:38:31 -08:00
James Dong
681e89c082 Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
bug - 3336424

Change-Id: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89
2011-01-10 08:57:50 -08:00
Eric Laurent
e15ac3b970 Merge "Fix issue 3261656." into honeycomb 2011-01-07 17:20:59 -08:00
Eric Laurent
a60e212d0d Fix issue 3261656.
The problem can occur if a sample is started at the same time as the last AudioTrack callback
for a playing sample is called. At this time, allocateChannel() can be called concurrently with moveToFront()
which can cause an entry in mChannels being used by moveToFront() to be erased temporarily by allocateChannel().

The fix consists in making sure that the SoundPool mutex is held whenever play(), stop() or done() are called.

In addition, other potential weaknesses have been removed by making sure that the channel mutex is held while
starting, stopping and processing the AudioTrack call back.

To that purpose, a mechanism similar to the channel restart method is implemented to avoid stopping channels
from the AudioTrack call back but do it from the restart thread instead.

The sound effects SounPool management in AudioService has also been improved to make sure that the samples have
been loaded when a playback request is received and also to immediately release the SoundPool when the effects are
unloaded without waiting for the GC to occur.
The SoundPool.java class was modified to allow the use of a looper attached to the thread in which the sample
loaded listener is running and not to the thread in which the SoundPool is created.

The maximum number of samples that can be loaded in a SoundPool lifetime as been increased from 255 to 65535.

Change-Id: I368a3bdfda4239f807f857c3e97b70f6b31b0af3
2011-01-07 17:17:10 -08:00
pmehendale
28f939db9d Awesomeplayer : Frame dropping logic change
Changed late frame drop policy, now we are dropping only 1 in 8,
late (> 40ms) frames. Dropping every late frame result in lot of noticible
pauses, usually with peaky bitrate activity these pauses become more prominant.
Dropping few frames is still required to allow overall playback chain,
to regain the performance.
Experimentally decided to drop Max one late frame in 8.

Change-Id: If20848d619a76aaf8179b1e5c3155610e3bc85fd
2011-01-07 16:14:40 -08:00
James Dong
a173541c6b Fix uninitialized rect structure for retrieving rect cropping information from decoder
o This patch is from NV.

bug - 3333254

Change-Id: I02bc26af464ea0bc9ad9f2e111474e8398c67220
2011-01-07 14:57:34 -08:00
Marco Nelissen
ee35aff744 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

(cherry-picked from GB because of weird automerger failure)

Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
2011-01-07 12:42:07 -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
Andreas Huber
24b3a4ccd6 Fix typo.
Change-Id: I2d7796425ea746432964ce48959b6c227d31df11
2011-01-06 17:32:00 -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
Andreas Huber
ba572aaea6 If the stream for the new bandwidth doesn't have the segment we're looking for...
go back to the previous bandwidth' stream.

Change-Id: I3477cb6932102883509a7cbe9fb2b3bb02dac8c6
2011-01-06 16:32:05 -08:00