summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes I1302cacd,I05125c79,I8d9653ceMike Lockwood2010-09-266-51/+120
|\ | | | | | | | | | | | | * changes: MTP: Fix some warnings MTP: Include current property value in GetDevicePropDesc MTP: Fix reading and writing device property descriptors
| * MTP: Fix some warningsMike Lockwood2010-09-251-1/+1
| | | | | | | | | | Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * MTP: Include current property value in GetDevicePropDescMike Lockwood2010-09-255-46/+105
| | | | | | | | | | Change-Id: I05125c79ad58b6f75734fcedcc8af9b689fa9ff3 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * MTP: Fix reading and writing device property descriptorsMike Lockwood2010-09-251-4/+14
| | | | | | | | | | Change-Id: I8d9653ceedfed688addd6c4194c097d7090c3468 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am a1c7b096: am 6d8fae72: Merge "Instead of just writing one track to the ↵Andreas Huber2010-09-241-42/+111
|\ \ | |/ |/| | | | | | | | | | | | | .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread Merge commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34' * commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34': Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
| * am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, ↵Andreas Huber2010-09-241-42/+111
| |\ | | | | | | | | | | | | | | | | | | | | | | | | write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp * commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6': Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
| | * Merge "Instead of just writing one track to the .mp4 file, write all of them ↵Andreas Huber2010-09-241-42/+111
| | |\ | | | | | | | | | | | | (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
| | | * Instead of just writing one track to the .mp4 file, write all of them (at ↵Andreas Huber2010-09-241-42/+111
| | | | | | | | | | | | | | | | | | | | | | | | most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool. Change-Id: I67b287cf76546191f398939aabe4480d9e79a948
* | | | Merge "Added two more video encoders"James Dong2010-09-241-0/+2
|\ \ \ \
| * | | | Added two more video encodersJames Dong2010-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia426da5bfc255974d7bbf3915a473543e0841dc9
* | | | | am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbreadEric Laurent2010-09-241-40/+49
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e' * commit '692dfafe02d04cdbab5367546e166580c92e4d2e': Fix issue 3007862
| * | | | am 880dfe4f: Merge "Fix issue 3007862" into gingerbreadEric Laurent2010-09-241-40/+49
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp * commit '880dfe4f675128188f8d598f2025a417ccabd1bf': Fix issue 3007862
| | * | | Merge "Fix issue 3007862" into gingerbreadEric Laurent2010-09-241-40/+49
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix issue 3007862Eric Laurent2010-09-241-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed a cross deadlock condition between audioflinger and audio policy service mutexes. Audioflinger::createEffect() locks audioflinger mutex and then calls AudioSystem::getOutputForEffect() which ends up in AudioPolicyService::getOutputForEffect() which locks audio policy service mutex. If at the same time, the command thread in audio policy service is processing a command(set volume, set route...), the mutex is locked and the command will call one audioflinger method which in turn will attempt to lock audioflinger mutex. The fix consists in releasing audioflinger mutex before calling getOutputForEffect(). Change-Id: Id44e7feb36e0a295731f6aa97cf32d022edd34d0
* | | | | am 19fe783d: am 37155854: Merge "Proper sync-frame detection for sources ↵Andreas Huber2010-09-241-12/+105
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that don\'t already provide it." into gingerbread Merge commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839' * commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839': Proper sync-frame detection for sources that don't already provide it.
| * | | | am 37155854: Merge "Proper sync-frame detection for sources that don\'t ↵Andreas Huber2010-09-241-12/+105
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already provide it." into gingerbread Merge commit '37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp * commit '37155854b4d9ca405e5c41c4ab271006a4716193': Proper sync-frame detection for sources that don't already provide it.
| | * | | Proper sync-frame detection for sources that don't already provide it.Andreas Huber2010-09-231-12/+105
| | |/ / | | | | | | | | | | | | Change-Id: Iafeee847b015c5cf6bec6dd5fac22a8d3e8cb78e
* | | | Merge changes Ie8bd9107,I1065179aMike Lockwood2010-09-231-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MTP: Reenable GetObjectPropValue and SetObjectPropValue MTP: Minor debug output cleanup
| * | | | MTP: Reenable GetObjectPropValue and SetObjectPropValueMike Lockwood2010-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows no longer chokes now that we implement the minimum set of properties BUG: 2869730 Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | | MTP: Minor debug output cleanupMike Lockwood2010-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1065179aa64f43c7d8067ccda249319a016840ab Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge changes I75c4c7dc,Ie9f3dea3Mike Lockwood2010-09-232-11/+15
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | * changes: MTP: List all the formats we support in addition to FORMAT_UNDEFINED MTP: Fix problems with signed ints in MtpCursor.cpp
| * | | MTP: Fix problems with signed ints in MtpCursor.cppMike Lockwood2010-09-232-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 2978335 Change-Id: Ie9f3dea3b88b00a555e1ca3232f196e83ee7a6da Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte ↵Andreas Huber2010-09-231-1/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread Merge commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33' * commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33': Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
| * | | am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte ↵Andreas Huber2010-09-231-1/+9
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the ↵Andreas Huber2010-09-231-1/+9
| | |\ \ | | | | | | | | | | | | | | | codec specific data 'avcC' accordingly." into gingerbread
| | | * | Depending on our preference to write 2-byte or 4-byte NALs, patch the codec ↵Andreas Huber2010-09-231-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specific data 'avcC' accordingly. Change-Id: I1423923fafbcac6911218277e2bbfa068e49dcc6
* | | | | am 693a430c: am 903fc221: Ignore errors from correction parameter query and ↵James Dong2010-09-231-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config for M4v and H263 encoders Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde' * commit '693a430cff3c9fac503b5005e9fd5419611eddde': Ignore errors from correction parameter query and config for M4v and H263 encoders
| * | | | am 903fc221: Ignore errors from correction parameter query and config for ↵James Dong2010-09-231-2/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Ignore errors from correction parameter query and config for M4v and H263 ↵James Dong2010-09-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoders This feature is not essential for camcorder application Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
* | | | | am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from ↵James Dong2010-09-231-4/+4
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | M4V and H263 video encoders" into gingerbread Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae' * commit '30c7e132171edf41a787d6e29d169ac467f6f1ae': Use the advertised profile and level from M4V and H263 video encoders
| * | | am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 ↵James Dong2010-09-231-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Use the advertised profile and level from M4V and H263 video encodersJames Dong2010-09-221-4/+4
| | |/ | | | | | | | | | | | | | | | This is already the case for AVC video encoder Change-Id: I9cc97a03ab457b4bd0b21832c09f6d0aa7f5fc39
* | | am 11746caa: am 08959c63: Merge "Request permission for global audio ↵Eric Laurent2010-09-221-14/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | effects." into gingerbread Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc' * commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc': Request permission for global audio effects.
| * | am 08959c63: Merge "Request permission for global audio effects." into ↵Eric Laurent2010-09-221-14/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp * commit '08959c6396b8a52194554f961ae8fd874c994e4e': Request permission for global audio effects.
| | * Request permission for global audio effects.Eric Laurent2010-09-221-14/+18
| | | | | | | | | | | | | | | | | | | | | Applications creating an audio effect on the output mix must have the MODIFY_AUDIO_SETTINGS permission. Change-Id: I57d88533f91ad0d33680107d79abcec28f7263b5
* | | am 2de0a50a: am a72bb404: Merge "Raise the amount of memory set aside for ↵Andreas Huber2010-09-220-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread Merge commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1' * commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1': Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
| * | am a72bb404: Merge "Raise the amount of memory set aside for omx buffer ↵Andreas Huber2010-09-221-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| | * Raise the amount of memory set aside for omx buffer allocations in the test ↵Andreas Huber2010-09-221-1/+1
| | | | | | | | | | | | | | | | | | harness to accomodate the new requirements of some codecs. Change-Id: I73974a336852974e2fb95a9626c1a96f296449eb
* | | am cc6b941c: am 4374b23d: Merge "Make sure we drain the avc software ↵Andreas Huber2010-09-220-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | decoder\'s output queue once we run out of input data." into gingerbread Merge commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e' * commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e': Make sure we drain the avc software decoder's output queue once we run out of input data.
| * | am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output ↵Andreas Huber2010-09-222-43/+55
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| | * Make sure we drain the avc software decoder's output queue once we run out ↵Andreas Huber2010-09-222-43/+55
| | | | | | | | | | | | | | | | | | of input data. Change-Id: I3d92ebae4951b618a6dfcf42936cc4c63d4de539
* | | Merge "Raise the amount of memory set aside for omx buffer allocations in ↵Andreas Huber2010-09-221-1/+1
|\ \ \ | | | | | | | | | | | | the test harness to accomodate the new requirements of some codecs." into gingerbread
| * | | Raise the amount of memory set aside for omx buffer allocations in the test ↵Andreas Huber2010-09-221-1/+1
| | |/ | |/| | | | | | | | | | | | | harness to accomodate the new requirements of some codecs. Change-Id: I0650af10acb3097e9f03c6079992305540b6bc86
* | | Merge "Make sure we drain the avc software decoder's output queue once we ↵Andreas Huber2010-09-222-43/+55
|\ \ \ | | | | | | | | | | | | run out of input data." into gingerbread
| * | | Make sure we drain the avc software decoder's output queue once we run out ↵Andreas Huber2010-09-222-43/+55
| |/ / | | | | | | | | | | | | | | | of input data. Change-Id: I5de540675a64ac0b170eee10691d77a647950397
* | | am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbreadEric Laurent2010-09-211-2/+20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '6943b94b8f267c83060946bae0961efc30444dee' * commit '6943b94b8f267c83060946bae0961efc30444dee': Fix issue 2913071.
| * | am a6dc4699: Merge "Fix issue 2913071." into gingerbreadEric Laurent2010-09-211-2/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp * commit 'a6dc4699222a484222d1c54d5319f302a02e406b': Fix issue 2913071.
| | * Merge "Fix issue 2913071." into gingerbreadEric Laurent2010-09-211-2/+20
| | |\
| | | * Fix issue 2913071.Eric Laurent2010-09-211-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into ↵Andreas Huber2010-09-211-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1' * commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1': This log message is codec specific.
generated by cgit v1.1 at 2024-06-29 15:45:38 +0000