5126 Commits

Author SHA1 Message Date
Eric Laurent
a0ab3ee321 am 929827b8: Merge "Fix issue 5252593: any app can restart the runtime"
* commit '929827b819415101d526ff68fb0b2c8adb885132':
  Fix issue 5252593: any app can restart the runtime
2011-09-02 16:42:26 -07:00
Eric Laurent
dca56b9432 Fix issue 5252593: any app can restart the runtime
Replace null device address string by empty sting.

Change-Id: I285c35f3345334e6d2190493b1a8a5aca1a361a4
2011-09-02 15:59:50 -07:00
Andreas Huber
281b7d063d am 69a5f6c3: Properly serialize access to FileSource::getSize by acquiring the mutex
* commit '69a5f6c3e04aa0f3f87eed7578a32782c97bd48f':
  Properly serialize access to FileSource::getSize by acquiring the mutex
2011-09-02 09:45:37 -07:00
Andreas Huber
69a5f6c3e0 Properly serialize access to FileSource::getSize by acquiring the mutex
Both ::getSize and ::read call into lseek64, if this happens simultaneously
from multiple threads the results are undefined if not properly serialized.

Change-Id: I737cafebd836f3d8eb702beac557b4731f69c6f6
related-to-bug: 5196490
2011-09-02 09:34:51 -07:00
Dave Burke
1065251c7d am 1d477c53: Merge "Require INTERNET permission for network-based content. Bug #1870981"
* commit '1d477c53bf2f389813d04d5163d210fccf00ceb9':
  Require INTERNET permission for network-based content. Bug #1870981
2011-09-02 03:32:31 -07:00
Dave Burke
fc301b0bb5 Require INTERNET permission for network-based content.
Bug #1870981

Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
2011-09-02 11:26:59 +01:00
Andreas Huber
e7605e1bb9 am ae510085: Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."
* commit 'ae51008564a7a32199a144544a4ab57b976ffa9d':
  Guard the audio notifications with a separate lock to avoid deadlocks during reset.
2011-09-01 13:28:57 -07:00
Andreas Huber
63acad5b5c am 7f5ea61b: Merge "Signal an error when encountering a malformed .ts stream."
* commit '7f5ea61b0f0ac479f836c0c47b8b212d73486a0d':
  Signal an error when encountering a malformed .ts stream.
2011-09-01 13:27:52 -07:00
Andreas Huber
ae51008564 Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset." 2011-09-01 12:20:24 -07:00
Andreas Huber
67a041fa1f Guard the audio notifications with a separate lock to avoid deadlocks during reset.
Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827
2011-09-01 11:39:11 -07:00
Andreas Huber
d38ecf8ce0 Signal an error when encountering a malformed .ts stream.
Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811
2011-09-01 11:04:43 -07:00
Jean-Michel Trivi
aa428a26d5 am a6ec356d: Merge "Fix 5243349 RemoteControlDisplay incorrectly updated"
* commit 'a6ec356d2f5d2829fd8eff315a37f49501eac842':
  Fix 5243349 RemoteControlDisplay incorrectly updated
2011-08-31 19:05:36 -07:00
Jean-Michel Trivi
a6ec356d2f Merge "Fix 5243349 RemoteControlDisplay incorrectly updated" 2011-08-31 19:02:59 -07:00
Jean-Michel Trivi
b716f0b7b2 Fix 5243349 RemoteControlDisplay incorrectly updated
This fixes a case where the RCD would display transport control
 for a RemoteControlClient that didn't have audio focus.
This was happening because registering an RCD was directly calling
 the updateRemoteControlDisplay method, without first calling
 the checkUpdateRemoteControlDisplay method which verifies the
 conditions before updating the display. One of those conditions
 is that the audio focus stack shouldn't be empty.

To verify this fix, several functions were also rename to clearly
 indicate the lock order and verify we properly synchronize on
 the right objects. In doing so, a missing synchronization on
 audio focus was found.

Change-Id: If1baaac224ea676aeb83ac0aefcc53f87461c32e
2011-08-31 18:24:04 -07:00
Rajneesh Chowdury
29ccd727a9 am 270bcaa9: Merge "Fix for 5156702 Rotate video output for thumbnails and export"
* commit '270bcaa9d1b7e6cef723532692d82bb231ac7137':
  Fix for 5156702 Rotate video output for thumbnails and export
2011-08-31 17:16:19 -07:00
Rajneesh Chowdury
270bcaa9d1 Merge "Fix for 5156702 Rotate video output for thumbnails and export" 2011-08-31 17:14:52 -07:00
Andreas Huber
db03a39bbb am 9100473a: Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next"
* commit '9100473a7e908c7292008140f76ca5009a4335d4':
  I have one HLS stream that switches stream PIDs from one bandwidth to the next
2011-08-31 16:47:40 -07:00
Andreas Huber
9b2813fad8 am afbb70b4: Merge "Discontinuities are only signalled on streams that have been identified, i.e."
* commit 'afbb70b48e348410279816639eeb61f8a33064d2':
  Discontinuities are only signalled on streams that have been identified, i.e.
