| 1d6fa7af1288b550faabe4ec2cf98684236723db |
|
11-Feb-2014 |
Narayan Kamath <narayan@google.com> |
resolved conflicts for merge of 566be7c3 to master
Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
|
| 377b2ec9a2885f9b6405b07ba900a9e3f4349c38 |
|
03-Feb-2014 |
Kévin PETIT <kevin.petit@arm.com> |
Make frameworks/av 64-bit compatible
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/cmds/stagefright/muxer.cpp
|
| 1b86fe063badb5f28c467ade39be0f4008688947 |
|
29-Jan-2014 |
Andreas Huber <andih@google.com> |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
/frameworks/av/cmds/stagefright/muxer.cpp
|
| 11287471298193ff51ffb429686f5d63a84a621b |
|
12-Mar-2013 |
ztenghui <ztenghui@google.com> |
Add the presentation rotation support
bug:7991013
Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
/frameworks/av/cmds/stagefright/muxer.cpp
|
| e0fb528f8e3bbab04620c8534177168b358e837b |
|
12-Mar-2013 |
ztenghui <ztenghui@google.com> |
Add the presentation rotation support
bug:7991013
Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
/frameworks/av/cmds/stagefright/muxer.cpp
|
| afde4e56566af19b36f1fe5e7aa7f226bf1703dd |
|
22-Feb-2013 |
ztenghui <ztenghui@google.com> |
Clean up the native code to match Java update
1. Add flags to match the java side change.
2. Update the interface.
bug:7991013
Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
/frameworks/av/cmds/stagefright/muxer.cpp
|
| 3db62dfc5102247d415df4667bd9609e669fc022 |
|
22-Feb-2013 |
ztenghui <ztenghui@google.com> |
Clean up the native code to match Java update
1. Add flags to match the java side change.
2. Update the interface.
bug:7991013
Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
/frameworks/av/cmds/stagefright/muxer.cpp
|
| fc9afba35492257e5e80a36b0765ff035908bb6d |
|
08-Feb-2013 |
ztenghui <ztenghui@google.com> |
Add a test utility for MediaMuxer.
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
/frameworks/av/cmds/stagefright/muxer.cpp
|
| 6df48bfe8cccdfec58f5f94be3cf3a2c64697e56 |
|
08-Feb-2013 |
ztenghui <ztenghui@google.com> |
Add a test utility for MediaMuxer.
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
/frameworks/av/cmds/stagefright/muxer.cpp
|