5444 Commits

Author SHA1 Message Date
John Grossman
625d40a920 libaah_rtp: address http://b/issue?id=5755419
Introduce a heartbeat timeout for TX senders.  If none of the TX
sender's clients send any packets for this timeout period (10 minutes
right now), then the sender will stop sending keep-alive heartbeats.
This should cause RX clients to release any held media resources,
including any timed audio track.  Releasing timeed audio tracks allows
the audio system to go into its idle state, which allows the power amp
in Tungsten to power all of the way down, saving both heat and power.

Change-Id: Ib7a96d334e1064ddea3f07a6b21e6efedefc549a
Signed-off-by: John Grossman <johngro@google.com>
2012-01-09 12:23:37 -08:00
Mike Lockwood
0b8afdac73 Restore persisted master volume if the media server restarts
Bug: 5755071

Change-Id: I6934276049b4a9d713bb4754aa3bb2cd3b898604
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-01-06 11:58:54 -05:00
Mike Lockwood
d10a663be6 Don't allow changing master volume when muted
Bug: 5793021

Change-Id: If93a41c4e61f1bc730759e77ee5b5f8165025c42
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-01-05 13:25:33 -05:00
Mike Lockwood
c239379c0c AudioService: remove logging from adjustMasterVolume that was left in by mistake
Change-Id: I75c430d2c50c4cab3b6207efab5a6f11aed728d2
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-16 11:26:37 -05:00
Mike Lockwood
2dd9135822 Merge "Defer persisting master data to avoid excessive database writes" into ics-aah 2011-12-16 06:14:32 -08:00
Dave Burke
e0361e2721 am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
2011-12-15 19:25:07 -08:00
Jamie Gennis
09fc76664a SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
2011-12-15 18:36:08 -08:00
Mike Lockwood
f9113d311b Defer persisting master data to avoid excessive database writes
Bug: 5705192

Change-Id: I252bd72ff72ef4a40174d4597059e89691acb34f
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-15 17:26:17 -05:00
Joe Onorato
2e7cfe4a2f Merge "logging" into ics-aah 2011-12-14 21:08:03 -08:00
James Dong
d7ea1105f5 am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix."    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
2011-12-14 13:50:15 -08:00
James Dong
d70c64db9f Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck
1. Revert "Fix drm flag setting missed in false drm recognition fix."
   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
2011-12-14 11:01:59 -08:00
Joe Onorato
b782e8d71e logging
Change-Id: I6fde5617365f479884937615e0d3f0f4ecc2dc14
2011-12-13 22:17:04 -08:00
Andreas Huber
2b9e2da893 am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
2011-12-13 12:02:19 -08:00
Andreas Huber
9a023f1f8e DO NOT MERGE: Support for parsing of "folded" RTSP header values
and some tweaks to the AMR assembler contributed by Samsung (untested).

Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1
related-to-bug: 5669027
2011-12-13 10:09:48 -08:00
Jeff Tinker
e1378605bc am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
  Fix drm flag setting missed in false drm recognition fix.
2011-12-09 11:13:59 -08:00
Mike Lockwood
a069128f2c Merge "Remove reference counting and client death notification for master mute" into ics-aah 2011-12-09 09:42:31 -08:00
Jeff Tinker
9f704f6c46 Fix drm flag setting missed in false drm recognition fix.
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
2011-12-09 09:09:08 -08:00
James Dong
8089d76690 am aadbd80b: Fixed the false drm recognition.
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
  Fixed the false drm recognition.
2011-12-09 00:17:27 -08:00
James Dong
aadbd80b30 Fixed the false drm recognition.
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1

related-to-bug: 5732033
2011-12-08 21:01:31 -08:00
Andreas Huber
66b401c80b am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '68f592a8210af27df4339089bbee47fb602cae6a':
  Don't perform RTSP seeks right away but queue them for 200ms
2011-12-08 13:35:23 -08:00
Andreas Huber
191eacb37d am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
2011-12-08 13:35:16 -08:00
Andreas Huber
68f592a821 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00
Andreas Huber
21902a8a48 Don't perform RTSP seeks right away but queue them for 200ms
and only execute the last one.

Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug: 5732960
2011-12-08 13:04:50 -08:00
Andreas Huber
f6ae711450 Fix Bitreader "putBits" implementation, make sure we emulate timestamps
if we don't receive npt time mapping from the rtsp server (i.e. live stream)

Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug: 5660357
2011-12-08 12:27:47 -08:00
Jeff Tinker
44e73eee08 am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-08 00:16:15 -08:00
Jeff Tinker
a693a4b555 Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Tinker
d0d19db1ca Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
2011-12-07 20:23:20 -08:00
Dave Burke
fa5fc72635 am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '54a53841a9ff48ba4cd004469ae4ff77caed900a':
  Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:07:49 -08:00
