1d82813961
Reland "Fix CVO in androidvideocapturer".
...
This cl was originally revieved in https://webrtc-codereview.appspot.com/40759004/
Patchset 2 adds a unittest for VideoFrame::Reset with and without the apply_rotation flag set.
BUG=4145
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42559004
Cr-Commit-Position: refs/heads/master@{#8564}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8564 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-03-03 06:44:40 +00:00
73acc15c69
Revert 8538 "Reland "Fix CVO in androidvideocapturer."""
...
> Reland "Fix CVO in androidvideocapturer.""
> This reverts commit b8bcf8cbbf84971e2ae26d91659afdc58617b054.
> after I fixed a rebase mistake. The fix is the delta between patchset 1 and 2.
>
> The original cl was reviewed here:
> https://webrtc-codereview.appspot.com/40759004/
>
> TBR=magjed@webrtc.org
>
> BUG=4145
>
> Review URL: https://webrtc-codereview.appspot.com/45409004
TBR=perkj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/44439004
Cr-Commit-Position: refs/heads/master@{#8539}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8539 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-27 23:27:41 +00:00
3a93e33c56
Reland "Fix CVO in androidvideocapturer.""
...
This reverts commit b8bcf8cbbf84971e2ae26d91659afdc58617b054.
after I fixed a rebase mistake. The fix is the delta between patchset 1 and 2.
The original cl was reviewed here:
https://webrtc-codereview.appspot.com/40759004/
TBR=magjed@webrtc.org
BUG=4145
Review URL: https://webrtc-codereview.appspot.com/45409004
Cr-Commit-Position: refs/heads/master@{#8538}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8538 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-27 20:19:16 +00:00
b8bcf8cbbf
Revert "Fix CVO in androidvideocapturer."
...
This reverts commit 02ed57bf9d12a959d5ec139b3fc49170d16b5f30.
https://webrtc-codereview.appspot.com/40759004/
Reason- breaks tests after rebase.
TBR=magjed@webrtc.org
BUG=4145
Review URL: https://webrtc-codereview.appspot.com/39349004
Cr-Commit-Position: refs/heads/master@{#8537}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8537 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-27 19:48:15 +00:00
02ed57bf9d
Fix CVO in androidvideocapturer.
...
This add bool apply_rotation to WebrtcVideoFrame::Init and removes the need for WebrtcVideoFrame::SetRotation.
BUG=4145
R=guoweis@webrtc.org , pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40759004
Cr-Commit-Position: refs/heads/master@{#8536}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8536 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-27 19:10:45 +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
2ad3bb17a7
Reland patch for Switch default color format to YV12 on Android.
...
The new since the previous patch is that we ignore all resolutions with width % 16 != 0
since they are not tightly packed.
http://developer.android.com/reference/android/graphics/ImageFormat.html#YV12
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36269004
Cr-Commit-Position: refs/heads/master@{#8459}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8459 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-23 11:15:23 +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
8fbdcfd73f
Revert "Switch default color format to YV12."
...
This reverts commit 1c3e728aa9b886fd3ee008a5aed956759bc3f82d.
Reason: Fails test running on Nexus 9 bots - org.webrtc.VideoCapturerAndroidTest#testStartStopWithDifferentResolutions.
Note that all other tests pass so it seems like there is resolution supported by the device that can't use YV12.
TBR=glaznev@webrtc.org
BUG=4011
Review URL: https://webrtc-codereview.appspot.com/42389004
Cr-Commit-Position: refs/heads/master@{#8414}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8414 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-18 15:20:14 +00:00
1c3e728aa9
Switch default color format to YV12.
...
Currently N21 is used per default. But according to
http://developer.android.com/reference/android/graphics/ImageFormat.html#YV12
YV12 has been mandatory to support since api level 12.
Since YV12 and I420 is the same except for the order of planes, this format is cheaper to use.
Tested on N5, N6 and a Samsung device.
BUG=4011
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40749004
Cr-Commit-Position: refs/heads/master@{#8411}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8411 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-18 13:16:46 +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