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

4991 Commits

Author SHA1 Message Date
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
Eric Laurent
44ff4cd8be AudioRecord JAVA: expose audio session Id 
Added getAudioSessionId() method to AudioRecord class so that applications can
retrieve the AudioRecord's session ID and attach audio pre processes.

Change-Id: I1914770f0e54d97c9aef6a9eb36fff69b6d31552
 2011-07-18 09:43:23 -07:00
Eric Laurent
464d5b3da2 Audio framework: support for audio pre processing 
Audio effect framework is extended to suport effects on
output and input audio path.

AudioFlinger: Support for audio effects and effect chains is
moved from PlaybackThread class to ThreadBase class so that
RecordThread can manage effects.
Effects of type pre processing are allowed on record thread
only. When a pre processing is enabled, the effect interface handle is
passed down to the input stream so that the audio HAL can call the
process function. The record thread loop calls the effect chain process
function that will only manage the effect state and commands and skip the
process function.

AudioRecord: The audio session is allocated before calling getInput() into
audio policy serice so that the session is known before the input theead is
created and pre processings can be created on the correct session.

AudioPolicyService: default pre processing for a given input source are
loaded from audio_effects.conf file.
When an input is created, corresponding effects are created and enabled.

Change-Id: Id17119e0979b4dcf189b5c7957fec30dc3478790
 2011-07-18 09:42:57 -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
James Dong
d9ac621f59 Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens 
o Deal with vendor codec hang bug

Change-Id: Ic8449afd43045f09a9e0bd3d1be9a320e59ccabe
 2011-07-15 15:32:21 -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
Andreas Huber
232d5f2aa2 If audio startup fails while executing MediaPlayer::start() do NOT post an error 
notification, the error returned by MediaPlayer::start() will suffice.

Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug: 5020200
 2011-07-14 13:02:47 -07:00
Narayan Kamath
d1435e998b Merge "Minor documentation updates for the AudioTrack class." 2011-07-14 11:13:07 -07:00
Narayan Kamath
88bde0ce37 Minor documentation updates for the AudioTrack class. 
Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
 2011-07-14 18:10:47 +01:00
James Dong
ad07457ece Merge "Support profile and level query for SW video decoders" 2011-07-14 09:59:24 -07:00
Andreas Huber
1a54107562 Merge "Remove legacy http support from stagefright, chromium is the new hotness." 2011-07-14 09:09:07 -07:00
Glenn Kasten
d86934ae0f Merge "OMX CallbackDispatcher uses C++ Thread not pthread" 2011-07-14 07:54:34 -07:00
Mike Lockwood
c1b9bbb21c Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build 
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-13 19:45:44 -04:00
Andreas Huber
c3119330a5 Remove legacy http support from stagefright, chromium is the new hotness. 
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
 2011-07-13 15:45:01 -07:00
Andreas Huber
2d912dd5ea Merge "Remove old-style software decoders." 2011-07-13 15:19:44 -07:00
Andreas Huber
a8ccc50175 Remove old-style software decoders. 
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
 2011-07-13 14:14:08 -07:00
Mike Lockwood
45aaa2a345 MediaScanner: fix breakage in updates 
To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records

Bug: 5021925

Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-13 16:50:29 -04:00
Andreas Huber
67d464f47e Enable signalling of a stream discontinuity involving a format-change 
through IStreamListener.

Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug: 5022434
 2011-07-13 09:47:09 -07:00
Mike Lockwood
9cba686366 Merge "MTP: Clean up MtpServer initialization and threading:" 2011-07-13 08:07:59 -07:00