Commit Graph

3473 Commits

Author SHA1 Message Date
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
Andreas Huber
3a9cc8cef4 Merge "Squashed commit of the following:" into gingerbread 2010-09-28 11:27:33 -07:00
Andreas Huber
38ae220bb7 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.
related-to-bug: 3036592
Change-Id: Ib142b171c829ed74156c0281d9d4543fcc96c802
2010-09-28 11:26:03 -07:00
Gil Dobjanschi
b0725a4aeb Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
Gil Dobjanschi
f8b04868e6 Validate Overlay and effect duration and start time.
Change-Id: I3235573f9edc65f148541adacd01eb5caa0b8615
2010-09-28 09:24:29 -07:00
Dave Sparks
7dff9dfd61 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 were open on t
Merge commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp

* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
2010-09-28 08:52:23 -07:00
Mike Lockwood
e11eba3c8a MtpCursor: Fix long to int truncation bug
BUG: 2978335

Change-Id: I2491a2ce3b65afa272540090cabace52067b8534
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-28 09:14:50 -04:00
Mike Lockwood
90bbe5e486 MtpCursor: Remove some unused variables
Change-Id: Ie1c88bd817c45fc19e34165f8d8557f00514188d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-28 08:36:15 -04:00
Dharmaray Kundargi
c73305cfd7 work on review comments and code formating.
Removed white spaces

Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
2010-09-27 17:32:00 -07:00
Dave Sparks
124a346c7a 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 were open on the SD card. This fix changes the filter for the SD card,
and adds the directory for data files as well.

Change-Id: I61b67c3d11d93dbd530e8b3566000e79bc037137
2010-09-27 17:04:05 -07:00
Andreas Huber
c751eccad3 Squashed commit of the following:
commit 29a4d3effb05a2e074cb0693316ab1977baeb0b6
Author: Andreas Huber <andih@google.com>
Date:   Mon Sep 27 12:01:32 2010 -0700

    Fully working implementation of MPEG2TSWriter (for AAC and AVC sources).

    Change-Id: I8a32a47565b647bf6c078c520e39565e08ea0d84

commit f4dec4c3899f3be393508e180d6c07e249d3335e
Author: Andreas Huber <andih@google.com>
Date:   Mon Sep 27 10:36:31 2010 -0700

    More reliable identification of MPEG2 transport streams. Don't keep scanning forever in case the stream does not have both audio and video tracks.

    Change-Id: Icc5b4e8be145b2805e8776559546a6818342aea7

commit 4fe3cc942f9b3d3cf54138b828c41214aa916dd2
Author: Andreas Huber <andih@google.com>
Date:   Mon Sep 27 08:23:39 2010 -0700

    test code

    Change-Id: I16560a17661407d06497f99ff88230724bb898af

commit 64d988b24f49f179a90fa677be11c823959e734b
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 23 14:42:52 2010 -0700

    First shot at supporting writing to an MPEG2 transport stream.

    Change-Id: Ie537939a99fa3ddc0c7661c47c18277584817c74

Change-Id: If78fd034af8f6e8ceac8dbeff96d5ecb3f6b96dc
2010-09-27 12:04:43 -07:00
Mike Lockwood
ec67253bf0 Merge "MTP: Fix local reference leaks." 2010-09-27 11:26:27 -07:00
Gil Dobjanschi
bf836ec6ed Merge "Bug fix: getDuration vs. getDurationTimeline" 2010-09-27 11:15:24 -07:00
Gil Dobjanschi
4b66f7a53f Bug fix: getDuration vs. getDurationTimeline
Change-Id: I41a40a3fc3b3674b5fcacecda174e924211b4ad2
2010-09-27 10:26:11 -07:00
Mike Lockwood
731a95a5f1 Merge changes I424ba760,Ic0826085
* changes:
  MTP: Implement extra object properties for audio, video and image files
  MediaStore: Add helper method to create Uri for querying genre for an audio file
2010-09-27 10:18:47 -07:00
Mike Lockwood
8839471f4d MTP: Fix local reference leaks.
We cannot rely on the VM automatically freeing local references for us
in a timely manner in JNI code that is not called directly from Java.

Change-Id: I6ee8a9a97cb557b9d3b2ace4e4d20467b436fb9c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-27 13:16:53 -04:00
Mike Lockwood
ae078f7dac MTP: Implement extra object properties for audio, video and image files
Read-only support at this point.

BUG: 2869730

Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-27 13:16:53 -04:00
James Dong
e9e0e0e970 am a9f17c8b: am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Merge commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d'

* commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d':
  Fix track duration calculation if the start timestamp is non-zero
2010-09-27 10:16:38 -07:00
James Dong
a9f17c8b42 am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp

* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
  Fix track duration calculation if the start timestamp is non-zero
2010-09-27 10:13:04 -07:00
James Dong
bf47092e1e Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread 2010-09-27 10:08:52 -07:00
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
a54abd06d2 am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'

* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
  Support other kinds of HTTP redirect in NuHTTPDataSource
2010-09-27 09:28:06 -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
3b8901946b am 1b37df95: am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread
Merge commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727'

* commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727':
  Fix error in AudioEffect command status reporting.
2010-09-27 08:48:40 -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
Mike Lockwood
cc64c5dbfb Merge changes I1302cacd,I05125c79,I8d9653ce
* changes:
  MTP: Fix some warnings
  MTP: Include current property value in GetDevicePropDesc
  MTP: Fix reading and writing device property descriptors
2010-09-26 09:42:06 -07:00
Mike Lockwood
ac745c1c6b MTP: Fix some warnings
Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-25 21:38:13 -04:00
Mike Lockwood
a2a2128423 MTP: Include current property value in GetDevicePropDesc
Change-Id: I05125c79ad58b6f75734fcedcc8af9b689fa9ff3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-25 21:21:05 -04:00
Mike Lockwood
564ff84321 MTP: Fix reading and writing device property descriptors
Change-Id: I8d9653ceedfed688addd6c4194c097d7090c3468
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-25 08:37:59 -04:00
Gil Dobjanschi
d66a3fe171 Merge "Adjust the duration of transitions if needed." 2010-09-24 18:08:02 -07:00
Eric Laurent
a7936a5d6d am f3ae63ee: am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'

* commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
  fix problem in AudioEffect JNI setup.
2010-09-24 15:57:44 -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
Gil Dobjanschi
05152ffd67 Adjust the duration of transitions if needed.
Change-Id: I2e5f9431b1f1c25b30e2d144916140365b10021b
2010-09-24 14:52:05 -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
James Dong
ed63f505ea Merge "Added two more video encoders" 2010-09-24 10:56:19 -07:00
Mike Lockwood
ab853b39be Merge "Add constant for SDCARD_RW group ID." 2010-09-24 10:45:38 -07:00
Marco Nelissen
920d649949 Send album artist to the media provider again.
Change-Id: I13f44bab2024adcfbc4b9491ac565cfdf15ef9d9
2010-09-24 09:22:55 -07:00
Mike Lockwood
58fd98accb Add constant for SDCARD_RW group ID.
Change-Id: I3b009cd06d3c1bc308ba82694db7383134709f75
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-24 11:02:47 -04:00