summaryrefslogtreecommitdiffstats
path: root/cmds/stagefright/muxer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-1/+2
|\ | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add the presentation rotation supportztenghui2013-03-151-3/+12
| | | | | | | | | | | | bug:7991013 Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
| * Clean up the native code to match Java updateztenghui2013-03-081-1/+2
| | | | | | | | | | | | | | | | | | 1. Add flags to match the java side change. 2. Update the interface. bug:7991013 Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
| * Add a test utility for MediaMuxer.ztenghui2013-02-131-0/+295
| | | | | | | | | | | This test/utility copy samples from one video and mux into another video. It support trimming, cutting audio or video track. It can run simply as command line like: adb shell muxer -a -v -s 1000 -e 8000 "/sdcard/DCIM/Camera/VID_*.mp4" bug:7991013 Change-Id: I8a2eeff3cabd001b6b2a7062d991dd076edbf22e
* FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-1/+2
| | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* Add the presentation rotation supportztenghui2013-03-151-3/+12
| | | | | | bug:7991013 Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
* Clean up the native code to match Java updateztenghui2013-03-081-1/+2
| | | | | | | | | 1. Add flags to match the java side change. 2. Update the interface. bug:7991013 Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
* Add a test utility for MediaMuxer.ztenghui2013-02-131-0/+295
This test/utility copy samples from one video and mux into another video. It support trimming, cutting audio or video track. It can run simply as command line like: adb shell muxer -a -v -s 1000 -e 8000 "/sdcard/DCIM/Camera/VID_*.mp4" bug:7991013 Change-Id: I8a2eeff3cabd001b6b2a7062d991dd076edbf22e
generated by cgit v1.1 at 2024-05-17 04:02:15 +0000