OSDN Git Service
Andreas Huber [Mon, 29 Aug 2011 22:18:26 +0000 (15:18 -0700)]
am
499f3658: Merge "Return an error to the client instead of asserting if decoder instantiation fails"
* commit '
499f36581c63579f24c3d9bbf95c7f8677cd1191':
Return an error to the client instead of asserting if decoder instantiation fails
Andreas Huber [Mon, 29 Aug 2011 20:01:23 +0000 (13:01 -0700)]
Return an error to the client instead of asserting if decoder instantiation fails
after a surface change.
Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug:
5212725
John Grossman [Mon, 29 Aug 2011 17:26:47 +0000 (10:26 -0700)]
Add a missing NULL check.
The get_next_write_timestamp method introduced to the audio HAL is optional.
HALs which do not implement it leave it set to NULL. Callers (there is
currently only one in the AudioMixer code) need to be certain to check for NULL
before invoking it.
Change-Id: I9e06d688311c388446bb53993291ebc0f98cff89
Andreas Huber [Mon, 29 Aug 2011 15:13:47 +0000 (08:13 -0700)]
am
b3c084af: Merge "Signal errors to the client instead of asserting in ACodec."
* commit '
b3c084af16dfd50c20c10320bf2b1e8d4d0cc5b8':
Signal errors to the client instead of asserting in ACodec.
Andreas Huber [Mon, 29 Aug 2011 15:10:56 +0000 (08:10 -0700)]
Merge "Signal errors to the client instead of asserting in ACodec."
Pannag Sanketi [Sun, 28 Aug 2011 21:42:33 +0000 (14:42 -0700)]
am
3451df1a: Merge "Default W, H allowed in SurfaceMediaSource dequeue"
* commit '
3451df1a5cc1547fe1061a482a50a639fcc0e8e4':
Default W, H allowed in SurfaceMediaSource dequeue
Pannag Sanketi [Sun, 28 Aug 2011 21:40:26 +0000 (14:40 -0700)]
Merge "Default W, H allowed in SurfaceMediaSource dequeue"
Pannag Sanketi [Sat, 27 Aug 2011 03:08:09 +0000 (20:08 -0700)]
am
b8a9e15c: Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
* commit '
b8a9e15c2aa3d317834555244a90f184b46e1dcb':
Modify enum value of OMX_COLOR_FormatAndroidOpaque
Pannag Sanketi [Sat, 27 Aug 2011 03:05:58 +0000 (20:05 -0700)]
Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
Pannag Sanketi [Sat, 27 Aug 2011 03:03:09 +0000 (20:03 -0700)]
am
2b9c5d8a: Merge "Fixing small syntax error in MPEG4 logging"
* commit '
2b9c5d8a89065ab18e58d79ae65a81267b248e1c':
Fixing small syntax error in MPEG4 logging
Pannag Sanketi [Sat, 27 Aug 2011 03:01:46 +0000 (20:01 -0700)]
Merge "Fixing small syntax error in MPEG4 logging"
Pannag Sanketi [Sat, 27 Aug 2011 02:34:49 +0000 (19:34 -0700)]
Modify enum value of OMX_COLOR_FormatAndroidOpaque
The enum value chosen earlier had a conflict with one of the vendors.
Change-Id: I47832dd1157447f89324d56e8ab146260cd7927c
Pannag Sanketi [Sat, 27 Aug 2011 02:17:20 +0000 (19:17 -0700)]
Fixing small syntax error in MPEG4 logging
Found that the build was breaking when the logging was enabled in
MPEG4Writer. Fixed.
Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223
Andreas Huber [Fri, 26 Aug 2011 23:02:19 +0000 (16:02 -0700)]
Signal errors to the client instead of asserting in ACodec.
Also make sure NuPlayer can properly shutdown in certain edge cases.
Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
Mike J. Chen [Mon, 15 Aug 2011 20:28:26 +0000 (13:28 -0700)]
Media framework changes for Tungsten.
Squashed merge from master-tungsten of the following changes:
commit
73d09e18c4557e583a1684d44d598a1a02fd0cf2
Author: John Grossman <johngro@google.com>
Date: Mon Jun 20 13:57:44 2011 -0700
Remove TungstenMisc and rename LinearTransform
Change-Id: Ie8aa3e24e09fdbf6ef8996c26deb9c5640e20d1b
commit
3114aabe76ad733b59929d87e49c68229f5ae2e8
Author: John Grossman <johngro@google.com>
Date: Fri Jun 3 10:47:16 2011 -0700
Name changes and spelling fixes.
+ Replace the term TungstenTime with the Eugene-approved term CommonTime.
+ Fix a spelling error in a comment I noticed.
Change-Id: I8c10d618206826d16055f78c7724e24443bb03fd
commit
cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date: Fri Apr 15 09:27:54 2011 -0700
Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.
Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502
commit
bc7c46aa629f9883e959ef23de8da297f9eb508b
Author: Jason Simmons <jsimmons@google.com>
Date: Mon Jun 20 13:59:17 2011 -0700
Create a separate class for timed AudioTracks
commit
43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 18:59:12 2011 -0700
Move libaah_rtp over from the vendor directory.
Also move factor PipeEvent out into utils.
Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37
commit
17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date: Mon Jun 27 17:06:49 2011 -0700
Name changes for the TRTP Players s/tungsten/aah/g
Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51
commit
423fc1bfc0fda799c421a650c83c4b9293b1a08c
Author: Jason Simmons <jsimmons@google.com>
Date: Mon Jun 20 17:56:09 2011 -0700
More timed AudioFlinger changes requested by code review:
* change trimTimedBufferQueue to trimTimedBufferQueue_l
* create one timed audio buffer heap per client process instead of one per track
* grow the silence buffer on demand
* some error handling fixes in timed getNextBuffer
* calculate the next output PTS in all mixer and track hooks
Change-Id: Ifc51a08b55029b7c48902ab2f22933ad7bafe1ad
commit
a148e2674b1d3cb73289b82b85c333f0a66824a9
Author: John Grossman <johngro@google.com>
Date: Mon Jun 20 17:02:24 2011 -0700
Move the A@H time service into frameworks/base
Change-Id: I5c570cde70e8931e205516cb33517585804ce841
commit
dfa438fa49bdaeeb2ec5fd0d17b30d881608b6b1
Author: John Grossman <johngro@google.com>
Date: Mon Jun 20 11:55:36 2011 -0700
Fix the build after Mike's code moving.
Change-Id: Ia883643ded252168bcc5a70584ab6ce97bb05266
commit
04489474ec8e73efe1bf52918831f41659033162
Author: John Grossman <johngro@google.com>
Date: Fri Jun 17 14:19:50 2011 -0700
Refactor the local/common clock services.
This change is one of a set of 5 changes made to different repositories. Look
for this comment in all of them.
Refactor the local/common clock services in tungsten to match android best
practice. Notable changes include
+ The kernel no longer knows anything about common time. Common time has been
moved completely up into user land. This has an impact on the accuracy of the
timesync debugging code, and the netfilter assisted approach to network based
timesync is going to have to be modified.
+ The timesync driver used by A@H is now just local time driver.
+ The kernel no longer needs access to the linear transform math code, and it
has been removed.
+ A new HAL has been introduced to expose the concept of local time to the
system.
+ A non-slewable stub implementation of the local time HAL based on
CLOCK_MONOTONIC has been added.
+ The TungstenTime library has been eliminated. Its functionality has been
distributed among the common time binder service, the local time hal and the
linear transform utility code.
+ All clients of the old TungstenTime library have been changed to be clients of
the binder service, the hal and the utility code.
+ The reset_tt utilities have been removed, they no longer have a purpose in the
system.
+ more progress has been made in eliminating the word "tungsten" from the code.
Things left to do include
+ Finish getting rid of tungsten from the time service.
+ Move the time service into the framework; AudioFlinger's new timed mode
depends on it and the service cannot continue to live in vendor tungsten.
Change-Id: I999b6cfb4a9d267818a86d747c35eecfc6693101
commit
d48194545eed1116a84d81e2fb53315d2b0701a7
Author: Jason Simmons <jsimmons@google.com>
Date: Thu Jun 16 14:22:46 2011 -0700
Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp
Change-Id: Ice2df5628d45a7f77100e7008103b35b3d3160a4
commit
02561419db82b01ffb28df38000716c612988427
Author: John Grossman <johngro@google.com>
Date: Tue May 10 14:00:21 2011 -0700
Put in a hack for controling master volume in the policy manager.
Fix initial master volume reporting.
Change-Id: Ia6caf2bbc6083c5f99fab852baa40fff10fc5fc7
commit
549cdc3ba115dc654cdade261fb055c72c6cdb79
Author: John Grossman <johngro@google.com>
Date: Wed May 4 11:46:17 2011 -0700
Make certain the logic for computing the output stream mixing point is hardened
against underflow and overflow when input and output sample rates don't match.
Change-Id: I5ebea07c9938107b435bec7413418622767e4e16
commit
8043d8ed63f51e76d452d22be7d453d4a7794530
Author: Jason Simmons <jsimmons@google.com>
Date: Wed Apr 27 18:06:27 2011 -0700
Add the patch for timed audio support to the mono resampler
Change-Id: I526f34ae9d1e8e3b0ed2fb05af3d024d5c5fe711
commit
2be89486ef23f0b0b0cc2dc25a4c0ee691043f00
Author: John Grossman <johngro@google.com>
Date: Wed Apr 27 10:38:57 2011 -0700
Extend the AudioHWInterface to allow it to specify the initial master volume used by AudioFlinger.
Change-Id: I8823330801c927494cf7ca31a6b8f9264fbfbb26
commit
ff89a4d5e37e6a05a2b03f79ab4e97833dd66393
Author: John Grossman <johngro@google.com>
Date: Wed Apr 27 09:07:14 2011 -0700
Fix an issue with inconsistent volume reporting.
Changed masterVolume() to return the same value as the last call
to setMasterVolume when the HW layer is implementing master
volume control. The masterVolume/setMasterVolume API seems to be
an idea which was abandonded a long time ago; as of today the
system only ever sets it to 1.0 at startup and then never changes
it. Until we can figure out how the concept of external
amplifier gain control fits into the Android audio framework,
Tungsten is exposing this API via a hack-tastic invoke back door
in the TungstenRXPlayer and needs the getter/setter results to be
consistent.
Change-Id: I2ac730fa8fc9ee28c88f1a8e6f2e493eb5b65544
commit
086511b2d19cceb976747ac23e12b73fc7c28bea
Author: Jason Simmons <jsimmons@google.com>
Date: Mon Apr 25 16:07:19 2011 -0700
Add handling of timed audio tracks in the generic resampling mixer
Change-Id: Ic3be1d21b1117f1b233808be543c28a0dcec4792
Change-Id: Id78bba8c002131d8b52b4170259a87fd94e63c73
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
Andreas Huber [Fri, 26 Aug 2011 20:47:26 +0000 (13:47 -0700)]
Merge "Support for posting messages and synchronously waiting for a response."
Andreas Huber [Fri, 26 Aug 2011 18:26:25 +0000 (11:26 -0700)]
Properly reset the number of frames we think we've written to the audio sink
in order to compute the final delay before posting end-of-stream correctly.
Change-Id: I4ff6d7142fdf1ea2d19d12ec78c1e84322d22e5f
related-to-bug:
5216930
Jean-Michel Trivi [Fri, 26 Aug 2011 00:41:46 +0000 (17:41 -0700)]
Merge "Bug
4364249 Play position is 0 after flushing AudioTrack"
Jean-Michel Trivi [Thu, 25 Aug 2011 23:47:23 +0000 (16:47 -0700)]
Bug
4364249 Play position is 0 after flushing AudioTrack
AudioTrack::stop() is not synchronous, so a stop() followed
by flush(), which is synchronous, will not always report
a playhead position of 0 after being called.
This CL adds a flag to mark a track as flushed, and report the
correct playhead position in this state.
Bug
5217011 has been created to address the real issue in the
future, where flush could be made synchronous, to properly
address bug
4364249.
Change-Id: Icf989d41a6bcd5985bb87764c287f3edb7e26d12
Andreas Huber [Thu, 25 Aug 2011 23:09:06 +0000 (16:09 -0700)]
Support for posting messages and synchronously waiting for a response.
Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
Andreas Huber [Thu, 25 Aug 2011 20:40:16 +0000 (13:40 -0700)]
Merge "When encountering a discontinuity, flush(clear) all content enqueued up to that"
Andreas Huber [Thu, 25 Aug 2011 19:21:26 +0000 (12:21 -0700)]
When encountering a discontinuity, flush(clear) all content enqueued up to that
point except previously enqueued discontinuities.
Change-Id: Id04a559dc062fa4a5c80c599ad74bf81a543de01
related-to-bug:
5201378
Gloria Wang [Thu, 25 Aug 2011 17:28:50 +0000 (10:28 -0700)]
Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug
5208736."
Gloria Wang [Thu, 25 Aug 2011 17:09:34 +0000 (10:09 -0700)]
Set mSeekNotificationSent as false for RTSP seeking.
Fix for bug
5208736.
Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
James Dong [Thu, 25 Aug 2011 15:12:11 +0000 (08:12 -0700)]
Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."
James Dong [Thu, 25 Aug 2011 02:50:36 +0000 (19:50 -0700)]
When Camera is launched by media recording framework, stagefright controls the stop and release.
Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3
related-to-bug:
5205804
Chih-Chung Chang [Thu, 25 Aug 2011 01:57:35 +0000 (18:57 -0700)]
Merge "Port setting change should happen before receiving any filled frame."
Pannag Sanketi [Thu, 25 Aug 2011 00:39:09 +0000 (17:39 -0700)]
Default W, H allowed in SurfaceMediaSource dequeue
The client does not have to send (w, h) = (0,0) in dequeuebuffer. It can
set the same w, h as the default width and height.
Change-Id: I8202f90261ccaebbd35ea28c153a7472f01912f1
Pannag Sanketi [Wed, 24 Aug 2011 22:18:07 +0000 (15:18 -0700)]
Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"
Pannag Sanketi [Fri, 19 Aug 2011 04:53:02 +0000 (21:53 -0700)]
Testing the GL/ CPU encoding w/ Gralloc buffers
This is the test for Gralloc buffers based encoding.
contains a combination of two main changes:
1. GL based encoding tests added to SurfaceMediaSource_test
2. SurfaceMediaSource ::read() colorformat
The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque.
The omx encoder needs to interpret that colorformat and reads the format
from the Gralloc buffers directly
Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
James Dong [Wed, 24 Aug 2011 01:06:16 +0000 (18:06 -0700)]
Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
Andreas Huber [Tue, 23 Aug 2011 17:32:35 +0000 (10:32 -0700)]
Merge "We were accidentally sending out an output buffer before the final port settings change"
Andreas Huber [Tue, 23 Aug 2011 17:21:34 +0000 (10:21 -0700)]
We were accidentally sending out an output buffer before the final port settings change
Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug:
5122512
Eric Laurent [Tue, 23 Aug 2011 15:42:59 +0000 (08:42 -0700)]
Merge "AudioFlinger: add check for audio HAL init failure"
Eric Laurent [Tue, 23 Aug 2011 15:25:03 +0000 (08:25 -0700)]
AudioFlinger: add check for audio HAL init failure
Do not call audio HAL functions on the primary HW interface
if it could not be initialized properly.
Change-Id: If54059c8fd188d6c1686f9e0439994fe9411478a
Chih-Chung Chang [Mon, 22 Aug 2011 12:11:31 +0000 (20:11 +0800)]
Port setting change should happen before receiving any filled frame.
Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439
Andreas Huber [Mon, 22 Aug 2011 20:21:26 +0000 (13:21 -0700)]
The MatroskaExtractor will now publish a different mime-type "video/webm" if
the doctype of the matroska file indicates that it is a webm file.
Change-Id: I467f597690a841043ecd11d2a2cae93351820f1b
related-to-bug:
5042137
Chih-Chung Chang [Mon, 22 Aug 2011 02:19:01 +0000 (19:19 -0700)]
Merge "Remove useAndroidNativeBuffer(2) warning message."
Rajneesh Chowdury [Fri, 19 Aug 2011 22:01:11 +0000 (15:01 -0700)]
Merge "Fix for
4142219 Don't hard code platform-specific limitations (Jni/ Java)"
Jamie Gennis [Fri, 19 Aug 2011 21:36:10 +0000 (14:36 -0700)]
Merge "Stagefright: fix a compiler warning"
Rajneesh Chowdury [Fri, 12 Aug 2011 23:43:37 +0000 (16:43 -0700)]
Fix for
4142219 Don't hard code platform-specific limitations (Jni/ Java)
Also fixes
5118207 add other video codec support for video editor export.
Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
Andreas Huber [Fri, 19 Aug 2011 17:30:58 +0000 (10:30 -0700)]
Raise the maximum input buffer size for the vpx video decoder to 256KB
Change-Id: I0411763829bf186d1b3b679fa72c9051524506b4
related-to-bug:
5169641
Gloria Wang [Thu, 18 Aug 2011 22:14:36 +0000 (15:14 -0700)]
Merge "When switching surface, do not set mSeekNotificationSent as true, because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug
5181272."
Gloria Wang [Thu, 18 Aug 2011 21:52:36 +0000 (14:52 -0700)]
When switching surface, do not set mSeekNotificationSent as true,
because there could be a previous uncompleted seeking which needs
to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent
as true here, then mediaplayer.cpp will be waiting for message
MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return
the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp.
Fix for bug
5181272.
Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
Andreas Huber [Thu, 18 Aug 2011 18:46:18 +0000 (11:46 -0700)]
Merge "Some decoders require more gentle treatment"
James Dong [Fri, 12 Aug 2011 00:38:35 +0000 (17:38 -0700)]
Some decoders require more gentle treatment
We sacrifice A/V sync to some extent to enable the decoder to recover from
temporary bottlenecks.
Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118
related-to-bug:
5180142
Andreas Huber [Thu, 18 Aug 2011 17:53:23 +0000 (10:53 -0700)]
Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.
Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec
related-to-bug:
5179033
Chih-Chung Chang [Thu, 18 Aug 2011 08:56:36 +0000 (16:56 +0800)]
Remove useAndroidNativeBuffer(2) warning message.
Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
Dongwon Kang [Thu, 18 Aug 2011 06:24:27 +0000 (15:24 +0900)]
To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.
Note: current resync logic keeps searching mp3 frames until it meets a
valid one. This resync logic works well with seek() operation, but in
SniffMP3(), this may cause false-positive classification for the
following MPEG-PS file format.
A possible MPEG-PS video file:
[PS header]...[mp3 frame][mp3 frame] ...
MP3 files:
[ID3 tag][mp3 frame][mp3 frame] ...
BUG:
5104562
Change-Id: Idd5020723f7bdb2fefc2a63fc8651580fd644399
Wu-cheng Li [Thu, 18 Aug 2011 05:24:53 +0000 (22:24 -0700)]
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
Andreas Huber [Wed, 17 Aug 2011 20:21:40 +0000 (13:21 -0700)]
Merge "Make sure we have all the sample table metadata before declaring a track valid."
Andreas Huber [Wed, 17 Aug 2011 20:03:51 +0000 (13:03 -0700)]
Make sure we have all the sample table metadata before declaring a track valid.
Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug:
5178976
James Dong [Wed, 17 Aug 2011 18:14:49 +0000 (11:14 -0700)]
Merge "Don't time out prematurely for video encoding waiting for output buffers"
Wu-cheng Li [Tue, 16 Aug 2011 13:14:16 +0000 (21:14 +0800)]
Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.
The API is still hidden.
bug:
5086125
Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
Kristian Monsen [Wed, 17 Aug 2011 09:41:00 +0000 (02:41 -0700)]
Merge "Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
Andreas Huber [Tue, 16 Aug 2011 21:37:51 +0000 (14:37 -0700)]
Merge "Error handling in ACodec and Nuplayer."
Andreas Huber [Tue, 16 Aug 2011 20:48:44 +0000 (13:48 -0700)]
Error handling in ACodec and Nuplayer.
Codec errors (and codec not found errors) now trigger a controlled shutdown
of playback and signal errors to the MediaPlayer client.
Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
Andreas Huber [Tue, 16 Aug 2011 19:41:41 +0000 (12:41 -0700)]
Properly initialize some instance variables.
Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
James Dong [Sun, 14 Aug 2011 23:14:12 +0000 (16:14 -0700)]
Don't time out prematurely for video encoding waiting for output buffers
o For timelapse video encoding, the timelapse between two neighoring
input frames could be very long
Change-Id: I2b6f9c392f2237deae71c894efc7fc3692431796
related-to-bug:
5160548
Kristian Monsen [Tue, 16 Aug 2011 15:31:05 +0000 (16:31 +0100)]
Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2
Reenabling chromium as a shread lib
Change-Id: I5f7abe61624d812c5781c4a453f587e744bc082d
Eric Laurent [Wed, 3 Aug 2011 00:41:11 +0000 (17:41 -0700)]
Issue
5081351: isWiredHeadsetOn() permission.
AudioManager.isWiredHeadsetOn() should not require permission MODIFY_AUDIO_SETTINGS.
Remove permission checks on all getters in audio policy manager as permission enforcement
is really usefull for setters.
Also deprecate AudioManager.isWiredHeadsetOn() which name and implementation are deceptive.
Change-Id: I38f8df7c26c0d417bf0e2b74e4c11c2d143f2ecd
Marco Nelissen [Fri, 12 Aug 2011 21:14:39 +0000 (14:14 -0700)]
Don't remove effects on session 0
b/
5159902
Change-Id: Id6f29fb1c687069f7480dd81d4745a558f202226
Jason Simmons [Fri, 12 Aug 2011 20:46:55 +0000 (13:46 -0700)]
Add a null check to handle failure of android::createPlayer
Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4
Andreas Huber [Fri, 12 Aug 2011 18:38:24 +0000 (11:38 -0700)]
Fix the software AAC decoder's AAC+ detection to ignore malformed frames
at the beginning of the stream.
Change-Id: Ib990848c696896e7d43c80dec8119dec35704b74
related-to-bug:
5122512
Jamie Gennis [Fri, 12 Aug 2011 00:59:24 +0000 (17:59 -0700)]
Stagefright: fix a compiler warning
Change-Id: Ia6b2027dfe80960450156d918bdd7fe1567cafea
Eric Laurent [Thu, 11 Aug 2011 21:40:04 +0000 (14:40 -0700)]
Merge "Audio effects: track CPU and memory use separately"
Eric Laurent [Wed, 10 Aug 2011 17:37:50 +0000 (10:37 -0700)]
Audio effects: track CPU and memory use separately
Before this change, CPU and memory usage for an audio effect were
registered and checked against the limit by audio policy manager
upon effect instantiation. Even if an effect was not enabled
it would prevent another effect to be created if the CPU load budget
was exceeded, which was too restrictive.
This change adds a method to register/unregister CPU load only when
an effect is enabled or disabled.
It also adds a mechanism to place all effects on the global output mix
in suspend state (disabled) when an effect is enabled on a specific session.
This will allow applications using session effects to have the priority
over others using global effects.
Also fixes some issues with suspend/restore mechanism:
- avoid taking actions when an effect is disconnected and was not enabled.
- do not remove a session from the suspended sessions list when corresponding
effect chain is destroyed.
Change-Id: I5225278aba1ae13d0d0997bfe26a0c9fb46b17d3
Kristian Monsen [Thu, 11 Aug 2011 10:02:29 +0000 (03:02 -0700)]
Merge "Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
Gloria Wang [Wed, 10 Aug 2011 21:52:36 +0000 (14:52 -0700)]
Merge "To reduce the bytes need to be buffered before start playing the streaming video. We might revert this change if too many spinnings were introduced. For bug
4448008."
Gloria Wang [Wed, 10 Aug 2011 21:19:05 +0000 (14:19 -0700)]
To reduce the bytes need to be buffered before start playing the streaming video.
We might revert this change if too many spinnings were introduced.
For bug
4448008.
Change-Id: I3248bba9237d71c2bd99feebc9c73f7bd45260de
Andreas Huber [Wed, 10 Aug 2011 20:03:29 +0000 (13:03 -0700)]
Merge "When using "secure input buffer mode" we instantiate a different OMX component"
Andreas Huber [Wed, 10 Aug 2011 20:03:24 +0000 (13:03 -0700)]
Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
Andreas Huber [Wed, 10 Aug 2011 19:53:59 +0000 (12:53 -0700)]
When using "secure input buffer mode" we instantiate a different OMX component
We form the new component name by appending the suffix ".secure".
Change-Id: I509848b50ae92edb179a941493ca611f923213ec
Andreas Huber [Wed, 10 Aug 2011 19:45:24 +0000 (12:45 -0700)]
Revert "Notify the OMX component that it's going to be used in "secure" mode."
This reverts commit
7616178271e95f009452a21ea45e7225997dc27a.
James Dong [Wed, 10 Aug 2011 18:47:38 +0000 (11:47 -0700)]
Merge "Fix initial 0 duration video sample in the recorded videos"
Gloria Wang [Wed, 10 Aug 2011 16:28:50 +0000 (09:28 -0700)]
Merge "To support for switching from a non-null surface/ surface texture to a null one, and vice versa. Fix for bug
5137445."
Kristian Monsen [Wed, 10 Aug 2011 14:08:27 +0000 (15:08 +0100)]
Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2
Trying to build with static libchromium on the build server.
Change-Id: Ib88ce1803f3d36ef97a627c1454ed83239a3afee
Ashish Sharma [Wed, 10 Aug 2011 06:21:11 +0000 (23:21 -0700)]
Merge "Network traffic accounting for chromium stack support in mediaserver."
Gloria Wang [Tue, 9 Aug 2011 22:29:34 +0000 (15:29 -0700)]
To support for switching from a non-null surface/ surface texture to
a null one, and vice versa.
Fix for bug
5137445.
Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
Mathias Agopian [Tue, 9 Aug 2011 22:23:19 +0000 (15:23 -0700)]
Merge changes Ie06e73e5,I7ac6b5b0
* changes:
free all buffers when ANativeWindow::disconnect is called
return correct value from query after connecting a surface
James Dong [Tue, 9 Aug 2011 18:14:57 +0000 (11:14 -0700)]
Fix initial 0 duration video sample in the recorded videos
o Patch suggested by pmehendale@nvidia.com
Change-Id: Ibf516ba83b721b0d0ab55bb7637fe9b7b2958214
related-to-bug:
5117434
James Dong [Tue, 9 Aug 2011 18:14:06 +0000 (11:14 -0700)]
Merge "Do not release recording frames if camera is gone"
Marco Nelissen [Tue, 2 Aug 2011 20:33:41 +0000 (13:33 -0700)]
Keep effects sessions active when the caller dies.
Don't remove effects until the session they are in goes away or all
AudioEffects have been explicitly released. This allows the control
panel process to die without stopping the effects.
Change-Id: I4496e5df080230ca1af149dec95c1309ab8ea888
Mathias Agopian [Tue, 9 Aug 2011 02:14:03 +0000 (19:14 -0700)]
return correct value from query after connecting a surface
the first time a surface was connected, the values returned
by query NATIVE_WINDOW_DEFAULT_{WIDTH|HEIGHT} and
NATIVE_WINDOW_TRANSFORM_HINT were wrong until a call
to queueBuffer was performed.
Bug:
5137366,
5121607
Change-Id: I7ac6b5b0daa876638f6bed7c20f286a6e6d984f6
Andreas Huber [Mon, 8 Aug 2011 22:28:21 +0000 (15:28 -0700)]
Notify the OMX component that it's going to be used in "secure" mode.
Change-Id: Id87c4b295eb38f7d24045918e73df298d7b842f9
related-to-bug:
5137212
Eric Laurent [Mon, 8 Aug 2011 16:31:42 +0000 (09:31 -0700)]
Merge "AudioFlinger: protect input/output stream access"
Eric Laurent [Sun, 7 Aug 2011 23:32:26 +0000 (16:32 -0700)]
AudioFlinger: protect input/output stream access
Some methods would not check that the output orinput stream of a thread
was still valid before calling functions on its interface.
This could cause a crash if those methods where called while the output or
input was being closed by another thread.
Make sure that the output or input stream pointer is cleared before closing the
stream.
Always check that the output or input pointer is not null before calling
functions at the stream interface.
Generalize the use of initCheck() method to verify that the output or input
stream is not null.
Change-Id: I9d9ca6b744d011bcf3a7bbacb4a581ac1477bfa5
James Dong [Sat, 6 Aug 2011 00:19:29 +0000 (17:19 -0700)]
Do not release recording frames if camera is gone
Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76
related-to-bug:
5129465
Ashish Sharma [Fri, 8 Jul 2011 00:57:05 +0000 (17:57 -0700)]
Network traffic accounting for chromium stack support in mediaserver.
- Atribute network activity to uid calling the mediaplayer
- Enables logging of chromium network stack in logcat
Change-Id: I2d28c8392248a056b3cee305dd4d4475ebba4337
Gloria Wang [Thu, 4 Aug 2011 23:32:10 +0000 (16:32 -0700)]
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug
5015079."
Gloria Wang [Thu, 4 Aug 2011 23:01:35 +0000 (16:01 -0700)]
Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug
5015079.
Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
Gloria Wang [Thu, 4 Aug 2011 22:33:12 +0000 (15:33 -0700)]
Merge "resolved conflicts for merge of
845fdba7 to master"
Gloria Wang [Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)]
resolved conflicts for merge of
845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
Andreas Huber [Thu, 4 Aug 2011 22:05:17 +0000 (15:05 -0700)]
Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug:
5122973
Gloria Wang [Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)]
am
8a6fb50d: am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
Andreas Huber [Thu, 4 Aug 2011 19:02:47 +0000 (12:02 -0700)]
Restart HLS streaming from the bottom of the playlist if we miss the boat on the
next segment. This can happen if for whatever reason we playback video slower than
it is served.
Also removed some unnecessary verbosity from ChromiumHTTPDataSource.
Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug:
5120425
Henrik B Andersson [Mon, 21 Feb 2011 13:22:08 +0000 (14:22 +0100)]
Bug fixes in OMA DRM v1 Forward Lock Agent
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.
Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
Wu-cheng Li [Thu, 4 Aug 2011 08:46:56 +0000 (01:46 -0700)]
Merge "Add camera bayer image format."
Wu-cheng Li [Tue, 2 Aug 2011 09:49:50 +0000 (17:49 +0800)]
Add camera bayer image format.
The API are hidden.
bug:
5086073
Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
Gloria Wang [Wed, 3 Aug 2011 22:37:24 +0000 (15:37 -0700)]
Merge "Check the syncword for each frame. Fix for bug
5117233."