Andreas Huber
7dea9aaff5 Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
2011-12-07 12:50:47 -08:00
Mike Lockwood
a8f4e83595 Remove reference counting and client death notification for master mute
The use case for master mute is to toggle it on and off from a
KEYCODE_VOLUME_MUTE event, so this was unnecessary and prevented unmuting
in certain cases

Bug: 5724755

Change-Id: I041a112cd39e1c00dcae27e2266a95ce225e9b64
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-07 12:34:31 -08:00
Hong Teng
ff1e877a8d am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int
* commit '6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
  Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character.  And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
2011-12-07 11:02:53 -08:00
Amith Yamasani
52cb1da2c6 am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.
2011-12-07 11:02:51 -08:00
James Dong
b300003a14 am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
2011-12-07 11:02:31 -08:00
Andreas Huber
1b4c8bf697 am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.
2011-12-07 11:02:29 -08:00
Hong Teng
6db79c35c0 Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1 2011-12-06 15:37:25 -08:00
Amith Yamasani
f336408000 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen.
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
2011-12-06 14:48:38 -08:00
John Grossman
f998922f30 Tungsten: Improve RX player error handling.
First, clear an issue which was causing an assert to fire.  Basically,
once a decoder pump had entered the error state and was shutdown, it
was not clearing its status, and when a substream attempt to recycle
the pump, startup was failing an assert (no thread had been created,
meaning that the system was not initialized, yet status indicated an
error).  This was a small one-liner in aah_decoder_pump.cpp.

Second, try to become a little nuanced about how we handle errors in
the decoder pump.  A comment in the code pretty much says it all, but
the summary is that we don't want to completely abort playback because
a single chunk of ES failed to decode, but if nothing is decoding and
we are making no progress at all, we probably need to put the
MediaPlayer instance into the fatal Error state and signal the app
level so that further action can be taken (automatic recovery attempts
followed by bug reports and signalling the user if those fail).

This is to address the fallout of http://b/issue?id=5498460, where
something at the OMX decoder level becomes unhappy about not being
able to obtain an output buffer which eventually unwinds to this
assert which results in a dead mediaserver.  After this change, the
mediaserver will no longer crash, and may even recover (depending on
whether or not the OMX unhappiness is transient or not), but the
primary issue (unhappy OMX) is probably still around.  It is quite
difficult to reproduce, I will probably need to open a different bug
to track that issue.

Change-Id: I5b65b818378a5ae9c915e91b7db7129f0bda6837
Signed-off-by: John Grossman <johngro@google.com>
2011-12-06 14:19:31 -08:00
James Dong
6b8b5a0a41 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 2011-12-06 12:52:52 -08:00
Hong Teng
96bea6a5e9 Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails
-Correct the invalid filename, which contains control character.
 And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.

Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
2011-12-06 11:51:47 -08:00
Andreas Huber
92f604c4d4 DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
2011-12-06 11:24:34 -08:00
Eric Laurent
ad67a2639b Merge "AudioService: Send broadcasts when master volume and mute state change" into ics-aah 2011-12-05 18:57:49 -08:00
Mike Lockwood
3309386a1b AudioService: Send broadcasts when master volume and mute state change
Change-Id: I7eb5041f0c14f419317e29ea6fa7faa9159cf165
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-05 18:47:38 -08:00
James Dong
cb064917cf DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.

Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>

Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.

Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug: 5711942
2011-12-05 14:29:18 -08:00
Andreas Huber
384612d13e am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
  Properly identify how much metadata we need to cache in order to instantiate
2011-12-05 12:02:53 -08:00
Andreas Huber
b8e651a675 Properly identify how much metadata we need to cache in order to instantiate
the extractor without blocking (and therefore be able to abort).

Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug: 5666532
2011-12-05 11:34:43 -08:00
Mike Lockwood
15cf022c70 am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
2011-12-02 13:22:28 -08:00
Mike Lockwood
d562cbf6f8 am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
2011-12-02 13:22:26 -08:00
Mike Lockwood
7944c1b19f MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Bug: 5527220

Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:47 -05:00
Mike Lockwood
7a1ad63d16 MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K

Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:30 -05:00