2011-08-31 16:47:37 -07:00
Andreas Huber
9100473a7e Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next" 2011-08-31 16:44:49 -07:00
Andreas Huber
afbb70b48e Merge "Discontinuities are only signalled on streams that have been identified, i.e." 2011-08-31 16:44:43 -07:00
Andreas Huber
eeddb0e504 I have one HLS stream that switches stream PIDs from one bandwidth to the next
this change intends to support its very limited case and signals an error in
all other cases of unexpected PID changes that we cannot recover from.

Change-Id: Icbfdf9fe7461969e2a8781ed416f54d891dd789a
2011-08-31 16:29:05 -07:00
Andreas Huber
ea8c9b1bd9 Discontinuities are only signalled on streams that have been identified, i.e.
those that have a queue. This ensures that the player doesn't observe discontinuities
that don't match up across streams.

Also, make sure output buffers arriving from the decoder to be rendered are sent
back to the decoder if we started flushing.

Finally, don't parse TS packets for streams we don't support. And don't allocate
memory for them.

Change-Id: I708e0de4cba8110a62e4c8ceb1e5702430d5d2bb
2011-08-31 15:35:49 -07:00
Pannag Sanketi
34abe00ae2 am d318b73e: Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
* commit 'd318b73e8e7832f257797ce08b3eea02780b7909':
  Update SurfaceMediaSource_test to not use pbuffer configs
2011-08-31 15:10:54 -07:00
Pannag Sanketi
d318b73e8e Merge "Update SurfaceMediaSource_test to not use pbuffer configs" 2011-08-31 15:09:26 -07:00
James Dong
2c0000d7ad am e3fb1cb1: Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
* commit 'e3fb1cb1b1f333aadc780c85de0735143ad864b4':
  Fix a crash where the EOS was signalled but some output buffer were still pending.
2011-08-31 14:20:39 -07:00
James Dong
e3fb1cb1b1 Merge "Fix a crash where the EOS was signalled but some output buffer were still pending." 2011-08-31 14:17:18 -07:00
Eino-Ville Talvala
235ea3b0a3 am b2c4f0bf: Merge "Fix SurfaceMediaSource timestamp handling."
* commit 'b2c4f0bf11f38fd31d80f1256c89b9db043a2929':
  Fix SurfaceMediaSource timestamp handling.
2011-08-31 13:43:05 -07:00
Eino-Ville Talvala
b2c4f0bf11 Merge "Fix SurfaceMediaSource timestamp handling." 2011-08-31 13:41:06 -07:00
Eric Laurent
29227e71ec am 16b241a5: Merge "Change condition to enter silent mode."
* commit '16b241a58f1ec4b317647b6fd0ad9b5cc3f7ba3d':
  Change condition to enter silent mode.
2011-08-31 13:01:19 -07:00
Eric Laurent
16b241a58f Merge "Change condition to enter silent mode." 2011-08-31 12:59:28 -07:00
Jean-Michel Trivi
1d2bca9ccd am 528e382f: Merge "Fix 5242200 only update RemoteControlDisplay when a client is present"
* commit '528e382f48681a2175a24e7403f63a4493d7c44b':
  Fix 5242200 only update RemoteControlDisplay when a client is present
2011-08-31 12:05:22 -07:00
Jean-Michel Trivi
528e382f48 Merge "Fix 5242200 only update RemoteControlDisplay when a client is present" 2011-08-31 12:03:50 -07:00
Jean-Michel Trivi
3387945766 Fix 5242200 only update RemoteControlDisplay when a client is present
A precondition for updateRemoteControlDisplay_syncRcs() is that
 mRCStack is not null. This condition was not verified when
 registering a RemoteControlDisplay.

Change-Id: I0b152410e57c590114b387e9ab83f0c4d15d060d
2011-08-31 11:52:16 -07:00
Gloria Wang
aab6ce448b am 3727e3d8: Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419."
* commit '3727e3d80d37fc8004ddaa4ec589bd8d9c304fad':
  Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419.
2011-08-31 10:39:35 -07:00
Gloria Wang
3727e3d80d Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419." 2011-08-31 10:37:48 -07:00
Gloria Wang
e28857c125 Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
and AudioPlayer was not started.
Fix for 5236419.

Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb
2011-08-31 10:24:18 -07:00
Mike J. Chen
da54844f32 MediaPlayer changes for Tungsten/Android@Home.
Squashed merge from master-tungsten of the following changes:

commit e8b156c6b224f0fe5b6a81d5f92bade36275027c
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 10:28:48 2011 -0700

    Add a null check to handle failure of android::createPlayer

    Change-Id: Iacbbc90369a825838d4374b1f774c8880b25753b

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 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

Change-Id: Ic8fd28b1bbd85e86a325f99013e7aa0c763f5f05
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-08-31 10:05:05 -07:00
Mike J. Chen
0d2ddec34b Add media/libaah_rtp
RTP library used to broadcast media from one device to a collection
of listeners.  Handles failures/retries/etc.

