drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,855 Commits 1 Branch 0 Tags
Commit Graph

4804 Commits

Author SHA1 Message Date
Eric Laurent
72668b2c04 Fix issue 4499450: Unknown Ringer Mode 
Added a validity check on ringer mode values in AudioManager.setRingerMode().

Change-Id: Ie780edc1d347009d90f000018a71520b04e0c4a1
 2011-07-19 16:04:27 -07:00
James Dong
8a08b0c5a1 Merge "Remove PV AVC decoder" 2011-07-19 11:00:50 -07:00
James Dong
d2a9852c13 Remove PV AVC decoder 
Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
 2011-07-19 09:42:42 -07:00
Narayan Kamath
06e0333c7e Return the play stayed locked. 
I believe the the synchronized block is required to allow
other threads to observe changes to mPlayState in a timely
manner.

Change-Id: I502b7401196c42932c9667ef73eb4cae16c3da16
 2011-07-19 15:43:52 +01:00
Conley Owens
9fd12cfb56 am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:57:04 -07:00
Conley Owens
e5143d6c09 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:55:33 -07:00
Conley Owens
a74774fd91 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:52:26 -07:00
Conley Owens
4d8f6a38e7 Merge "stagefright aacenc: Mark codeWord as UWord16" 2011-07-18 16:49:43 -07:00
Deckard Autoverifier
2b15115fee am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:46:26 -07:00
Deckard Autoverifier
d1cada2ad8 am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:46:21 -07:00
Deckard Autoverifier
a09fe88148 am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:46:18 -07:00
Deckard Autoverifier
e1928190ff am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:46:14 -07:00
Deckard Autoverifier
3ab6ccda44 am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:44:03 -07:00
Deckard Autoverifier
b32af64245 am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '31140598866c668047fc6dede7944e146aa21a0a':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:44:01 -07:00
Deckard Autoverifier
d4dee1a57f am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:43:58 -07:00
Deckard Autoverifier
b7f0d825c5 am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:43:54 -07:00
Deckard Autoverifier
89bac1820f am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:38:30 -07:00
Deckard Autoverifier
16db83c264 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:38:27 -07:00
Deckard Autoverifier
80ef1745d0 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:38:25 -07:00
Deckard Autoverifier
68e37dacc0 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:38:22 -07:00
Deckard Autoverifier
88409911ae Merge "stagefright: Include stdlib.h for malloc/free" 2011-07-18 15:23:41 -07:00
Deckard Autoverifier
eb07c53149 Merge "stagefright amrwbenc: Remove a duplicate, unused file" 2011-07-18 15:23:31 -07:00
Deckard Autoverifier
c06c3603e0 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 2011-07-18 15:23:20 -07:00
Deckard Autoverifier
55f115a321 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 2011-07-18 15:23:09 -07:00
Jamie Gennis
5a4ab16eba Merge "MediaPlayer: add ANativeWindow (dis)connect calls" 2011-07-18 15:18:43 -07:00
Conley Owens
f139965e4a am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:47:50 -07:00
Conley Owens
3edba93fd9 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:42:42 -07:00
Conley Owens
98fcc4041d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Jean-Michel Trivi
211f5af3bb Merge "Add option to query hardware decoders only" 2011-07-18 11:07:47 -07:00
Jean-Michel Trivi
56a37b0529 Add option to query hardware decoders only 
Add an option to OMXCodec::QueryCodecs() to filter out
 software codecs.

Update stagefright command line tool to list the roles of codecs.

Change-Id: Icddb79118c30fe13cc3aea20f340174cc082c4e0
 2011-07-18 10:57:50 -07:00
Andreas Huber
919511a6da Merge "Always consider playlists corresponding to different bandwidths different." 2011-07-18 09:04:28 -07:00
Andreas Huber
e16b295529 Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started" 2011-07-18 09:04:22 -07:00
Mike Lockwood
3bfa72b119 Merge "MTP: Use a single packet for the data phase" 2011-07-18 00:05:24 -07:00
Eric Laurent
484e320fe0 Audio preprocessing wrapper for webrtc. 
This wrapper implements the interworking layer between the audio effect
interface defined by the effect framework for audio preprocessing
and the native interface of webrtc audio processing module.

Change-Id: I3f9319730c102599cdf0dda520a53d90b4165114
 2011-07-17 14:33:52 -07:00
Mike Lockwood
de6d73acec MTP: Use a single packet for the data phase 
instead of sending 12 byte header in a separate packet.
PTP on the Mac is much happier with this approach.

Change-Id: I7d1ca498f6346afd88876d24332187b466fc469c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-17 15:53:53 -04:00
Andreas Huber
86806f75b4 Always consider playlists corresponding to different bandwidths different. 
Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
 2011-07-15 16:53:31 -07:00
Andreas Huber
bd8fbfa956 Fix seek behaviour at startup and teardown of media session that hasn't been started 
Nuplayer specific.

Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
 2011-07-15 16:26:47 -07:00
Rajneesh Chowdury
e3065f23a2 Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF" 2011-07-15 16:08:01 -07:00
Rajneesh Chowdury
aea7d6cdfb Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF 
Change-Id: I1c7c32fee491871223ad12df4696363415902377
 2011-07-15 15:11:48 -07:00
Gloria Wang
e1ea88c573 Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail." 2011-07-15 14:20:45 -07:00
Andreas Huber
698a5e0806 Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged" 2011-07-15 14:16:15 -07:00
Gloria Wang
c2e5ca3cac Use unsigned char to store table of contents retrieved from XING header. 
Our compiler treats char default to unsigned (trygon-eng on master branch).
If I force "signed char" for the table of contents array, some MediaFramework
tests for VBR mp3 would fail.

Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
 2011-07-15 12:08:00 -07:00
Andreas Huber
cc0b9f139f Refetch playlists according to the HLS specs, varying delay if playlists unchanged 
since the previous fetch.

Change-Id: I75e167a650c65a23e284381db5203beba7be7420
related-to-bug: 4983546
 2011-07-15 11:30:16 -07:00
Glenn Kasten
2aa6c4b515 Merge "Bug 5031179 possible fix for assert in join" 2011-07-15 09:23:33 -07:00
Mike Lockwood
92e1314ad9 MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files 
Bug: 5025615

Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-15 12:17:33 -04:00
Jamie Gennis
c85ca5d6b5 MediaPlayer: add ANativeWindow (dis)connect calls 
This change makes MediaPlayer connect to the ANativeWindow to which it
is going to render video frames and disconnect when it is done.

Change-Id: I88ab5c2fe62493aabdc84a283ff31634f795d415
 2011-07-14 17:48:33 -07:00
James Dong
8a65e1fb57 Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."" 2011-07-14 16:42:34 -07:00
James Dong
2c17f05a81 Revert "Add some logging to track down where ANR happens during MediaPlayer._release()." 
This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844.

Conflicts:

	media/libstagefright/AwesomePlayer.cpp

Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
 2011-07-14 16:22:47 -07:00
Glenn Kasten
2c751a8416 Bug 5031179 possible fix for assert in join 
Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
 2011-07-14 16:16:54 -07:00
Andreas Huber
c1df573aed Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error" 2011-07-14 13:22:45 -07:00