2334 Commits

Author SHA1 Message Date
James Dong
dacebe62c6 Fix track duration calculation if the start timestamp is non-zero
o Updated the comments in the patch
o Added some additional checks on the timestamp

Change-Id: I8ad81eb6bfe358c1db5245cbb52efc905cdc234c
2010-09-27 10:02:15 -07:00
Andreas Huber
fa5c8fc4a4 am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp

* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
  Support other kinds of HTTP redirect in NuHTTPDataSource
2010-09-27 09:24:18 -07:00
Andreas Huber
abaabb2c79 Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread 2010-09-27 09:20:58 -07:00
Andreas Huber
ab2116c351 Support other kinds of HTTP redirect in NuHTTPDataSource
Change-Id: I3268a94cfb48cee9caa8914804d7907ff91d8a8e
related-to-bug: 3037686
2010-09-27 09:16:44 -07:00
Eric Laurent
1b37df95ec am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread
Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp

* commit '9627847d588cd969f60dcc79d165209184a90069':
  Fix error in AudioEffect command status reporting.
2010-09-27 08:45:07 -07:00
Eric Laurent
4d3fb50782 Fix error in AudioEffect command status reporting.
AudioEffect::command() should not interpret the status
returned in pReplyData unless the command is ENABLE or
DISABLE.

Also fixed:
- bug in Visualizer::getWAveForm() status reporting.
- wrong initialization value for capture buffer in visualizer engine.

Change-Id: I60fb0011f9dba96ee74661dec1e8ef441edcaf35
2010-09-24 15:24:54 -07:00
Eric Laurent
f3ae63eef2 am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp

* commit '52f58e96a723a56e6619c237c814a07503745de9':
  fix problem in AudioEffect JNI setup.
2010-09-24 13:46:36 -07:00
Eric Laurent
2fb43ef8c0 fix problem in AudioEffect JNI setup.
There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.

Also fixed a similar problem in AudioTrack JNI

Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
2010-09-24 13:18:14 -07:00
Andreas Huber
13770dcce2 am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread
Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp

* commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
2010-09-23 14:20:08 -07:00
Andreas Huber
7b2ed5d7d6 Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread 2010-09-23 14:16:48 -07:00
Andreas Huber
e7635933b6 Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
Change-Id: I1423923fafbcac6911218277e2bbfa068e49dcc6
2010-09-23 14:08:32 -07:00
Eric Laurent
ac4a284ab4 am 7864c72b: Merge "Fix issue 3022800." into gingerbread
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
  Fix issue 3022800.
2010-09-23 11:34:40 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800.
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
2010-09-23 11:04:03 -07:00
James Dong
693a430cff am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '903fc221068d02bdb53ba2a48f86339caf405259' into gingerbread-plus-aosp

* commit '903fc221068d02bdb53ba2a48f86339caf405259':
  Ignore errors from correction parameter query and config for M4v and H263 encoders
2010-09-23 10:21:26 -07:00
James Dong
30c7e13217 am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:17:30 -07:00
James Dong
903fc22106 Ignore errors from correction parameter query and config for M4v and H263 encoders
This feature is not essential for camcorder application

Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
2010-09-23 10:12:45 -07:00
James Dong
1e0e166ebe Use the advertised profile and level from M4V and H263 video encoders
This is already the case for AVC video encoder

Change-Id: I9cc97a03ab457b4bd0b21832c09f6d0aa7f5fc39
2010-09-22 17:42:09 -07:00
Eric Laurent
4744774a7a am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp

* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
  Fix more audio effects auto tests
2010-09-22 15:59:28 -07:00
Eric Laurent
3efbc55545 Merge "Fix more audio effects auto tests" into gingerbread 2010-09-22 15:53:49 -07:00
Andreas Huber
2de0a50a9a am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp

* commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 15:38:43 -07:00
Andreas Huber
9c37da7721 Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
Change-Id: I73974a336852974e2fb95a9626c1a96f296449eb
2010-09-22 15:27:20 -07:00
Eric Laurent
ec1e9c7a44 Fix more audio effects auto tests
commit 672c0dc3a04cb149691603342c319994e21235cb broke the energy probe
used by auto tests to verify that an effect is actually enabled.
The probe is based on the Visualizer which now scales the capture to maximise
the signal level: this prevents from detecting level changes between subsequent captures.
Playing sound at a lower volume moves the signal level out of the range where
scalling occurs and makes comparison possible again.

Change-Id: Ib56dec6e619c6d778dcc3ca6453091bf6136f290
2010-09-22 13:49:52 -07:00
Andreas Huber
cc6b941cf0 am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '4374b23d6be406710b91be746229e6c548613410' into gingerbread-plus-aosp

