2913 Commits

Author SHA1 Message Date
Gil Dobjanschi
e799720dd4 Merge "Added audio track playback API" 2010-10-04 15:49:26 -07:00
Gil Dobjanschi
52ac301ee1 Added audio track playback API
Change-Id: I9884ab5d3a7d8d8310f4b4426e50b0496cbbd295
2010-10-04 13:56:39 -07:00
Andreas Huber
3d29e8c846 am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
2010-10-04 11:51:55 -07:00
Andreas Huber
dfd03fe993 am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
2010-10-04 11:47:52 -07:00
Andreas Huber
05f6787b88 Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
Change-Id: I29143e357fb6ea7b860636100e010f2ea7436798
related-to-bug: 3037389
2010-10-04 11:36:39 -07:00
Andreas Huber
d84d9f4064 am bb506dab: am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80'

* commit 'bb506dab1ff10e6939fcd0457571e0b46793dd80':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
2010-10-04 11:26:16 -07:00
Andreas Huber
bb506dab1f am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp

* commit '7fa693740756123fa9d05e62fb47aae5d703c71d':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
2010-10-04 11:22:22 -07:00
Andreas Huber
1913c1aeab Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
Change-Id: Iaf5880bb3376f9cbf22aefe198878eaf6f3f08c7
related-to-bug: 3037389
2010-10-04 11:09:31 -07:00
James Dong
8f8fd3525b am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
  Turn off media time adjustment by default
2010-10-01 17:35:40 -07:00
James Dong
2bf74b8f0a am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
  Turn off media time adjustment by default
2010-10-01 17:32:16 -07:00
James Dong
6c609b6a60 Merge "Turn off media time adjustment by default" into gingerbread 2010-10-01 17:27:51 -07:00
James Dong
9160e4aa2a Turn off media time adjustment by default
Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
2010-10-01 17:14:23 -07:00
Andreas Huber
2a21e73acc am 57853559: am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread
Merge commit '57853559c31154db9c202d653065c592169c5027'

* commit '57853559c31154db9c202d653065c592169c5027':
  Start playing live streams from the start, no the middle...
2010-10-01 11:40:18 -07:00
Andreas Huber
57853559c3 am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread
Merge commit 'e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp

* commit 'e619a9da44e4c00f9034917aef67f86da0bc207f':
  Start playing live streams from the start, no the middle...
2010-10-01 11:37:44 -07:00
Andreas Huber
e619a9da44 Merge "Start playing live streams from the start, no the middle..." into gingerbread 2010-10-01 11:35:17 -07:00
Andreas Huber
aafe912e83 am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'

* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
  Remove development-only code.
2010-10-01 11:29:26 -07:00
Andreas Huber
a424f7c628 Start playing live streams from the start, no the middle...
Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476
related-to-bug: 2368598
2010-10-01 11:28:44 -07:00
Andreas Huber
d6d5cfb914 am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp

* commit '469b80336368bef3742e97c15e9017c1f2d404ae':
  Remove development-only code.
2010-10-01 11:25:57 -07:00
Andreas Huber
1981bd034a am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
  Squashed commit of the following:
2010-10-01 11:21:16 -07:00
Andreas Huber
21d28a2a13 Remove development-only code.
Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug: 2368598
2010-10-01 11:19:26 -07:00
Andreas Huber
14401bf7bc am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following:
2010-10-01 11:03:47 -07:00
Andreas Huber
b72c7e36a2 Squashed commit of the following:
commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 30 16:44:57 2010 -0700

    better separation of access units

    Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c

commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 30 15:35:01 2010 -0700

    Support for ES packets that do not start on PES packet boundaries.

    Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
    related-to-bug: 2368598

Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
2010-10-01 10:51:41 -07:00
Eric Laurent
785c416ecf am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9'

* commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 19:47:21 -07:00
Eric Laurent
de12c3cf56 am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp

* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 17:47:07 -07:00
Eric Laurent
4712baab81 Issue 3032913: improve AudioTrack recovery time
This issue showed that when an AudioTrack underruns during a too long period
of time and is therefore disabled by audioflinger mixer, it takes an additional
delay of up to 3 seconds to recover.
This fix adds a simple mechanism to recover immediately when the client application
is ready to write data again in the AudioTrack buffer

