5103 Commits

Author SHA1 Message Date
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
Jamie Gennis
8d102eb672 Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc
* changes:
  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:38:56 -07:00
Eric Laurent
2e0ae89d18 am 0e35c78d: Merge "226483: A2DP connected, but music out to speaker"
* commit '0e35c78d25a8df8b3bde566ad6c474f9df242ea4':
  226483: A2DP connected, but music out to speaker
2011-08-30 10:53:47 -07:00
Eric Laurent
0e35c78d25 Merge "226483: A2DP connected, but music out to speaker" 2011-08-30 10:51:54 -07:00
Eino-Ville Talvala
728e08bc3f Fix SurfaceMediaSource timestamp handling.
Was not basing timestamps on startTimeUs.
Now synchronizes properly with audio.

Bug: 4510826
Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43
2011-08-30 10:49:15 -07:00
Eric Laurent
05ce094164 226483: A2DP connected, but music out to speaker
When the A2DP headset is connected, there is a possible
race condition when the audio tracks are moved from
the mixer thread attached to the speaker output to the thread
attached to A2DP output.
As the request to clear the stream type to output mapping cache in
the client process is asynchronous, it is possible that the flag
indicating to the client audio track to re-create the IAudioTrack
on the new thread is processed before the cache is invalidated.
In this case, the track will be attached to the old thread and
music will continue playing over the device speaker instead of being
redirected to A2DP headset.

Change-Id: Ib2ce1eb5320eaff83287b93779061bf4e7a330df
2011-08-30 10:19:38 -07:00
Jean-Michel Trivi
6d61bf8576 am c5d0fac0: Merge "Bug 5156756 Fix AAC ADTS header size computation"
* commit 'c5d0fac081c4c496b29586bff79dfff05755b716':
  Bug 5156756 Fix AAC ADTS header size computation
2011-08-30 09:08:02 -07:00
Jean-Michel Trivi
c5d0fac081 Merge "Bug 5156756 Fix AAC ADTS header size computation" 2011-08-30 09:06:36 -07:00
Rajneesh Chowdury
516affc103 am 90200ee4: Merge "5106773 Can\'t export a movie - Error returned from OMX API in ducati"
* commit '90200ee4e23b662e81a8d6fb6ef634ac6b378f5f':
  5106773 Can't export a movie - Error returned from OMX API in ducati
2011-08-29 20:45:06 -07:00
Rajneesh Chowdury
90200ee4e2 Merge "5106773 Can't export a movie - Error returned from OMX API in ducati" 2011-08-29 20:43:11 -07:00
Rajneesh Chowdury
8f7bf02506 5106773 Can't export a movie - Error returned from OMX API in ducati
Video Editor engine wrongly set the profile in place of level.
So level was always 1 (default value for Profile)

Change-Id: I202f866d32e81869d9692174d59d9d777a772282
2011-08-29 20:16:22 -07:00
Jean-Michel Trivi
59fe406b3a Bug 5156756 Fix AAC ADTS header size computation
This previous frame size computation code had two incorrect
 assumptions:
 1/ the ADTS frame length value already contains the header size
 2/ the ADTS header is not of fixed size: it is 2 bytes bigger
  if it contains the CRC value.
For 1/, the code worked because when the header size was added
 to the frame size, the + operator is of stronger precedence
 than the ? operator, so the size added was always 0 (instead
 of ADTS_HEADER_LENGTH.
For 2/, the code worked as long as there was no CRC in the ADTS
 data.

The fix consists in:
 - documenting what the frame length computation code returns
 - fixing the frame length computation
 - when computing the frame length, also returning the header
  size so the correct data can be sent to the decoder.

Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
2011-08-29 18:56:55 -07:00
James Dong
a273d4fe3f am 2a451021: Merge "The test application falsely reports that the test result even if the test failed."
* commit '2a45102186a25877df04404d591171b2b2e85626':
  The test application falsely reports that the test result even if the test failed.
2011-08-29 16:33:14 -07:00
James Dong
2a45102186 Merge "The test application falsely reports that the test result even if the test failed." 2011-08-29 15:28:23 -07:00
Andreas Huber
2a3baf53b8 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
2011-08-29 15:18:26 -07:00
James Dong
4afbe2ec75 The test application falsely reports that the test result even if the test failed.
Change-Id: Ia632f04da73642dc4c1e3147b16664b5672108bc
2011-08-29 14:40:52 -07:00
Jamie Gennis
af4fccf0c0 MediaDump: use the MediaPlayer#setSurface method
This change updates the MediaDump test to use the new
MediaPlayer#setSurface method in place of MediaPlayer#setTexture, which
will be removed.

Change-Id: I33f59705c728f0884452d45cf83cb5b80f66a95a
2011-08-29 14:33:11 -07:00
Jamie Gennis
b283dc64bc MediaPlayer: unhide the setSurface method
Change-Id: I2fb695ab918d1099ad7cc51bfd436712a0b640d9
2011-08-29 14:33:10 -07:00
Andreas Huber
499f36581c Merge "Return an error to the client instead of asserting if decoder instantiation fails" 2011-08-29 13:47:24 -07:00
Andreas Huber
07754c513f Return an error to the client instead of asserting if decoder instantiation fails
after a surface change.

Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug: 5212725
2011-08-29 13:01:23 -07:00
Jean-Michel Trivi
3b3f2b1b2a am 2db44c58: Merge "Update IRemoteControlDisplay when it registers."
* commit '2db44c5838fb0bb35092a19f31ee887892a451a1':
  Update IRemoteControlDisplay when it registers.
2011-08-29 10:25:53 -07:00
Jean-Michel Trivi
2db44c5838 Merge "Update IRemoteControlDisplay when it registers." 2011-08-29 10:09:04 -07:00
Jean-Michel Trivi
db8a361629 Update IRemoteControlDisplay when it registers.
When an IRemoteControlDisplay registers, it must receive information
 from the current client.

Change-Id: Id845e7a87ac74c2db2c59e0281b28a45f8d20528
2011-08-29 09:57:18 -07:00