summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
* | 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 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 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.
| * | | am 87d208f7: Merge "This log message is codec specific." into gingerbreadAndreas Huber2010-09-211-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp * commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13': This log message is codec specific.
| | * | Merge "This log message is codec specific." into gingerbreadAndreas Huber2010-09-211-1/+1
| | |\ \
| | | * | This log message is codec specific.Andreas Huber2010-09-211-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I603ae7bd13b186a6df0a26ea9abe073e89276caf
* | | | am af909581: am 67738486: Merge "Remove stagefright foundation\'s ↵Andreas Huber2010-09-2121-435/+298
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | incompatible logging interface and update callsites." into gingerbread Merge commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6' * commit 'af90958184fc5cfa1a4190e28bcfc4fdd4a5bcd6': Remove stagefright foundation's incompatible logging interface and update callsites.
| * | | am 67738486: Merge "Remove stagefright foundation\'s incompatible logging ↵Andreas Huber2010-09-2121-435/+298
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface and update callsites." into gingerbread Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp * commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc': Remove stagefright foundation's incompatible logging interface and update callsites.
| | * | Remove stagefright foundation's incompatible logging interface and update ↵Andreas Huber2010-09-2121-435/+298
| | |/ | | | | | | | | | | | | | | | callsites. Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
* | | am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ ↵James Dong2010-09-212-12/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | related issue" into gingerbread Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193' * commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193': Another attempt for fixing AAC+/eAAC+ related issue
| * | am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" ↵James Dong2010-09-212-12/+59
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp * commit 'e5206694174d2140e662832425665ec3890fcc73': Another attempt for fixing AAC+/eAAC+ related issue
| | * Another attempt for fixing AAC+/eAAC+ related issueJames Dong2010-09-202-12/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | The decoder has to decode the very first two frames (decoder specific data + first data frame) in order to be really sure whether a stream is AAC or AAC+/eAAC+. bug - 2966336 Change-Id: Ib12a07285933df0d6c346370a12f70e99e811881
* | | MTP: Fix typo that resulted in the MTP provider returning thumb format for ↵Mike Lockwood2010-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | object format BUG: 2994234 Change-Id: I99574043d3e0b310b9b7246f89b5b4a1e14fb5a6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey ↵Marco Nelissen2010-09-171-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | script has been triggering." into gingerbread Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c' * commit '5c9f35799422d818f34f814c76c2acd8c939a40c': Add a check to track a problem the monkey script has been triggering.
| * | am f30fae63: Merge "Add a check to track a problem the monkey script has ↵Marco Nelissen2010-09-171-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | been triggering." into gingerbread Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp * commit 'f30fae63389a2216faf55636b95a08f35b5c3620': Add a check to track a problem the monkey script has been triggering.
| | * Add a check to track a problem the monkey script has been triggering.Marco Nelissen2010-09-171-0/+3
| | | | | | | | | | | | Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
* | | am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around ↵Andreas Huber2010-09-172-3/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor. Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8' * commit '7bc600cb08394e60eef984843976d4f79e5d94e8': Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
| * | am f98197a7: Make sure the message dispatcher stays around until after ↵Andreas Huber2010-09-172-3/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor. Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp * commit 'f98197a7274c2d7da647f52b3d8b0c74492139af': Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
| | * Make sure the message dispatcher stays around until after OMX_FreeHandle is ↵Andreas Huber2010-09-172-3/+7
| | | | | | | | | | | | | | | | | | finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor. Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
* | | resolved conflicts for merge of 1fc97385 to masterAndreas Huber2010-09-171-0/+6
|\ \ \ | |/ / | | | | | | Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
generated by cgit v1.1 at 2024-06-29 15:06:08 +0000