This is a squashed merge from master-tungsten of the following changes:

commit e1a5101fe627d71739a7c4263bb3a65c7bc44385
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 13:24:21 2011 -0700

    Hold ThreadWrapper in a ref-counting pointer

    Change-Id: Iaf3343182e37bcc0ca99fbaf8f9bbb8c4984072a

commit 89b90d62e164ff3db27c9cba85255fc476d2dd96
Author: Jason Simmons <jsimmons@google.com>
Date:   Wed Aug 10 13:08:25 2011 -0700

    Update the Tungsten TX player to use HTTPBase

    Change-Id: I9f7ecf1b4b496cec1815284dbcdb958a43284169

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

Change-Id: I190ecddf1dc919761c2e4ec740c2f3b2c9541156
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>
2011-08-31 10:05:05 -07:00
Andreas Huber
8be95298ba am 49fb943d: Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
* commit '49fb943db85c748fc7dd4f5ee4a461d7489fb1b0':
  ATSParser now supports a mode in which PTS is considered to be absolute time
2011-08-31 09:48:07 -07:00
Eric Laurent
3d4c06f907 Change condition to enter silent mode.
Previously, silent mode was entered if volume was already at 0 and
volume down key was pressed once.

The new volume management policy specifies that silent mode is entered when
volume is at last audible step and volume down key is pressed once.

Change-Id: Id3e75a99c522d8afe276868010b6e73495d23fde
2011-08-31 09:47:24 -07:00
Andreas Huber
49fb943db8 Merge "ATSParser now supports a mode in which PTS is considered to be absolute time" 2011-08-31 09:44:57 -07:00
Jean-Michel Trivi
2deae8a05d am 2e2626f6: Merge "RemoteControlClient metadata: add method for metadata of long type"
* commit '2e2626f6c6404a0ce6c7d63b912a3ec2c748008d':
  RemoteControlClient metadata: add method for metadata of long type
2011-08-31 09:13:01 -07:00
Pannag Sanketi
e753750a82 Update SurfaceMediaSource_test to not use pbuffer configs
SurfaceMediaSource_test now does not use pbuffer configs
to create a surface. Always uses a window config.
Also, cleaned up the test a bit.

Change-Id: Idda40dcb8474249eccaa8d2dad20ee840d2dd484
2011-08-30 22:36:41 -07:00
Jean-Michel Trivi
5ad4b9fb96 RemoteControlClient metadata: add method for metadata of long type
Update to the RemoteControlClient.Editor API:
 - new method for setting metadata of type long
 - methods for setting metadata throw an exception if using
    the wrong key with the wrong method.

Note that this change will cause the Music2 application to
 throw an exception when it tries to set the duration as a string.

Change-Id: I17cff86467851a0aff313c07653e752ae6b6180f
2011-08-30 18:42:33 -07:00
James Dong
58c524ec03 Fix a crash where the EOS was signalled but some output buffer were still pending.
Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5
related-to-bug: 5234126
2011-08-30 17:06:10 -07:00
Andreas Huber
ebd266c034 ATSParser now supports a mode in which PTS is considered to be absolute time
i.e. PTS 0 <=> media time 0

Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e
2011-08-30 16:06:28 -07:00
Jean-Michel Trivi
d354ac3860 am 2261c7d6: Merge "Bug 5045498 Force display update when display registers"
* commit '2261c7d6456376ed10a97643fc74a1e4eb2c1c9f':
  Bug 5045498 Force display update when display registers
2011-08-30 15:15:14 -07:00
Jean-Michel Trivi
2261c7d645 Merge "Bug 5045498 Force display update when display registers" 2011-08-30 15:14:12 -07:00
Jean-Michel Trivi
958bba6862 Bug 5045498 Force display update when display registers
When an IRemoteControlDisplay registers, cause the
 RemoteControlClient to send all its information to the newly
 registered display.
The previous code was only sending a request for update: this
 request didn't here cause the client to send the data because
 a new client generation had not been synchronized among clients
 and displays.
This CL uses the same code path to force an update as when audio
 focus changes, or a new client registers, by calling the same
 method that is called in those cases,
 updateRemoteControlDisplay_syncRcs(flags).
Also in this CL: more method renames to indicate methods that
 are called synchronized on mRCStack.

Change-Id: I54102f45ba1cd4812d958ecd883bec7bc45ae88f
2011-08-30 14:48:31 -07:00
Jamie Gennis
d8cb308f67 am 8d102eb6: Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc
* commit '8d102eb6720deccfb8b5872fde531ef6ca580077':
  MediaDump: use the MediaPlayer#setSurface method
  HTML5VideoView: switch to MediaPlayer#setSurface
  MediaPlayer: unhide the setSurface method
  Surface: unhide the SurfaceTexture ctor
2011-08-30 14:40:24 -07:00