5896 Commits

Author SHA1 Message Date
Marco Nelissen
8ca8a69d58 Merge "Enable media scanner bulk inserts" 2012-02-02 10:48:01 -08:00
Marco Nelissen
d6b3e0cc36 Enable media scanner bulk inserts
Change-Id: I357162d0fe498a182ccb14630fe565daaa8bb0c1
2012-02-02 10:35:22 -08:00
James Dong
99b252a440 Removed a loop for buffer lookup
o used the nInputPortIndex and nOutputPortIndex from header instead
  of assuming that the # of ports == 2

Change-Id: I4b615912b088b4e2bac9c00e89986e811a5c58bb
2012-02-02 10:24:25 -08:00
Eric Laurent
175df11561 Merge "modifications for new webrtc modules" 2012-02-02 09:39:28 -08:00
James Dong
26daa02bdb Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation" 2012-02-01 18:53:50 -08:00
James Dong
5a043534a5 Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation
o simply applying the change in commit a161af9d1e2baa3f23e32634ef7dd9b4bbce9a6c to other formats
o related-to-bug: 5947196

Change-Id: I95de10263b8ad9ec941f1d6b907fca6aeff0a90f
2012-02-01 13:37:36 -08:00
Andreas Huber
ca97d6b6ae The AMR WB software encoder is now an OMX component.
Change-Id: Iebfb2696783a0163369ba4e8ef72e19ee76ad893
2012-02-01 12:16:40 -08:00
Eric Laurent
5a1f97c007 modifications for new webrtc modules
Adapt include files path in makefile and source to new
directory structure in webrtc library.

Also changed the default AGC parameters to less extreme settings.

Change-Id: Ia6a41c816dc44645f8f867937b722eede88c06ea
2012-02-01 10:59:17 -08:00
Andreas Huber
9dd295af25 The software AMR NB encoder is now an OMX component.
Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
2012-02-01 10:39:26 -08:00
James Dong
324e93fcf6 Merge "add tests module tag to omx_tests" 2012-01-31 17:36:37 -08:00
James Dong
23098685bd add tests module tag to omx_tests
Change-Id: I5dcb5187f09a7ae980ac5857b7ade81001d459f8
2012-01-31 12:27:10 -08:00
James Dong
81bf15ac36 Merge "First step of refactoring 'timedtext' code." 2012-01-31 12:06:43 -08:00
Andreas Huber
f6b4ca408e Slighly improve the API to discover if the OMX stack is running in the local
process.

Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
2012-01-31 11:16:24 -08:00
Martin Storsjo
f4e98bac0f stagefright aacenc: Safeguard against overwriting bits
Previously, if bits above the lowest noBitsToWrite were
set, they would be ORed into the previous cache word,
setting unrelated bits erroneously.

This doesn't noticeably affect the performance of the
codec as a whole.

Change-Id: Ie9935533c4299b8f07cb14485f039a9be9c84016
2012-01-31 10:35:49 +02:00
Insun Kang
7c81e52a67 First step of refactoring 'timedtext' code.
Goal
1. Removed dependency of TimedTextPlayer on AwsomePlayer.
2. Generalized TimedTextParser to TimedTextSource and its subclasses.

Summary
1. Introduced TimedTextDriver, TimedTextPlayer (new implementation),
TimedTextSource (and its subclasses).
2. Removed TimedTextParser.

Remaining TODOs
1. Revise VideoVidew, Gallery3D app, AwesomePlayer to check if
'pause' and 'resume' works well.
2. Consider revising MediaPlayer APIs such as setParameter() ->
addTextSource(). Need more thoughts.

Change-Id: Ie0c4f15b9690102de755cef6940f8c31ccf78e27
2012-01-31 14:44:32 +09:00
Andreas Huber
4882355d8c Make sure our aac decoder handles this parameter.
Change-Id: I212ef0c21776b99d0c6662b118ca0ec16b1d3d5e
2012-01-30 16:45:28 -08:00
Andreas Huber
e372593cfb Merge "Instantiate software codecs locally whenever possible." 2012-01-30 12:32:58 -08:00
Andreas Huber
18ffe40289 Instantiate software codecs locally whenever possible.
Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
2012-01-30 11:48:02 -08:00
Marco Nelissen
f3a3b9ec9c Merge "Handle adding/removing/renaming nomedia paths" 2012-01-30 08:27:57 -08:00
Martin Storsjo
62b4d5b0ca stagefright amrwbenc: Simplify the definition of static_vo
For GCC, all of inline, __inline and __inline__ work fine.
For MSVC, only __inline works. (__inline should also be accepted
by RVCT.)

Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2
2012-01-30 13:03:01 +02:00
Martin Storsjo
832dc8f794 stagefright aacenc: Avoid warnings about incompatible pointer types
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
2012-01-30 12:59:03 +02:00
Jeff Brown
2d2d7d6f42 Merge "Implement a cancelation mechanism for queries." 2012-01-27 17:37:24 -08:00
Jeff Brown
75ea64fc54 Implement a cancelation mechanism for queries.
Added new API to enable cancelation of SQLite and content provider
queries by means of a CancelationSignal object.  The application
creates a CancelationSignal object and passes it as an argument
to the query.  The cancelation signal can then be used to cancel
the query while it is executing.

