5988 Commits

Author SHA1 Message Date
James Dong
ba4d043331 frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
2012-03-28 11:03:25 -07:00
James Dong
d927a1d996 Deleted the media, camera, drm related files since they are relocated
Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
2012-03-28 10:42:44 -07:00
Marius Renn
65953da463 Multi-Project Commit: Move of filterfw out of system/media (2 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I9f42be5a12a9e8157512be11f04e38e4548970be
2012-03-27 10:44:45 -07:00
Colin Cross
0821013609 stagefright: compile without chromium for pdk builds
Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
2012-03-26 12:24:52 -07:00
Andreas Huber
b3e2e24f78 Merge "Provisional support for secure decryption of media streams." 2012-03-26 11:43:06 -07:00
James Dong
61bf87428c Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h" 2012-03-26 11:41:21 -07:00
Eric Laurent
a561965842 Merge "fix visualizer inactivity detection" 2012-03-26 11:27:41 -07:00
Andreas Huber
9b8e496f4d Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
2012-03-26 11:24:04 -07:00
Eric Laurent
383c4b3e63 Merge "reorganize SoundPool and JetPlayer code." 2012-03-26 11:23:49 -07:00
Colin Cross
56ca534e65 Merge changes Ib4d0e0c0,Iea8f4a23
* changes:
  libmedia: remove skia include
  stagefright: remove dependency on skia
2012-03-26 11:22:29 -07:00
James Dong
6e43c1b51b Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h
o related-to-bug: 6214141

Change-Id: I548d84a9888be884d3903dc9dea9235258792165
2012-03-26 11:18:35 -07:00
Eric Laurent
b460566388 fix visualizer inactivity detection
Current method implemented by the visualizer to detect that audioflinger has
stopped providing audio buffers does not work if the application
reads pcm captures too fast.

The fix consist in implementing a method based on real time measurement only.
One drawback is that the new method makes use of system calls that add some
overhead to the process and capture functions.

Change-Id: I53bd596b856f1cc7f0f47e08413af3335227100b
2012-03-26 11:05:25 -07:00
Eric Laurent
f5e1812549 reorganize SoundPool and JetPlayer code.
Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.

Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.

Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
2012-03-26 10:54:41 -07:00
Marco Nelissen
7061b5ffb3 Merge "Speed up playlist processing" 2012-03-26 07:36:41 -07:00
Glenn Kasten
39581f9248 Merge "IAudioFlinger::createTrack and openRecord flags" 2012-03-26 07:16:37 -07:00
Colin Cross
fe6ecdae58 libmedia: remove skia include
skia is not used in this file, remove the unnecessary include.

Change-Id: Ib4d0e0c0090c6b37ff8cfb816c0d8ba82a9638a4
2012-03-24 23:34:44 -07:00
James Dong
209cfdf4f6 Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.
o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
2012-03-24 10:59:14 -07:00
James Dong
3b3a5b100b Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted." 2012-03-24 09:57:06 -07:00
James Dong
6e3bceef9c VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted.
o this is to resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni
o related-to-bug: 6214141

Change-Id: I62d08a7789ecb34d35cd22d2e6f68c3510c9bd90
2012-03-24 09:42:59 -07:00
Yu Shan Emily Lau
660b014daa Merge "Insert 2 seconds wait in each test case setup. This is the work around for the surface request race condition." 2012-03-23 18:53:18 -07:00
Yu Shan Emily Lau
003a756974 Insert 2 seconds wait in each test case setup.
This is the work around for the surface request race
condition.

Change-Id: Iaf8be12cfe4eb70d0a309ad875f38427181ac4b4
2012-03-23 17:58:49 -07:00
Marco Nelissen
c164faa831 Speed up playlist processing
The recent removal of the cache from MediaScanner (commit 58ef68905d67e356eb)
slowed down processing of playlists, in some cases significantly, due to every
line in a playlist prompting a query that looped over the entire audio table.

With this change, the query is only done once instead of for every line,
and the code starts iterating over the Cursor starting near the point of
the last match, instead of from the start. The latter is especially helpful
when the entire query result is too large to fit in a CursorWindow, since
it reduces the number of times that sqlite has to perform an offset query
under the hood to refil the window.

Change-Id: I9fea990b3b8c86571384de2122708fb7e809c355
2012-03-23 16:37:50 -07:00
Glenn Kasten
a945aad739 Merge "Revert "Split libmedia into libmedia and libmedia_native"" 2012-03-23 14:06:00 -07:00
Glenn Kasten
eb3be2d8c5 Revert "Split libmedia into libmedia and libmedia_native"
This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb
2012-03-23 14:05:52 -07:00
Andreas Huber
6f64c90c84 Fix the file mimetype reported by the mpeg4 extractor.
Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b
related-to-bug: 6217289
2012-03-23 08:39:04 -07:00
James Dong
798cda73e1 Change Android.mk file to use the new location after /frameworks/media/libvideoeditor source files are moved
o related-to-bug: 6214141

Change-Id: Ic9f07a8558e944237ccaba4f756fcab59f84e78f
2012-03-22 19:11:43 -07:00
Lei Zhang
6c798970cc Add batch volume adjust support to adjustMasterVolume() in AudioManager and
AudioService.

Change-Id: I09b1dfc93f14ca836e1ba2a400c00caed01fd541
2012-03-22 15:09:18 -07:00
RoboErik
24b082f87e Fix Audio ramping code
The audio ramping was being ignored and we were always adjusting
by the same amount.

Change-Id: Id4a6587fd488132816ae26776c0f798782470b1d
2012-03-22 15:09:12 -07:00
Andreas Huber
4355b001cb Merge "Use NuPlayer for media playback everywhere" 2012-03-22 14:00:53 -07:00
Andreas Huber
8686938aa5 Use NuPlayer for media playback everywhere
if media.stagefright.use-nuplayer is set to true.

Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
2012-03-22 13:18:08 -07:00
Glenn Kasten
bf30911bf1 Merge "Remove enforceFrameCount" 2012-03-22 11:06:49 -07:00
Marco Nelissen
da9deca7ba Support gapless playback for mp3 and m4a
Gapless playback for appropriately tagged mp3 and m4a files.
Currently this is implemented in OMXCodec, which most players
use, but should be easy to support in other players as well by
using the SkipCutBuffer utility class.

Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
2012-03-22 10:06:03 -07:00
Glenn Kasten
222dfc784e Merge "Split libmedia into libmedia and libmedia_native" 2012-03-22 07:14:27 -07:00
Glenn Kasten
0a3edd38df Split libmedia into libmedia and libmedia_native
This is still in the old location

Change-Id: Ic1be549b5b607cfd519cb4cecc581624510a4ee1
2012-03-21 15:45:29 -07:00
Glenn Kasten
2333a27ee5 Remove enforceFrameCount
It was only used to decide whether to issue a warning.
The warning was issued the first time track was created but
not at re-creation.  Now it is a verbose message every time,
not a warning since it happens all the time with key clicks on A2DP.

Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
2012-03-21 15:41:02 -07:00
Marco Nelissen
3e6792232a Merge "Add MetaData::dumpToLog" 2012-03-21 15:12:44 -07:00
Marco Nelissen
d0a524fb59 Add MetaData::dumpToLog
Utility method for dumping the content of a MetaData object to the log.

Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
2012-03-21 15:00:27 -07:00
Marco Nelissen
ceb0909bc2 Merge "Parse gapless info from mp4 files" 2012-03-21 10:16:55 -07:00
Marco Nelissen
eb473f3627 Parse gapless info from mp4 files
Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
2012-03-21 09:50:53 -07:00
Glenn Kasten
652e18d896 Merge "Update comments" 2012-03-21 07:24:21 -07:00
Glenn Kasten
32d72b2f53 Merge "Whitespace" 2012-03-21 07:22:40 -07:00
James Dong
abcc868f3a Merge "Handling end times of subtitles." 2012-03-20 18:53:29 -07:00
Insun Kang
56aeeb8d7a Handling end times of subtitles.
Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
2012-03-21 10:44:04 +09:00
Marco Nelissen
dd5bd2981d Merge "Move COM tag parsing to constructor" 2012-03-20 10:08:52 -07:00
Marco Nelissen
7306a388cb Move COM tag parsing to constructor
Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
2012-03-20 09:48:02 -07:00
Marco Nelissen
54fa725483 Merge "Parse mp3 encoder padding/delay" 2012-03-20 09:15:05 -07:00
Marco Nelissen
2ed77701f9 Parse mp3 encoder padding/delay
Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag.

Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
2012-03-20 08:46:11 -07:00
Wu-cheng Li
485932f6af Merge "Do not set camera preview display if the surface is null." 2012-03-19 19:25:56 -07:00
Glenn Kasten
f743e1f6ab Whitespace
Fix indentation, and add blank lines in key places for clarity

Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
2012-03-19 17:53:33 -07:00
Glenn Kasten
4d3f82e8d9 Merge "Add libmedia_native" 2012-03-19 16:21:04 -07:00