Merge commit '8986f62b30e494b68476ff8ef81acd4b1dd22674'
* commit '8986f62b30e494b68476ff8ef81acd4b1dd22674':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'
* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
Separating the Uris for local and MTP access to the database will
allow us to handle MTP originated queries differently in the provider.
Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38
Signed-off-by: Mike Lockwood <lockwood@android.com>
This broke when I added support for transfering arbitrary files.
Change-Id: I6f2c052f3bd69839befcf0783d7aff5bcfd29b3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp
* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp
* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
When 32-bit offset is used,
Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp
* commit 'a063cd6478254bba3290576ae5556abf469d6535':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
if the requested max file size is greater than the 32-bit offset limit,
set the limit to the max 32-bit offset limit.
Change-Id: Ie74cbed98469721d4280a0b87491e888948f0046
Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp
* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
HW audio encoder expects timestamp via kKeyTime from each input buffer
Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d'
* commit 'e126119c3a406bc564f2549aeb1416aff112689d':
Modify type of some environmental reverb parameters
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp
* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
Modify type of some environmental reverb parameters
Changed type of decay time, reverb delay and reflections delay parameters
from signed to unsigned int to match OpenSL ES interface definition.
Also fixed some type casts in lvm reverb wrapper.
Change-Id: I5ca5e76a87c2590f01f031f3168355586ef22556
We will be using this table for more than just MTP,
so it deserves a more general name.
Change-Id: I4c86d7e37ebe778e39699245b0e08af059e677ea
Signed-off-by: Mike Lockwood <lockwood@android.com>
CameraSourceTimeLapse now decides whether to use still or video
camera automatically. It checks if the passed in size is a valid
preview size and if it is, then uses the video camera else uses
the still camera.
Removed from StagefrightRecorder the support to set parameter
useStillCameraForTimeLapse.
Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99'
* commit 'd6fd133d18c189ab112daef9dc649d0796df5d99':
Not all audio source has the drift time information
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp
* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
Not all audio source has the drift time information
Merge commit '8e11c82247151085fa165c76bfbc157bc6091ca4'
* commit '8e11c82247151085fa165c76bfbc157bc6091ca4':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp
* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.
This is try 2 for this change, after reverting the first one because it broke
the build.
Change-Id: I94249b72bdb5d5719360f03d7935fcca4ece5028
Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'
* commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp
* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