If the cancelation signal is raised before the query is executed,
then it is immediately terminated.

Change-Id: If2c76e9a7e56ea5e98768b6d4f225f0a1ca61c61
2012-01-27 17:33:21 -08:00
Glenn Kasten
b7cffb4140 More audio_stream_type_t
Change-Id: I1260259efe0aa3fc1ef13de69758aaa592e1f815
2012-01-27 16:33:43 -08:00
Glenn Kasten
30c918ce7f Use final on new member variables
Use final for member fields initialized to a new and that are never modified.

Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
2012-01-27 16:13:00 -08:00
Glenn Kasten
23f7ad39ef Use ToneGenerator::tone_type consistently
Also remove defaults in startToneCommand(), they're not needed and the
default for tone type was nonsense.

Change-Id: I70fa8cee4f3dbb8c66ceb3719c8d3d2f447f05b9
2012-01-27 16:01:44 -08:00
Marco Nelissen
ca78f3d9af Handle adding/removing/renaming nomedia paths
b/5849015
Change-Id: I3ec7419498d1ecc83db6d4605b3d7610349231f7
2012-01-27 15:10:14 -08:00
Jean-Michel Trivi
11001c344a Merge "Bug 5567648 disassociate audio mode and audio focus" 2012-01-27 14:15:37 -08:00
Jean-Michel Trivi
4dd3674e51 Bug 5567648 disassociate audio mode and audio focus
Don't automatically change the audio focus when
 the audio mode changes. This is best handled by the
 applications that change the audio mode so they
 can address their usecases as they please (for
 instance to define the behavior when switching calls).
Replaced the implicit "mode to focus" behavior with
 two methods to request and abandon audio focus. These
 methods are only to be used by the framework, and maintain
 the logic in AudioService to prevent other apps to request
 audio focus during a call.
A susequent change will update com.android.internal.telephony.CallManager
 to take advantage of these two methods.

Change-Id: If84ebd508e985083e8cac82ece44940c72b5c669
2012-01-27 13:32:45 -08:00
Glenn Kasten
882c0a20c5 Use audio_in_acoustics_t consistently
Change-Id: I0a9dd668fb2e57b1c3ece3190588194974b99062
2012-01-27 13:31:54 -08:00
Glenn Kasten
c14639a9a1 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
0f0fbd9441 Use audio_source_t consistently
Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
 - fix comments in MediaRecorder.java
 - AudioPolicyService server side was not checking source parameter at
   all, so if the client wrapper was bypassed, invalid values could be
   passed into audio HAL
 - JNI android_media_AudioRecord_setup was checking source for positive
   values, but not negative values. This test is redundant, since already
   checked at Java and now checked by AudioPolicyService also, but might
   as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
2012-01-26 16:50:19 -08:00
Andreas Huber
4bc8bfaf11 Merge "The software AAC encoder is now an OMX component." 2012-01-26 16:00:38 -08:00
Andreas Huber
afe02df45e The software AAC encoder is now an OMX component.
Yay.

Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
2012-01-26 15:45:38 -08:00
Ben Cheng
44094486b0 Preserve NEON callee-save registers d8-d15.
BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
2012-01-26 10:34:52 -08:00
Jean-Baptiste Queru
61bd33968f am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
  stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:33:42 -08:00
Jean-Baptiste Queru
64085d03ef am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
2012-01-25 10:27:41 -08:00
Jean-Michel Trivi
171070d25e Merge "Update AudioTrack.stop() javadoc" 2012-01-25 09:46:01 -08:00
Jean-Baptiste Queru
12045502c4 Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Jean-Baptiste Queru
d452520464 am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-25 08:57:36 -08:00
Jean-Baptiste Queru
28091796a6 am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
  stagefright aacenc: Add missing newlines at the end of files
2012-01-25 08:57:32 -08:00
Jean-Michel Trivi
a701da8eba Update AudioTrack.stop() javadoc
Add more information on the behavior of
  android.media.AudioTrack.stop()

Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
2012-01-24 16:53:57 -08:00
Jean-Michel Trivi
6de8b47b54 Merge "More AudioManager tests" 2012-01-24 16:23:22 -08:00
Jean-Baptiste Queru
4cd2b34327 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
2012-01-24 15:13:45 -08:00
Jean-Baptiste Queru
fc2ea24b02 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit 'd80cbb8c7b13203704c00e2f5941588811c15665':
  stagefright aacenc: Add missing newlines at the end of files
2012-01-24 15:13:42 -08:00
Jean-Baptiste Queru
98539a4eba Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Jean-Baptiste Queru
d80cbb8c7b Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Michel Trivi
7dd65078f6 More AudioManager tests
Add tests for AudioFocus:
- create a looper for AudioManager to use so listener callbacks can be used
- test each type of audio focus gain causes the expected type of focus loss
- stress test audio focus request and abandon, with and without a listener

Change-Id: I7d9c84ccd8ea49cf20ede57b1245899a81e99ab0
2012-01-24 09:59:23 -08:00
Jean-Baptiste Queru
adbbf7a791 am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588':
  stagefright aacenc: Properly terminate a comment
2012-01-24 08:46:26 -08:00
Jean-Baptiste Queru
2ae5805cf1 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment
2012-01-24 08:40:50 -08:00