840da7b755
Implement Rotation in Android Renderer.
...
Make use of rotation information from the frame and rotate it accordingly when we render the frame.
BUG=4145
R=glaznev@webrtc.org
Committed: https://code.google.com/p/webrtc/source/detail?r=8770
Review URL: https://webrtc-codereview.appspot.com/50369004
Cr-Commit-Position: refs/heads/master@{#8781}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8781 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-18 16:58:49 +00:00
3fffd66dfa
Revert "Implement Rotation in Android Renderer."
...
This reverts commit 835ec63d8a64bbc8a573a5e0b7a09659188122d2.
TBR=guoweis@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/51399004
Cr-Commit-Position: refs/heads/master@{#8771}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8771 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-18 04:20:47 +00:00
835ec63d8a
Implement Rotation in Android Renderer.
...
Make use of rotation information from the frame and rotate it accordingly when we render the frame.
BUG=4145
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/50369004
Cr-Commit-Position: refs/heads/master@{#8770}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8770 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-18 02:44:39 +00:00
eed2fcaa76
Roll chromium_revision 00e438c..8d51d96 (320241:320682)
...
Relevant changes:
* src/third_party/android_tools: fd5a8ec..98a4345
Details: 00e438c..8d51d96 /DEPS
This required updating our Android projects to API level 22,
as third_party/android_tools dropped support for API level 21.
Command used:
perl -pi -e "s/android-21/android-22/g" `find . -name project.properties`
Using 'android update project' would also work but that changes the
ANDROID_SDK_ROOT -> ANDROID_HOME, which the Chromium build toolchain
doesn't set properly when build/android/envsetup.sh is sourced.
Clang version was not updated in this roll.
R=henrika@webrtc.org , perkj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42779004
Cr-Commit-Position: refs/heads/master@{#8728}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8728 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-16 09:00:41 +00:00
00c509ad1c
Add concept of whether video renderer supports rotation.
...
Rotation is best done when rendered in GPU, added the shader code which rotates the frame. For renderers which don't support rotation, the rotation will be done before sending down the frame to render. By default, assume renderer can't do rotation.
Tested with peerconnection_client on windows, AppRTCDemo on Mac.
BUG=4145
R=glaznev@webrtc.org , pthatcher@webrtc.org
Committed: https://code.google.com/p/webrtc/source/detail?r=8660
Committed: https://code.google.com/p/webrtc/source/detail?r=8661
Review URL: https://webrtc-codereview.appspot.com/43569004
Cr-Commit-Position: refs/heads/master@{#8705}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8705 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-12 21:38:19 +00:00
f9a75d99b9
Revert "Add concept of whether video renderer supports rotation."
...
This reverts commit 0ad48935fc5b92be6e10924a9ee3b0dc39c79104.
TBR=guoweis@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/41199004
Cr-Commit-Position: refs/heads/master@{#8663}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8663 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-10 06:37:41 +00:00
0ad48935fc
Add concept of whether video renderer supports rotation.
...
Rotation is best done when rendered in GPU, added the shader code which rotates the frame. For renderers which don't support rotation, the rotation will be done before sending down the frame to render. By default, assume renderer can't do rotation.
BUG=4145
R=glaznev@webrtc.org , pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/43569004
Cr-Commit-Position: refs/heads/master@{#8660}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8660 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-10 02:43:40 +00:00
41d8fda12d
VideoCapturerAndroid allocates direct buffers so that the frame buffers can be used in C++ without a copy. However byte[] array = ByteBuffer.array() seems to point to the beginning of the underlaying buffer and that is what the camera fills. But it turns out that ByteBuffer.arrayOffset() returns an offset and it seems like the pointer returned by jni->GetDirectBufferAddress(j_frame). This cl reverts back to pass the byte[] to c++ and use jni->GetByteArrayElements to get the address of the buffer.
...
R=glaznev@webrtc.org , magjed@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/35349004
Cr-Commit-Position: refs/heads/master@{#8535}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8535 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-27 18:51:18 +00:00
112f127170
Refactor how VideoCapturerAndroid delivers frames and is stopped.
...
With this cl, video buffers are now allocated using direct buffers.
These buffers are guaranteed to live as long as the capturer is running.
We can now post frames in c++ from the Java thread to the c++ worker thread and let c++ post the buffers back when it has finished
processing them.
This cl also reverts back to make Stop asynchronouse so that it is guaranteed that the c++ worker thread is not used and no frames are delivered to VideoCapturerAndroid after Stop completes.
BUG=4318
TESTED= On a N5, N6, N9 and Samsung device.
R=glaznev@webrtc.org , magjed@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/43369004
Cr-Commit-Position: refs/heads/master@{#8493}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8493 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-25 09:20:43 +00:00
3db042e2f0
Stop AndroidVideoCapturer asynchronously.
...
The purpose is to avoid a deadlock between the C++ thread calling Stop and the Java thread that provides video frames.
BUG=4318
R=glaznev@webrtc.org , magjed@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/35249004
Cr-Commit-Position: refs/heads/master@{#8425}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8425 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-19 08:44:17 +00:00
8f605e8911
Add VideoSource::Stop and Restart methods.
...
The purpose is to make sure that start and stop is called on the correct thread on Android. It also cleans up the Java VideoSource implementation.
BUG=4303
R=glaznev@webrtc.org , magjed@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39989004
Cr-Commit-Position: refs/heads/master@{#8389}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8389 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-17 13:54:42 +00:00
83bc721c7e
Add Android specific VideoCapturer.
...
The Java implementation of VideoCapturer is losely based on the the work in webrtc/modules/videocapturer.
The capturer is now started asyncronously.
The capturer supports easy camera switching.
BUG=
R=henrika@webrtc.org , magjed@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/30849004
Cr-Commit-Position: refs/heads/master@{#8329}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8329 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-11 11:27:22 +00:00
5f93d0a140
Update libjingle license statements at top of talk files for consistency
...
BUG=2133
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39559004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8105 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-01-20 21:36:13 +00:00
dea5173edf
Add start bitrate and vp8 hw acceleration option to
...
Android AppRTCDemo.
- Add an option to set VP8 encoder start bitrate
usig x-google-start-bitrate line in remote SDP.
- Allow to enabled/disable VP8 hw decoder and
encoder acceleration using appRTC settings.
BUG=4046
R=jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/32539004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7775 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-01 20:02:13 +00:00
2faf7eea6f
Revert "Revert "This adds an Android apk for running tests on the Java layer of PeerConnection.""
...
This reverts commit 308e7ff61327d64ba5c7761ce6b58cd1fbc4847e.
Original cl description:
This adds an Android apk for running tests on the Java layer of PeerConnection.
The only testcase is currently the same test we run on Java standalone.
To run the test adb shell am instrument -w org.webrtc.test/android.test.InstrumentationTestRunner
BUG=4031
R=kjellander@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/32529004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7748 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-26 07:35:37 +00:00
308e7ff613
Revert "This adds an Android apk for running tests on the Java layer of PeerConnection."
...
This reverts r7732
Reason: Breaks compilation on Linux:
[813/818] LINK libjingle_media_unittest
FAILED: cd ../../talk; build/build_jar.sh /usr/lib/jvm/java-7-openjdk-amd64 ../out/Debug/libjingle_peerconnection_test.jar ../out/Debug/obj/talk/libjingle_peerconnection_test_jar.gen app/webrtc/javatests/src:../out/Debug/libjingle_peerconnection.jar:../third_party/junit/junit-4.11.jar app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java
build/build_jar.sh: Entering directory `/mnt/data/b/build/slave/linux64/build/src/talk'
app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java:46:warning: [deprecation] Assert in junit.framework has been deprecated
import static junit.framework.Assert.*;
^
app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java:36:error: cannot find symbol
@Test
^
symbol: class Test
location: class PeerConnectionTestJava
app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java:43:error: cannot find symbol
@Test
^
symbol: class Test
location: class PeerConnectionTestJava
2 errors
1 warning
ninja: build stopped: subcommand failed.
TBR=perkj@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/32169004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7733 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-23 21:23:00 +00:00
2751f2ab4c
This adds an Android apk for running tests on the Java layer of PeerConnection.
...
The only testcase is currently the same test we run on Java standalone.
To run the test adb shell am instrument -w org.webrtc.test/android.test.InstrumentationTestRunner
R=kjellander@webrtc.org , phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/26219004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7732 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-23 16:00:57 +00:00