69457 Commits

Author SHA1 Message Date
Insun Kang
41f3f716b0 Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.

o Newly introduced APIs are (MediaPlayer):
  getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().

o Timed text tracks are supported only, for now.

o TODOs:
 - Define the audio/video behavior for enableTrack and disableTrack.
 - Refactoring AwesomePlayer / TimedTextDriver so that all types of
   track index can be managed in the correct order and be ready for
   supporting audio/video tracks.
   (MediaExtractor and MediaSource for text file might be necessary.)

Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
2012-03-15 08:36:52 +09:00
Glenn Kasten
81fe4fbd6b Merge "AudioFlinger playback thread CPU measurement in Hz" 2012-03-14 16:28:38 -07:00
Russell Brenner
1f1bc8b12a Merge "Add notes about switching languages" 2012-03-14 16:15:42 -07:00
Glenn Kasten
f57e2bceb9 AudioFlinger playback thread CPU measurement in Hz
Log statistics on CPU usage in Hz in addition to wall clock time

Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).

ThreadCpuUsage library:
 - Move statistics out of the library and leave that up to the caller
 - Add API to determine a CPU's frequency

Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
2012-03-14 16:03:01 -07:00
Marco Nelissen
2af9dc5ecc Merge "Unhide MediaPlayer.setNextMediaPlayer" 2012-03-14 16:00:19 -07:00
Jason Sams
47324e940a Merge "Fix minor C++ api issues." 2012-03-14 15:43:27 -07:00
Eric Fischer
f97b46b272 Merge "Import translations. DO NOT MERGE" 2012-03-14 15:42:44 -07:00
Jason Sams
d1c8c1292c Fix minor C++ api issues.
Change-Id: I30e12938be5da52b2d952db57a51b4deb5e27239
2012-03-14 15:36:02 -07:00
Eric Laurent
5b9e0684fe Merge "audioflinger: more info in dumpsys" 2012-03-14 15:30:05 -07:00
Eric Laurent
0194a0d0dd audioflinger: more info in dumpsys
Added TID and io handle to AudioFlinger threads dump.

Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
2012-03-14 15:04:54 -07:00
Omari Stephens
0c15f85824 Merge "Try to make error messages more useful and improve ANR handling" 2012-03-14 14:54:29 -07:00
Omari Stephens
8ac5959729 Merge "Avoid crashes in a single app from causing cascading test failures" 2012-03-14 14:53:21 -07:00
Marco Nelissen
467ec7eda8 Unhide MediaPlayer.setNextMediaPlayer
The Music apps are unbundled, so this needs to be unhidden for them to use it.

Change-Id: I24330a2d6cfa2f5fb5f9c282d28f5431b6165095
2012-03-14 14:49:02 -07:00
Teng-Hui Zhu
72b91b5e0c Merge "Live streaming video may not have the right size at prepared" 2012-03-14 14:47:23 -07:00
Glenn Kasten
58984b0738 Merge "Break circular dependency on media player service" 2012-03-14 13:57:03 -07:00
Glenn Kasten
9d41361634 Merge "Prepare frameworks/native/services/audioflinger" 2012-03-14 13:56:25 -07:00
Teng-Hui Zhu
5a080e2207 Live streaming video may not have the right size at prepared
The fix is add the OnVideoSizeChangedListener.
bug:5420327

Change-Id: I1e0b371b8b95b86a1c0903f4bdb1d8f38de793b7
2012-03-14 13:54:59 -07:00
Glenn Kasten
6940484150 Merge "Use correct syntax for #include <> """ 2012-03-14 13:54:21 -07:00
Dianne Hackborn
5108b1b3cf Merge "Add new "options" argument to all startActivity APIs." 2012-03-14 13:48:51 -07:00
Jake Hamby
f98f68d5ad Merge "Add support for CMAS warning notifications over CDMA." 2012-03-14 13:25:18 -07:00
Eric Fischer
e0b0a2c11d Import translations. DO NOT MERGE
Change-Id: I31003b11213e50fff8e42da9aaef3c60804d1301
2012-03-14 13:16:04 -07:00
Dianne Hackborn
a4972e951b Add new "options" argument to all startActivity APIs.
This will be used to allow new features to be requested...  such as,
say, a special kind of animation.  Right now there are no options
defined.