Also throttle warnings on record overflows

Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
2010-09-30 17:21:23 -07:00
Gil Dobjanschi
048449ebfa Added ability to instantiate various implementations of the VideoEditor
Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
2010-09-29 16:58:21 -07:00
Chia-chi Yeh
f46731ddde am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'

* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
2010-09-28 21:55:35 -07:00
Chia-chi Yeh
10b15c08bb am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
2010-09-28 21:13:54 -07:00
Chia-chi Yeh
d6877fa497 Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 2010-09-28 21:11:27 -07:00
Chia-chi Yeh
081833d791 AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.

Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
2010-09-29 12:00:18 +08:00
Jaikumar Ganesh
82aa7f017d Update code for new BT APIs.
Change-Id: Idf806cba8160e6075e33e26ee9936663b850e96c
2010-09-28 20:02:58 -07:00
Gil Dobjanschi
e63f20b5fe Merge "Save overlays to XML" 2010-09-28 18:00:55 -07:00
Gil Dobjanschi
5665fd6ac2 Save overlays to XML
Change-Id: I549c40b55a85022136dbd4899cc0d2d4da6e33de
2010-09-28 17:54:09 -07:00
Eric Laurent
c9a9800fa1 am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread
Merge commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c'

* commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c':
  Fix several audio effects problems.
2010-09-28 17:39:54 -07:00
Andreas Huber
09527066f8 am 387bdcda: am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
Merge commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'

* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
2010-09-28 17:37:44 -07:00
Eric Laurent
b047e3cdf2 am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread
Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp

* commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68':
  Fix several audio effects problems.
2010-09-28 16:42:14 -07:00
Eric Laurent
4fd3ecc1f0 Fix several audio effects problems.
Fixed the following issues in LVM effect bundle wrapper:
- memory leaks in EffectCreate() in case effect creation fails at various stages
- Added saturation when accumulating to output buffer
- Fixed problems with enabled effects count when an effect is released while enabled
- Do not allocate temporary buffer for accumulation each time process() is called

Fixed the following issues in effects framework (AudioFlinger)
- Release effect synchronously in the library when deleted from effect chain
- Do not call the effect process function if no tracks are present in the same
audio session

Change-Id: Ifbd80a163415cfb3c0a337c12082853ea45d9c91
2010-09-28 14:23:39 -07:00
Andreas Huber
ce635b5504 am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Merge commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023'

* commit 'd6c30e8c1521bc584f33500b8ee897dafdfec023':
  Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
2010-09-28 14:01:14 -07:00
Andreas Huber
3bf613b268 am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
Merge commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06'

* commit 'c889bbfa965f4ba90636f561c5e1353289d4cb06':
  Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
2010-09-28 14:00:36 -07:00
Andreas Huber
1a3038586a am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread
Merge commit '9d59186068891834272c2e3ee6f9c4228af24656'

* commit '9d59186068891834272c2e3ee6f9c4228af24656':
  Squashed commit of the following:
2010-09-28 13:59:26 -07:00
Andreas Huber
387bdcdadc am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
2010-09-28 13:26:26 -07:00
Andreas Huber
88a995edcf Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread 2010-09-28 13:23:26 -07:00
Dave Sparks
762665094f am 7dff9dfd: am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that w
Merge commit '7dff9dfd6176fad1318a27f16318561453a429f0'

* commit '7dff9dfd6176fad1318a27f16318561453a429f0':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
2010-09-28 13:19:55 -07:00
Andreas Huber
ad3fcfe845 Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
Change-Id: I4909fdf19518dbabb6c340e2a31b50dfe6c5b067
related-to-bug: 3029947
2010-09-28 13:13:38 -07:00
Andreas Huber
d6c30e8c15 am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp

* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
  Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
2010-09-28 12:05:08 -07:00
Andreas Huber
be04506195 Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 2010-09-28 12:02:35 -07:00
Andreas Huber
2b359ed5b5 Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
Change-Id: I43875b6adaf96d4e982ef3dfc3d6c8f7034ac51d
related-to-bug: 3036592
2010-09-28 11:56:39 -07:00
Andreas Huber
c889bbfa96 am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
Merge commit '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp

* commit '4769f57948455277d0670ef18f64824ca5d894c1':
  Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
2010-09-28 11:48:44 -07:00
Andreas Huber
4769f57948 Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread 2010-09-28 11:46:41 -07:00
Andreas Huber
9d59186068 am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp

* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
  Squashed commit of the following:
2010-09-28 11:35:22 -07:00