summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if ↵Andreas Huber2010-09-092-40/+41
|\ | | | | | | | | | | | | | | | | an MP3Extractor is used on non-mp3 content." into gingerbread Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3' * commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3': Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
| * am a063cd64: Merge "Instead of asserting, publish no tracks if an ↵Andreas Huber2010-09-092-40/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | MP3Extractor is used on non-mp3 content." into gingerbread Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp * commit 'a063cd6478254bba3290576ae5556abf469d6535': Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
| | * Instead of asserting, publish no tracks if an MP3Extractor is used on ↵Andreas Huber2010-09-092-40/+41
| | | | | | | | | | | | | | | | | | | | | non-mp3 content. Change-Id: I26db4524c5306bf2346438d2bd359c5cfb95cead related-to-bug: 2900419
* | | am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via ↵James Dong2010-09-085-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kKeyTime from each input buffer" into gingerbread Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334' * commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334': HW audio encoder expects timestamp via kKeyTime from each input buffer
| * | am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from ↵James Dong2010-09-085-4/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | each input buffer" into gingerbread Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp * commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7': HW audio encoder expects timestamp via kKeyTime from each input buffer
| | * Merge "HW audio encoder expects timestamp via kKeyTime from each input ↵James Dong2010-09-085-4/+7
| | |\ | | | | | | | | | | | | buffer" into gingerbread
| | | * HW audio encoder expects timestamp via kKeyTime from each input bufferJames Dong2010-09-085-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | - This fixes media server crashes on droid Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
* | | | am e126119c: am 95d86480: Merge "Modify type of some environmental reverb ↵Eric Laurent2010-09-082-24/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters" into gingerbread Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d' * commit 'e126119c3a406bc564f2549aeb1416aff112689d': Modify type of some environmental reverb parameters
| * | | am 95d86480: Merge "Modify type of some environmental reverb parameters" ↵Eric Laurent2010-09-082-24/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp * commit '95d8648054223a501fe5390edef7e5d9383a4be8': Modify type of some environmental reverb parameters
| | * | Modify type of some environmental reverb parametersEric Laurent2010-09-082-24/+26
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log ↵Andreas Huber2010-09-071-2/+9
| | | | | | | | | | | | | | | | | | | | | a warning and ignore them instead. Change-Id: Ia45887df82d66f393520e5a4308f430010402d5e related-to-bug: 2976248
* | | Merge changes I71f5b0fc,I92c7accbNipun Kwatra2010-09-034-37/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Moving decision to use still camera to CameraSourceTimeLapse pass auxiliary video parameters.
| * | | Moving decision to use still camera to CameraSourceTimeLapseNipun Kwatra2010-09-034-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am ef9e508c: am 7e427934: Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950' * commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950': LVM release 1.08 delivery.
| * | | am 7e427934: Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp * commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b': LVM release 1.08 delivery.
| | * | Merge "LVM release 1.08 delivery." into gingerbreadEric Laurent2010-09-035-41/+69
| | |\ \
| | | * | LVM release 1.08 delivery.Eric Laurent2010-09-035-41/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed bundle SamplesToExit to 0.1 secs - Added SamplesToExit to Revreb - Removed mixer from Core reverb Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
* | | | | am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time ↵James Dong2010-09-033-12/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information" into gingerbread Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99' * commit 'd6fd133d18c189ab112daef9dc649d0796df5d99': Not all audio source has the drift time information
| * | | | am 9077f8ec: Merge "Not all audio source has the drift time information" ↵James Dong2010-09-033-12/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp * commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62': Not all audio source has the drift time information
| | * | | Merge "Not all audio source has the drift time information" into gingerbreadJames Dong2010-09-033-12/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Not all audio source has the drift time informationJames Dong2010-09-033-12/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
* | | | | am 8e11c822: am 9fee0b2a: Ogg files can be tagged to be automatically ↵Andreas Huber2010-09-034-4/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | looping, this setting always overrides the MediaPlayer\'s setLooping setting. Merge commit '8e11c82247151085fa165c76bfbc157bc6091ca4' * commit '8e11c82247151085fa165c76bfbc157bc6091ca4': Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
| * | | | am 9fee0b2a: Ogg files can be tagged to be automatically looping, this ↵Andreas Huber2010-09-034-4/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Ogg files can be tagged to be automatically looping, this setting always ↵Andreas Huber2010-09-034-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overrides the MediaPlayer's setLooping setting. Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a related-to-bug: 2974691
* | | | | Merge "Add the new Stagefright ANativeWindow OMX codec API."Jamie Gennis2010-09-037-4/+254
|\ \ \ \ \
| * | | | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-037-4/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on ↵Andreas Huber2010-09-032-88/+119
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming sources before finishing prepare()." into gingerbread Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc' * commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc': Properly buffer a certain amount of data on streaming sources before finishing prepare().
| * | | | | am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming ↵Andreas Huber2010-09-032-88/+119
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources before finishing prepare()." into gingerbread Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp * commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5': Properly buffer a certain amount of data on streaming sources before finishing prepare().
| | * | | | Merge "Properly buffer a certain amount of data on streaming sources before ↵Andreas Huber2010-09-032-88/+119
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | finishing prepare()." into gingerbread
| | | * | | Properly buffer a certain amount of data on streaming sources before ↵Andreas Huber2010-09-032-88/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finishing prepare(). Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207 related-to-bug: 2875110
* | | | | | am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writerJames Dong2010-09-033-204/+53
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af' * commit 'bc1452a307ac61ca87bf78722701ac85100952af': Remove unused/debugging code from MP4 file writer
| * | | | | am 7755cdd6: Remove unused/debugging code from MP4 file writerJames Dong2010-09-033-204/+53
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp * commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82': Remove unused/debugging code from MP4 file writer
| | * | | | Remove unused/debugging code from MP4 file writerJames Dong2010-09-033-204/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o also makes nal length in the recorded file modifiable at runtime Change-Id: I731b4dde7070d8d9628b36b523a5b2c011c7c2cf
* | | | | | am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbreadJames Dong2010-09-032-34/+104
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d' * commit '3c3fc97e104bd17af608727d82e965fc28f2c89d': Better file size estimate
| * | | | | am 46e63b34: Merge "Better file size estimate" into gingerbreadJames Dong2010-09-032-34/+104
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp * commit '46e63b346770efa14451b8e67b7f7636c4e5a76c': Better file size estimate
| | * | | | Better file size estimateJames Dong2010-09-022-34/+104
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the recorded file becomes large, the metadata size can no longer be ignored. This makes it possible to save the recorded file when the storage becomes almost full at the end of the recording session. Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
* | | | | am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from ↵James Dong2010-09-028-32/+63
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSource" into gingerbread Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3' * commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3': Calculate audio media drift time from AudioSource
| * | | | am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into ↵James Dong2010-09-028-32/+63
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp * commit '7ed7668b30e70ca8e3f0f183364433326ed29f39': Calculate audio media drift time from AudioSource
| | * | | Merge "Calculate audio media drift time from AudioSource" into gingerbreadJames Dong2010-09-028-32/+63
| | |\ \ \
| | | * | | Calculate audio media drift time from AudioSourceJames Dong2010-09-018-32/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the time to receive an output buffer from an audio encoder is different because the encoder does not need to read from the source for all output buffers. This leads to large fluctuation in terms of wall clock duration between two neighboring audio sample outputs from the audio encoder. As a result, the media time for the video track after adjustment using the drifting changes wildly sometimes. This patch addresses this issue by only updating the media drift time when an audio source input buffer is read. the wall clock for the audio track is also calculated at the same time when the input audio buffer is read at AudioSource. bug - 2959800 Change-Id: I3174aa182f744784b540f0a7198524d4eee8bd7b
* | | | | | am 937056c1: am 32ec1ad1: Merge "Fix problem in AudioEffect::command() ↵Eric Laurent2010-09-021-5/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status." into gingerbread Merge commit '937056c1a7ce71e6881305a31f76e62a76685f24' * commit '937056c1a7ce71e6881305a31f76e62a76685f24': Fix problem in AudioEffect::command() status.
| * | | | | am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into ↵Eric Laurent2010-09-021-5/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp * commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56': Fix problem in AudioEffect::command() status.
| | * | | | Merge "Fix problem in AudioEffect::command() status." into gingerbreadEric Laurent2010-09-021-5/+9
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix problem in AudioEffect::command() status.Eric Laurent2010-09-021-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The *pReplyData argument of the command() function was left unitialized by EffectHandle::command() when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT. Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
* | | | | | MTP: Implement support for getting/setting device propertiesMike Lockwood2010-09-024-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the "device friendly name" and "synchonization partner" properties, which are required by Microsoft. Change-Id: Ic0443333d75f7d98a2d902a790b9d505a56d4eef Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of ↵Andreas Huber2010-09-015-2/+77
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70' * commit 'fd0eed007d99178092ede56ec2c4799046615f70': Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
| * | | | | am a2511da9: Merge "Better support for buffered streaming of rtsp content, ↵Andreas Huber2010-09-015-2/+77
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp * commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef': Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
| | * | | | Merge "Better support for buffered streaming of rtsp content, if buffer ↵Andreas Huber2010-09-015-2/+77
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
| | | * | | | Better support for buffered streaming of rtsp content, if buffer drops below ↵Andreas Huber2010-09-015-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a certain threshold we will temporarily pause playback until we have sufficient data. Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad related-to-bug: 2556656
* | | | | | | am 3fd01c4d: am d3c1bae4: Merge "Make sure that if initialization fails, ↵James Dong2010-09-011-4/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSource still behaves well." into gingerbread Merge commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6' * commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6': Make sure that if initialization fails, AudioSource still behaves well.
generated by cgit v1.1 at 2025-03-10 00:33:24 +0000