summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* Remove filename based writer constructorsMarco Nelissen2014-12-105-5/+50
| | | | | | | MediaPlayerService can't open files (it needs an already opened file descriptor), so these were just wasting space. Change-Id: I323044a6c1814a7bff952ed71b5c7792df2abf03
* Clean up makefile to fix build.Dan Albert2014-12-021-6/+10
| | | | | | | | | | | | mediafilter was defining LOCAL_NDK_STL_VARIANT, but never setting LOCAL_SDK_VERSION, so it was a no-op. Since the project was still manually setting the stlport include path, it was getting the stlport headers with precedence over libc++, which breaks the world. Once that is fixed, the project has never linked libRScpp, which is required (I'm not sure how this part has ever worked). Change-Id: Iac70c86bc150eea08329812c0d5744434318d28e
* am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-1/+2
|\ | | | | | | | | * commit 'd0e12a161471823d1ab269cb608be3f3b0a71ed1': C++11 compatibility.
| * am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-1/+2
| |\ | | | | | | | | | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| | * C++11 compatibility.Dan Albert2014-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | | am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '8c5ee61a057e3b87e8f0800b284642bf3b107fd0': Fix struct vs. class mismatches
| * | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-171-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b': Fix struct vs. class mismatches
| | * Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to ↵Dan Stoza2014-11-074-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | onFrameAvailable" into lmp-mr1-dev * commit 'f8d051fee37b1a0734e4142072d3053fed8df161': Add a BufferItem parameter to onFrameAvailable
| * | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-044-4/+4
| |/ | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | stagefright test: MediaFilter native testDavid Smith2014-09-115-0/+927
| | | | | | | | | | Bug: 17203044 Change-Id: I16e30e04a5a1b6ed483b2d43de7c24cc0695485a
* | stagefright test: add surface playback flags -R,TDavid Smith2014-07-161-10/+39
|/ | | | | | | -R renders video output to the surface ASAP -T renders video output to the surface using frame timestamps Change-Id: I232f19587036edc12e86b4f1dea4d12accef3834
* stagefright: update ACodec to use CodecBase enumerations directlyLajos Molnar2014-07-071-14/+8
| | | | | Bug: 11784825 Change-Id: I9f322b78b52bfcc5040fda951486df4354cdba4f
* GLConsumer: Stop using default constructor paramsDan Stoza2014-06-243-3/+5
| | | | | | | | Removes the dependency on default constructor parameters for GLConsumer so that a different constructor prototype can safely be added. Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
* screenrecord: 64-bit compile warningsMark Salyzyn2014-06-193-20/+22
| | | | Change-Id: I708e48e24719b2c4bb023069164aafd4c2ad639b
* Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | | | Bug: 14298175 Change-Id: Iff6940aba8accfec14e729d53b71d2ed7e6c5027
* am 4b7c5444: am e32106fd: screenrecord: Add raw frames output formatBenoit Goby2014-05-143-17/+24
|\ | | | | | | | | * commit '4b7c5444f8af79f1f3e04e09bd03b84dec26facf': screenrecord: Add raw frames output format
| * am e32106fd: screenrecord: Add raw frames output formatBenoit Goby2014-05-143-17/+24
| |\ | | | | | | | | | | | | * commit 'e32106fd5175afdf939ae397aece9caf378a4912': screenrecord: Add raw frames output format
| | * screenrecord: Add raw frames output formatBenoit Goby2014-05-133-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works like the frames output format but without a header so that the output can be piped directly to mplayer: adb shell screenrecord --output-format=raw-frames - | mplayer -demuxer rawvideo -rawvideo w=320:h=240:format=rgb24 - Change-Id: Ib5ed508fdca3a5d63e973c5189b3677c2d92b43f
| * | am 21bde57f: Add frame dump outputAndy McFadden2014-05-128-87/+512
| |\ \ | | |/ | | | | | | | | | * commit '21bde57f0099fed5cca78d9357571dc015a63227': Add frame dump output
| | * Add frame dump outputAndy McFadden2014-05-128-87/+512
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to dump frames as RGB data with a minimal frame header. Only recommended for devices with small displays. Enable with "--output-format=frames". The "--raw" option is now selected with "--output-format=h264". Change-Id: I18d3d4a87cd056d7acf0658985a90dc5895dbfb6
| * | am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
| |\ \ | | |/ | | | | | | | | | * commit '2d11a2031b99db9b503a7ad7efd1f18606af4012': Provide raw H.264 output from screenrecord
| | * Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an experimental (undocumented) "--raw" flag. If set, we output an H.264 byte stream rather than a .mp4 file. If the filename is "-", we send the output to stdout. If stdout is a tty, we reconfigure it to avoid CRLF line termination over adb. Change-Id: I5193f6193c9c1a59f92eefad0ed399f24afbf6de
* | | Remove warnings in recordvideoAndy Hung2014-05-051-5/+9
| | | | | | | | | | | | | | | Change-Id: I2ed72836210fd3a02c7bceeb5fccadf8dcb92fbc Signed-off-by: Andy Hung <hunga@google.com>
* | | Fix audioloop test programAndy Hung2014-05-051-62/+108
| | | | | | | | | | | | | | | Change-Id: Ic31966095d719cf2b33322675d7d0a2e6a203268 Signed-off-by: Andy Hung <hunga@google.com>
* | | am 3c782246: am b1d2b51c: am 761636f3: Merge "Do not force all command-line ↵Glenn Kasten2014-04-302-18/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | apps to be 32-bit only" * commit '3c782246d5ee9869f2167a00df748eac1b9e9153': Do not force all command-line apps to be 32-bit only
| * | Do not force all command-line apps to be 32-bit onlyGlenn Kasten2014-04-302-18/+0
| | | | | | | | | | | | | | | | | | | | | This is a partial revert of >Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3 Change-Id: I214e1bd117dd40150ac5f7447f12c72c61f09a2f
* | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-9/+7
|\ \ \ | |/ / | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| * | media: 64 bit compile issuesMark Salyzyn2014-04-151-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | - change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
* | | Remove deprecated BufferQueue constructorDan Stoza2014-04-071-3/+5
| | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I16e874c376d2f84d270f6a8c733618719cf49901
* | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-184-14/+13
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-124-14/+13
| | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I7d98eb8e9201fd920552e7eab75da42a5e2c7dca
* | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-142-0/+18
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-122-0/+18
| | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | | Fix destructorsAndy McFadden2014-03-032-4/+8
| | | | | | | | | | | | | | | | | | | | | Make destructors private -- only RefBase should be able to destroy instances of these. Change-Id: Iff52e226995fe5740a9dfc35af53dd6dd9d74501
* | | Add frame dump outputAndy McFadden2014-02-268-87/+512
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to dump frames as RGB data with a minimal frame header. Only recommended for devices with small displays. Enable with "--output-format=frames". The "--raw" option is now selected with "--output-format=h264". Bug 13140019 Change-Id: I61bee55cea97db3134a91e7ea06106783e5bf340
* | | fix the build by fixing more warnings.Andreas Huber2014-02-112-3/+3
| | | | | | | | | | | | Change-Id: Ied0ec39eb83b101582702d1e30c21643ccf6353e
* | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-115-22/+29
|\ \ \ | |/ / | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-115-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
| * | frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
| |/ | | | | | | | | Bug: 12798969 Change-Id: I2db14a7ee28db2449ec6e2384ade21944284528d
| * Fix the help textAndy McFadden2013-12-111-2/+2
| | | | | | | | | | | | | | | | Pesky bloggers. (cherry-pick from Ia8677b054423db292a34e28337431b57804df259) Change-Id: Ia684fde52697ea78fca79de958ef8b31a50e68ba
| * screenrecord fixesAndy McFadden2013-12-115-12/+32
| | | | | | | | | | | | | | | | Fixes to issues identified during code review. (cherry-pick from I2203694acb5c0544878f64f4347d29ad1a0725c4) Change-Id: I58fcb5264fc17b26fac4b03f95d35262e9e199e2
| * Add "--bugreport" option to screenrecordAndy McFadden2013-12-1112-99/+8473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --bugreport option adds two visible features: (1) a timestamp overlay that (mostly) matches logcat, making it easier to match what appears in the video with what's in the log, and (2) an "info page" at the start of the video that shows the system configuration. Enabling this option adds an additional composition step, increasing the overhead of screenrecord. Depending on the device and circumstances, this may be unnoticeable or very pronounced. If --bugreport is not enabled, the overhead of screenrecord is unchanged. We also now track device orientation changes. This is currently detected by polling surfaceflinger, which is suboptimal. As a result, we detect the rotation too late, and get a weird mixed frame before the start of the animation for 90-degree changes. Also, allow the bit rate to be specified as e.g. "4M" for 4Mbps. Also, --rotate is now deprecated. Bug 11220305 Bug 11136964 (cherry pick from Ibb94b81d2f73547b95d7a47e027da75fab187a4f) Change-Id: I829a91aaca5ab82a07c14172d9e188ec38f14e57
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-046-6/+18
| | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
| | | | | | | | | | | | | | | | Bug: 12798969 (cherry picked from commit 3a38388447c54683fc0018bde284d4d22cb111a9) Change-Id: I6fdf6a45756a53f554bfc78504e37a40386aebab
* | Provide raw H.264 output from screenrecordAndy McFadden2014-01-072-39/+116
| | | | | | | | | | | | | | | | | | | | | | | | This adds an experimental (undocumented) "--raw" flag. If set, we output an H.264 byte stream rather than a .mp4 file. If the filename is "-", we send the output to stdout. If stdout is a tty, we reconfigure it to avoid CRLF line termination over adb. Bug 12239887 Change-Id: I00ceb628bd885916eaf4658ea7f08f620ad74c03
* | Print statistics after ctrl-CMarco Nelissen2013-12-051-16/+43
| | | | | | | | | | And exit cleanly when no audio or video track is found. Change-Id: I3e030d60c774ad3ede839cba999ab32dd86bab5a
* | Fix the help textAndy McFadden2013-11-191-2/+2
| | | | | | | | | | | | Pesky bloggers. Change-Id: Ia8677b054423db292a34e28337431b57804df259
* | screenrecord fixesAndy McFadden2013-11-195-12/+32
| | | | | | | | | | | | Fixes to issues identified during code review. Change-Id: I2203694acb5c0544878f64f4347d29ad1a0725c4