Change-Id: I4eb6f27275cdd4bf186f6da316ab93a2372ad4b7
2012-03-14 12:57:14 -07:00
James Dong
89ea4ca9c2 Merge "make sure that lower-case mime and file suffix is used to check against the supported ones" 2012-03-14 10:43:22 -07:00
James Dong
8e3fac28a0 Merge "Fixed a buffer overflow bug in DrmPassthruPlugin" 2012-03-14 10:43:18 -07:00
James Dong
2bab6b63c7 Merge "Turned off log spamming from DrmPassthruPlugin" 2012-03-14 10:43:12 -07:00
Gilles Debunne
48b050a213 Merge "Use SpanSet to accelerate Layout.drawBackground" 2012-03-14 10:40:02 -07:00
Eino-Ville Talvala
0016813784 Merge "Add references to MediaActionSound in Camera documentation." 2012-03-14 10:34:05 -07:00
Omari Stephens
bf29121c21 Try to make error messages more useful and improve ANR handling
Bug: 6128185
Change-Id: I6032a199c26577fb3058ff4038085de257781d81
2012-03-13 23:17:45 -07:00
Omari Stephens
ad8037e3a9 Avoid crashes in a single app from causing cascading test failures
This should work properly for crashes.  It currently doesn't do the right
thing for ANRs since, in a lot of cases, they seem to happen asynchronously
_after_ the testcase has ended.  Will try to improve that behavior with a
subsequent change.

Bug: 6128185
Change-Id: Ie535141e879062c11ee7108b37d282a33a5b5eef
2012-03-13 21:57:54 -07:00
Michael Jurka
605eabf6a2 Merge "Fix hardware layer redraw bug" 2012-03-13 19:56:33 -07:00
James Dong
32d8fc8d6d Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
2012-03-13 19:23:23 -07:00
James Dong
c3259471c6 Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
2012-03-13 18:54:16 -07:00
Michael Jurka
952e02b430 Fix hardware layer redraw bug 2012-03-13 18:35:10 -07:00
Russell Brenner
2b4b35c13a Add notes about switching languages
Fallback and vendor font configuration files now describe how to
customize font setup for Han languages (Chinese, Japanese, Korean).

Bug: 5873170
Change-Id: Id27cce9a6ba2b6ce61b221342dabdd1b40962933
2012-03-13 18:03:47 -07:00
Romain Guy
67c7377ef1 Merge "Correctly compute the number of bytes written by each op. Bug #6157792" 2012-03-13 18:02:55 -07:00
Romain Guy
390f882f89 Correctly compute the number of bytes written by each op.
Bug #6157792

Previously, DisplayListRenderer would compute the number of bytes
written after a drawing op by looking at the difference between
the start pointer of the command stream and the end pointer of
the command stream. The SkWriter class used to record the commands
stream allocates blocks of storage which would cause a crash when
a command spanned two blocks.

Change-Id: I4d79d3feeb6d72d9d4e6ab05ecebd72d004be56c
2012-03-13 18:00:10 -07:00
Glenn Kasten
0e9ce2e387 Break circular dependency on media player service
Bug: 6165157
Change-Id: I3c85bbcaf31f3cb9a009e273f7b6284015eb3bd8
2012-03-13 17:55:35 -07:00
Jason Sams
29000644ae Merge "Fix test makefile" 2012-03-13 16:54:11 -07:00
Jason Sams
759eb4e8f0 Fix test makefile
bug=5972398

