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

5965 Commits

Author SHA1 Message Date
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
Glenn Kasten
76b6c0c1f5 Update comments 
Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
 2012-03-19 14:12:01 -07:00
Glenn Kasten
f6b8f7b34f Merge "audio_channel_in/out_mask_from_count" 2012-03-19 07:31:58 -07:00
Wu-cheng Li
c59d1a8f0c Do not set camera preview display if the surface is null. 
MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.

bug:5988937

Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
 2012-03-19 13:54:15 +08:00
Andreas Huber
4108fbc299 Merge "ACodec is a little more aggressive in its error checking now." 2012-03-16 13:15:53 -07:00
Andreas Huber
ad3e7e2233 ACodec is a little more aggressive in its error checking now. 
Update components to do the right thing.

Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
 2012-03-16 12:00:18 -07:00
Glenn Kasten
ae75f994cc Add libmedia_native 
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
 2012-03-16 11:51:30 -07:00
Andreas Huber
996598bf30 Merge "Remove obsolete software codec header files and amr encoders." 2012-03-16 11:38:38 -07:00
Andreas Huber
949a0640d4 Remove obsolete software codec header files and amr encoders. 
Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
 2012-03-16 11:01:11 -07:00
Marco Nelissen
2833eaf03a Merge "Skip XING/VBRI frame when decoding" 2012-03-16 10:11:13 -07:00
Glenn Kasten
3e6038ddc9 am 97824b70: am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit '97824b706d8865b50faf2f09d0cf969bec0874e3':
  Add empty libmedia_native in old location
 2012-03-16 10:06:49 -07:00
Glenn Kasten
aa1bd6dec6 am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit 'd8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
  Add empty libmedia_native in old location
 2012-03-16 10:01:28 -07:00
Andreas Huber
f3f67bdb91 Merge "Remove obsolete OMXComponentBase class" 2012-03-16 09:57:23 -07:00
Andreas Huber
19eb86dcbc Remove obsolete OMXComponentBase class 
Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
 2012-03-16 08:46:36 -07:00
Marco Nelissen
4fc769e9df Skip XING/VBRI frame when decoding 
Don't send the XING/VBRI frame to the decoder, as it will result in
extra data being output. Also clean up the XING seeker code a bit.

Change-Id: I714a94180edae9bedc1bc0c96bf382fe6f928ac6
 2012-03-16 08:36:30 -07:00
Insun Kang
f08cdd7fd6 Fix a bug in MediaPlayer's addExternalSource(). 
Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
 2012-03-16 16:00:48 +09:00
Glenn Kasten
d8cc14211a am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
  Add empty libmedia_native in old location
 2012-03-15 22:09:38 -07:00
Wu-cheng Li
8d3c318b2d Merge "Add a new camera open API that allows taking the ownership." 2012-03-15 21:23:24 -07:00
Glenn Kasten
e6aa25bb8e Add empty libmedia_native in old location 
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects.  Then those projects will not
need to be updated atomically when libmedia_native is moved.

Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
 2012-03-15 15:32:20 -07:00
Glenn Kasten
94a36440ba audio_channel_in/out_mask_from_count 
and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count

Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
 2012-03-15 13:15:27 -07:00
Glenn Kasten
4513bc0f28 Merge "Remove dependency on audio_* location" 2012-03-15 07:53:54 -07:00
Wu-cheng Li
a1c41e13b5 Add a new camera open API that allows taking the ownership. 
The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
 2012-03-15 14:50:48 +08:00
James Dong
77cda104ac Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks." 2012-03-14 17:45:18 -07:00