* commit '4374b23d6be406710b91be746229e6c548613410':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 12:25:13 -07:00
Andreas Huber
55f8aee55c Make sure we drain the avc software decoder's output queue once we run out of input data.
Change-Id: I3d92ebae4951b618a6dfcf42936cc4c63d4de539
2010-09-22 11:47:00 -07:00
Eric Laurent
b35f36f08d am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp

* commit '4f294558aa23bc155988838ef153dca731efe707':
  Fix broken insert reverb auto tests.
2010-09-22 09:38:46 -07:00
Eric Laurent
4f294558aa Merge "Fix broken insert reverb auto tests." into gingerbread 2010-09-22 09:34:00 -07:00
Eric Laurent
71fe631c78 Fix broken insert reverb auto tests.
commit 27a2fdfb8ad1606bdb686c35e30ae894dd037588 changed the
insert reverb behavior when it is attached to a track in that
the reverb tail is silenced immediately when the track is paused.
The tests have been modified to test the insert reverb on session 0.

Change-Id: I90c6fec40167966853acfeaa4dec2b96f9e7839f
2010-09-22 09:02:23 -07:00
Eric Laurent
6943b94b8f am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
2010-09-21 15:59:23 -07:00
Eric Laurent
a6dc469922 Merge "Fix issue 2913071." into gingerbread 2010-09-21 15:55:17 -07:00
Andreas Huber
0b2affe8f0 am 87d208f7: Merge "This log message is codec specific." into gingerbread
Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp

* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
  This log message is codec specific.
2010-09-21 15:20:38 -07:00
Andreas Huber
af90958184 am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread
Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp

* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
  Remove stagefright foundation's incompatible logging interface and update callsites.
2010-09-21 15:17:42 -07:00
Andreas Huber
87d208f7ea Merge "This log message is codec specific." into gingerbread 2010-09-21 15:17:04 -07:00
Andreas Huber
67738486d9 Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread 2010-09-21 15:14:43 -07:00
Andreas Huber
6e3fa444c5 Remove stagefright foundation's incompatible logging interface and update callsites.
Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
2010-09-21 15:12:19 -07:00
Eric Laurent
672c0dc3a0 Fix issue 2913071.
Scale audio signal during capture according to peak level so that
returned values on 8 bits contain enough information even for weak
signals.

Also do not reject requests to enable/disable the visualizer if we are
already in the requested state.

Change-Id: I07a705619764350834e61f82d161761eab688747
2010-09-21 15:11:50 -07:00
Andreas Huber
af0a1883b8 This log message is codec specific.
Change-Id: I603ae7bd13b186a6df0a26ea9abe073e89276caf
2010-09-21 15:08:52 -07:00
Eric Laurent
96d5c17e78 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
2010-09-21 10:52:27 -07:00
Eric Laurent
8d1513e13c Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
Eric Laurent
92cf2d6085 Made audio effect control panel intents public.
Change-Id: If927606a24966605eb3e02788b2477937349d518
2010-09-21 10:45:41 -07:00
James Dong
e436ef09d2 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
2010-09-21 10:24:10 -07:00
James Dong
40da64f07b Another attempt for fixing AAC+/eAAC+ related issue
The decoder has to decode the very first two frames (decoder specific data + first data
frame) in order to be really sure whether a stream is AAC or AAC+/eAAC+.

bug - 2966336

Change-Id: Ib12a07285933df0d6c346370a12f70e99e811881
2010-09-20 16:05:01 -07:00
Marco Nelissen
5c9f357994 am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Marco Nelissen
3c473ea7f9 Add a check to track a problem the monkey script has been triggering.
Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
2010-09-17 15:04:01 -07:00
Andreas Huber
7bc600cb08 am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp

* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 12:50:45 -07:00
Andreas Huber
1fc97385d8 am 524e6f62: Register the new OMX components.
Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp

* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
  Register the new OMX components.
2010-09-17 12:50:35 -07:00
Andreas Huber
f98197a727 Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
2010-09-17 11:49:39 -07:00
Andreas Huber
524e6f62c9 Register the new OMX components.
Change-Id: I795287c63073ca86ad0f97d6afcfc85c401dc984
2010-09-17 09:33:47 -07:00
Andreas Huber
92aa28addd am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread
Merge commit 'a7516e90d01a22d17a470695eefa905e0ff066cc' into gingerbread-plus-aosp

* commit 'a7516e90d01a22d17a470695eefa905e0ff066cc':
  Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
2010-09-16 16:02:33 -07:00
Andreas Huber
a7516e90d0 Merge "Make sure the .wav extractor does not read data outside the bounds of the 'data' box." into gingerbread 2010-09-16 15:20:33 -07:00
Andreas Huber
4f5bb1e699 Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
Change-Id: Icf18f9224d97e6a78328dd429ebc3a3433e5cecd
related-to-bug: 3007790
2010-09-16 14:54:10 -07:00