Change-Id: I9298e08220863eecf5c87047a05d7aa146a4c060
2012-03-13 16:22:46 -07:00
Glenn Kasten
c81d31c3f8 Use correct syntax for #include <> ""
Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
2012-03-13 16:14:19 -07:00
Glenn Kasten
bd3d4dfc5b Prepare frameworks/native/services/audioflinger
Part of this change will be reverted after the move is complete.

Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d
2012-03-13 16:13:17 -07:00
Gilles Debunne
60e3b3fa60 Use SpanSet to accelerate Layout.drawBackground
The main performance improvement should come from the fact
that we entirely skip the loop (which calls getLineStart, getLineTop
and getLineDescent on each line) in the frequent case where there
are no LineBackgroundSpans.

Change-Id: Ie2d3168521e88d43f1a4236da2b3e8447606df1e
2012-03-13 15:58:33 -07:00
Gilles Debunne
6810a2442b Merge "New SpanSet class extracted from TextLine." 2012-03-13 15:56:07 -07:00
Philip Milne
b001475fc5 Merge "Fixes for bugs: #6103660, #6103957, #6104457 and #6104322." 2012-03-13 15:32:20 -07:00
Jake Hamby
3e3c3f80a9 Add support for CMAS warning notifications over CDMA.
Refactor SMS Cell Broadcast support to enable receiving CMAS warning
notifications over CDMA. The CellBroadcastReceiver app must also be
updated with the corresponding change. All cell broadcasts are now
delivered as a Parcelable SmsCbMessage object in the "message" extra
of the SMS_CB_RECEIVED_ACTION or SMS_EMERGENCY_CB_RECEIVED_ACTION,
instead of as a GSM/UMTS "pdu" byte array.

Existing functionality for ETWS and CMAS alerts over GSM/UMTS continues
to be supported using the new radio-technology independent SmsCbMessage
and related objects. Test cases are added to verify that valid and
invalid broadcast data is handled appropriately.

Unit testing discovered a bug in the BitwiseOutputStream utility class
used by the added test cases. When the BitwiseOutputStream object must be
expanded (in the private possExpand() method), the mEnd field is not
updated to the new array size. This causes a new array to be allocated
on every new write, and for all data beyond the original array allocation
to be replaced with zeroes. Fixed by adding a line to possExpand() to
update mEnd. Added a test case to BitwiseStreamsTest to verify the fix.
Besides the test cases, BitwiseOutputStream is only used by BearerData in
two places, both of which allocate a sufficient initial buffer. So the
bug in BitwiseOutputStream is not critical to fix for normal operation,
but should be fixed so that the test cases using it function correctly.

Bug: 5856308
Change-Id: I201ecbf11607fd200aaae3cbb32561efabf65672
2012-03-13 15:31:33 -07:00
Philip Milne
1018fb42cb Fixes for bugs: #6103660, #6103957, #6104457 and #6104322.
Add getters and setters to the layout widgets so as to mirror their XML apis.

Change-Id: Ie2237fd55e1c3e4ec0d08b4f8154ea7e122c1e79
2012-03-13 15:22:07 -07:00
Jeff Brown
9dc348d756 Merge "Fix spurious ANRs in native activities." 2012-03-13 15:15:48 -07:00
Wink Saville
f2fbd2eda5 Merge "Telephony: Make IccFileHandler use ci instead of phone" 2012-03-13 15:10:55 -07:00
Jeff Brown
2b6c32ca41 Fix spurious ANRs in native activities.
Some native activities experienced ANRs when the input consumer
deferred an input event due to client-side batching.  If the
input channel was fully emptied then the client had no way of
knowing that it should wake up to handle the deferred input event.

This patch also fixes some lock issues in the native activity
input queue implementation.  In at least one error case, it
was possible for a function to exit without releasing the lock.

Bug: 6051176
Change-Id: I4d9d843237e69b9834f8d8b360031b677fcab8c3
2012-03-13 15:00:09 -07:00
Gilles Debunne
4ffb879f48 New SpanSet class extracted from TextLine.
Change-Id: I424dbd7ff0693fd465b6c83ebabba221b2eca6fe
2012-03-13 14:58:37 -07:00