drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,287 Commits 1 Branch 0 Tags
Commit Graph

3542 Commits

Author SHA1 Message Date
Dharmaray Kundargi
b7d3312449 am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb 
* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
  Video editor API update - rework for Patch Set 3
 2011-01-17 11:40:27 -08:00
Dharmaray Kundargi
bf6ccb04b9 am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 
* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
 2011-01-17 11:40:16 -08:00
Dharmaray Kundargi
f7465eb652 am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb 
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
  videoeditor JNI files on honeycomb
 2011-01-17 11:40:11 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
 2011-01-17 10:53:06 -08:00
Dharmaray Kundargi
9ed99405ae Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Dharmaray Kundargi
307003a844 Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692. 
The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
 2011-01-17 10:36:12 -08:00
Dharmaray Kundargi
cd196d3727 videoeditor JNI files on honeycomb 
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
 2011-01-16 19:19:07 -08:00
Santosh Madhava
9bcedf7cf3 Video editor API update - rework for Patch Set 3 
Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
 2011-01-16 16:56:12 -08:00
Dharmaray Kundargi
3b3cddccc1 integrate videoeditor preview player. 
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
 2011-01-16 16:43:20 -08:00
James Dong
b3f4477389 am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb 
* commit 'e7df0ddee486f4705b17b4d8ed57ddbeb8b71943':
  Fixed thrashing in the cached buffer during 720p YT video streaming
 2011-01-14 19:22:26 -08:00
James Dong
ac0e4bdf05 Fixed thrashing in the cached buffer during 720p YT video streaming 
bug - 3340194

Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
 2011-01-14 15:15:12 -08:00
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