summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* am f553a584: am 5921fb51: Merge change I91eb0354 into eclair-mr2Andreas Huber2009-12-072-4/+4
|\ | | | | | | | | | | | | Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573' * commit 'f553a58425c66a990dbc5f4579c976a0636fc573': Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
| * Change OMXCodec::Create to return an sp<MediaSource> instead of an ↵Andreas Huber2009-12-072-4/+4
| | | | | | | | sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
* | am ae34cf92: am 781ac162: Merge change I8768f2cc into eclair-mr2Andreas Huber2009-12-013-0/+104
|\ \ | |/ | | | | | | | | | | Merge commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e' * commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e': A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
| * A small sample tool to encode pcm audio data to amr, decode it again and ↵Andreas Huber2009-12-013-0/+104
| | | | | | | | play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
* | am bf72820e: am b292461c: Merge change I305e1b8f into eclair-mr2Doug Zongker2009-12-011-9/+14
|\ \ | |/ | | | | | | | | | | Merge commit 'bf72820e7775748c7239287b49b81031167b3428' * commit 'bf72820e7775748c7239287b49b81031167b3428': add --esn option to am to allow adding extra with a null value
| * add --esn option to am to allow adding extra with a null valueDoug Zongker2009-11-301-9/+14
| |
* | am c92f3bcd: am e11a1b4d: am f817218e: dumpstate: Pick up the last kernel ↵Dima Zavin2009-11-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | log from /proc Merge commit 'c92f3bcd556be6086aabcdcf437cc29c2ac605f6' * commit 'c92f3bcd556be6086aabcdcf437cc29c2ac605f6': dumpstate: Pick up the last kernel log from /proc
| * am f817218e: dumpstate: Pick up the last kernel log from /procDima Zavin2009-11-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'f817218e09a556f20efc81309ba2cdb3475a370b' into eclair-mr2 * commit 'f817218e09a556f20efc81309ba2cdb3475a370b': dumpstate: Pick up the last kernel log from /proc
| | * dumpstate: Pick up the last kernel log from /procDima Zavin2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | This is needed since its no longer copied to /data/dontpanic by init. Change-Id: I5217da73ec470653824b7fb9a31e093e263a8dc9 Signed-off-by: Dima Zavin <dima@android.com>
* | | Encrypted File Systems Project. Installer modifications.Oscar Montemayor2009-11-243-37/+108
| | | | | | | | | | | | Started to modify isntaller for data redirection to a secure location.
* | | am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2Andreas Huber2009-11-232-8/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5493df919b01952857eb3b78fad3fe2cff573935' * commit '5493df919b01952857eb3b78fad3fe2cff573935': Squashed commit of the following:
| * | Squashed commit of the following:Andreas Huber2009-11-232-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1efc38dc3c33fef57b759002db3965ed07a28cb0 Author: Andreas Huber <andih@google.com> Date: Thu Nov 19 14:36:14 2009 -0800 Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed. Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed. commit 51973062eb5ee63fd64b845d72bac517cc3369cf Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 14:01:43 2009 -0800 Fix one more unit test, properly send seek-complete notification only after seek actually completed. commit cb22250b34b1fcfe1bf459723a761fd003950229 Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 12:31:36 2009 -0800 Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails. commit 25eb9241138ddf7bb27ce90657116c5f8a94d880 Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 12:30:40 2009 -0800 Support seeking and duration in AMRExtractor, assuming all frames are the same size. commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 10:21:44 2009 -0800 MediaPlayerImpl is dead, long live AwesomePlayer. commit c5b52d3c0674f5dc94db506afbce52401cceddac Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 09:42:23 2009 -0800 New implementation of the stagefright mediaplayer.
* | | am 26a9a13a: am b2a51667: am 23b3ef82: Merge change I99194df1 into eclairMike Chan2009-11-191-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '26a9a13ac32a9109300e323d26af5865bf5244cc' * commit '26a9a13ac32a9109300e323d26af5865bf5244cc': frameworks: base: dumpstate: Dump kernel cpufreq speeds.
| * | am 23b3ef82: Merge change I99194df1 into eclairMike Chan2009-11-191-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2 * commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7': frameworks: base: dumpstate: Dump kernel cpufreq speeds.
| | * frameworks: base: dumpstate: Dump kernel cpufreq speeds.Mike Chan2009-11-191-0/+2
| | | | | | | | | | | | | | | Change-Id: I99194df1d6c46254affef86ea8eb39e784c3dfb3 Signed-off-by: Mike Chan <mike@android.com>
* | | am d28fcd5b: resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosprepo sync2009-11-181-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e' * commit 'd28fcd5bb8e5734a12b83f7cefde759c009e7b6e': Fixes for proximity sensor behavior:
| * | am 03786b83: Merge change I813fdb7a into eclairMike Lockwood2009-11-181-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2 * commit '03786b83bd02f8dd8e1049d333fbfdee395ac965': Fixes for proximity sensor behavior:
| | * Fixes for proximity sensor behavior:Mike Lockwood2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen. Clear the "waiting for proximity sensor to go negative" state when the power key is pressed. Part of the fix for b/2243198 (Black screen lockup after ending call) Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 7174fcf6: am f9bf75d5: am e2071c6b: Merge change I326e3e29 into eclairIliyan Malchev2009-11-171-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '7174fcf6031234bfc9aa29bf3085d14742cab944' * commit '7174fcf6031234bfc9aa29bf3085d14742cab944': dumpstate: include the contents of the last radio log
| * | am e2071c6b: Merge change I326e3e29 into eclairIliyan Malchev2009-11-161-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'e2071c6b1d68220976d495d917566edf01303680' into eclair-mr2 * commit 'e2071c6b1d68220976d495d917566edf01303680': dumpstate: include the contents of the last radio log
| | * dumpstate: include the contents of the last radio logIliyan Malchev2009-11-151-0/+4
| | | | | | | | | | | | Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | am 45e89568: am d71ab51a: Merge change I3e1bdd38 into eclair-mr2Andreas Huber2009-11-101-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '45e89568b6004db847b9e4057e386aa7db2e764c' * commit '45e89568b6004db847b9e4057e386aa7db2e764c': Transcode files again.
| * | Merge change I3e1bdd38 into eclair-mr2Android (Google) Code Review2009-11-101-1/+3
| |\ \ | | | | | | | | | | | | | | | | * changes: Transcode files again.
| | * | Transcode files again.Andreas Huber2009-11-021-1/+3
| | | |
* | | | am c481990b: am b4488930: am 45dd12cb: Merge change I9f3020db into eclairMathias Agopian2009-11-061-0/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'c481990b630c7ff5bca155f4b1385f71097500d3' * commit 'c481990b630c7ff5bca155f4b1385f71097500d3': fix [2243164] live wallpaper screen artifacts at end of boot
| * | | am 45dd12cb: Merge change I9f3020db into eclairMathias Agopian2009-11-061-0/+15
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-mr2 * commit '45dd12cb0834ea5d72872a6d5b3095f3af152434': fix [2243164] live wallpaper screen artifacts at end of boot
| | * | Merge change I9f3020db into eclairAndroid (Google) Code Review2009-11-061-0/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: fix [2243164] live wallpaper screen artifacts at end of boot
| | | * | fix [2243164] live wallpaper screen artifacts at end of bootMathias Agopian2009-11-061-0/+15
| | | | | | | | | | | | | | | | | | | | make sure to glClear() the areas not touched by the animation
| | * | | DO NOT MERGE: Squashed commit of the following:Andreas Huber2009-11-051-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 12:02:31 2009 -0800 DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback. commit 991832fe4dc012e51d3d9ed8d647c7f09991858f Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:24:11 2009 -0800 DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though. commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb Author: Andreas Huber <andih@google.com> Date: Mon Oct 26 16:11:54 2009 -0700 DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers. commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:10:49 2009 -0800 DO NOT MERGE: Fix heap corruptin in OMXNodeInstance. commit 5a47f7439a1298b330541a7e4e647a8b44487388 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:08:19 2009 -0800 DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec. commit 45bed64722501b9f411a2940aff5aff4cc4d2e98 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:02:23 2009 -0800 DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts. commit 6738e306a50196f31a73d4fc7b7c45faff639903 Author: Andreas Huber <andih@google.com> Date: Thu Oct 15 13:46:54 2009 -0700 DO NOT MERGE: Reimplement the OMX backend for stagefright. Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | | | am 66c25573: am 12bc3af0: Merge change I6f6bf3d8 into eclair-mr2Andreas Huber2009-11-041-8/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '66c2557334d6c8116c874aa65e84b280d325009e' * commit '66c2557334d6c8116c874aa65e84b280d325009e': Support raw audio sources in stagefright commandline tool.
| * | | Support raw audio sources in stagefright commandline tool.Andreas Huber2009-11-031-8/+17
| | |/ | |/|
* | | am 8e5063ca: am 2d05af0c: am 3034624f: Merge change I26a2d829 into eclairEvan Millar2009-10-292-3/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '8e5063ca3af9adadf3cca13fe9b907d4da0a451d' * commit '8e5063ca3af9adadf3cca13fe9b907d4da0a451d': Add -P flag to ps in dumpstate
| * | am 3034624f: Merge change I26a2d829 into eclairEvan Millar2009-10-292-3/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3034624f68d373d7c79237425319b5b7fd84317e' into eclair-mr2 * commit '3034624f68d373d7c79237425319b5b7fd84317e': Add -P flag to ps in dumpstate
| | * Add -P flag to ps in dumpstateEvan Millar2009-10-292-3/+20
| | |
* | | am 5647eebc: am 9dba1f92: Merge change Ib482ce88 into eclair-mr2Andreas Huber2009-10-291-8/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314' * commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314': Revive support for video encoding in OMXCodec.
| * | Revive support for video encoding in OMXCodec.Andreas Huber2009-10-291-8/+31
| | |
* | | am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2Andreas Huber2009-10-231-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af' * commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af': Moving the individual extractor headers files to the private include directory.
| * | Moving the individual extractor headers files to the private include directory.Andreas Huber2009-10-231-3/+3
| | |
* | | am 1705d87b: am bfea1e13: resolved conflicts for merge of f585be7f to eclair-mr2Andreas Huber2009-10-161-4/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1705d87b7e576bcd3bdc670411511376b4e245c5' * commit '1705d87b7e576bcd3bdc670411511376b4e245c5': A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
| * | resolved conflicts for merge of f585be7f to eclair-mr2Andreas Huber2009-10-161-4/+19
| |\ \ | | |/
| | * A few more testcases for the vendor to reproduce issues with their decoder. ↵Andreas Huber2009-10-161-10/+29
| | | | | | | | | | | | Not part of the shipping image.
* | | am 4b9dbdfa: am d96f6e85: Merge change I8176f35e into eclair-mr2Andreas Huber2009-10-161-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a' * commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a': Reimplement the OMX backend for stagefright.
| * | Reimplement the OMX backend for stagefright.Andreas Huber2009-10-161-3/+3
| | | | | | | | | | | | | | | | | | Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | | am 9550e289: am cfd55579: OMXCodec now notifies the reader of changes in the ↵Andreas Huber2009-10-131-1/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | output format by returning a special result/error code. Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e' * commit '9550e2892f88194c9abbb85616bb55db67231d6e': OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
| * | OMXCodec now notifies the reader of changes in the output format by ↵Andreas Huber2009-10-131-1/+12
| | | | | | | | | | | | returning a special result/error code.
* | | am c55bb59e: am ef703f60: Merge change I98276091 into eclair-mr2Andreas Huber2009-10-132-8/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7' * commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7': Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
| * | Change to a int64_t usecs representation for timestamps and duration ↵Andreas Huber2009-10-122-8/+6
| |/ | | | | | | throughout stagefright.
* | am 94f3a363: Merge branch \'eclair-plus-aosp\' of ↵Eric Fischer2009-10-131-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c' * commit '94f3a36326ddecaa09787d795451b0a229fe111c': Remove STOPSHIP BT logging. BT API security audit: fix a couple of permission mistakes. Fix issue #2175693: Add vmallocinfo to dumpstate add a way to easily catch and log GL errors (compile time flag) GPS: Fix problem with SUPL when SUPL APN is already active. Import revised translations. DO NOT MERGE Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device. Import revised translations. DO NOT MERGE
| * Fix issue #2175693: Add vmallocinfo to dumpstateDianne Hackborn2009-10-081-0/+2
| | | | | | | | Change-Id: I88c6e2679919e56f581fcf79dbe683393dd8ce27
* | am 3c5600ec: Merge branch \'eclair-plus-aosp\' of ↵Marc Blank2009-10-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp Merge commit '3c5600ecccd38d8fb6d39330f31fe91b5f99481b' * commit '3c5600ecccd38d8fb6d39330f31fe91b5f99481b': dumpstate: 'RAMCONSOLE' -> 'LAST KMSG' Only dismiss search dialog after launching intent.