112f127170
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
107 lines
4.0 KiB
C++
107 lines
4.0 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifndef TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
|
|
#define TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "talk/media/base/videocapturer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AndroidVideoCapturer;
|
|
|
|
class AndroidVideoCapturerDelegate {
|
|
public:
|
|
virtual ~AndroidVideoCapturerDelegate() {}
|
|
// Start capturing. The implementation of the delegate must call
|
|
// AndroidVideoCapturer::OnCapturerStarted with the result of this request.
|
|
virtual void Start(int width, int height, int framerate,
|
|
AndroidVideoCapturer* capturer) = 0;
|
|
|
|
// Stops capturing.
|
|
// The delegate may not call into AndroidVideoCapturer after this call.
|
|
virtual void Stop() = 0;
|
|
|
|
// Notify that a frame received in OnIncomingFrame with |time_stamp| has been
|
|
// processed and can be returned.
|
|
virtual void ReturnBuffer(int64 time_stamp) = 0;
|
|
|
|
// Must returns a JSON string "{{width=xxx, height=xxx, framerate = xxx}}"
|
|
virtual std::string GetSupportedFormats() = 0;
|
|
};
|
|
|
|
// Android implementation of cricket::VideoCapturer for use with WebRtc
|
|
// PeerConnection.
|
|
class AndroidVideoCapturer : public cricket::VideoCapturer {
|
|
public:
|
|
explicit AndroidVideoCapturer(
|
|
rtc::scoped_ptr<AndroidVideoCapturerDelegate> delegate);
|
|
virtual ~AndroidVideoCapturer();
|
|
|
|
// Called from JNI when the capturer has been started.
|
|
void OnCapturerStarted(bool success);
|
|
|
|
// Called from JNI when a new frame has been captured.
|
|
void OnIncomingFrame(void* video_frame,
|
|
int length,
|
|
int rotation,
|
|
int64 time_stamp);
|
|
|
|
AndroidVideoCapturerDelegate* delegate() { return delegate_.get(); }
|
|
|
|
private:
|
|
// cricket::VideoCapturer implementation.
|
|
// Video frames will be delivered using
|
|
// cricket::VideoCapturer::SignalFrameCaptured on the thread that calls Start.
|
|
cricket::CaptureState Start(
|
|
const cricket::VideoFormat& capture_format) override;
|
|
void Stop() override;
|
|
bool IsRunning() override;
|
|
bool IsScreencast() const override { return false; }
|
|
bool GetPreferredFourccs(std::vector<uint32>* fourccs) override;
|
|
|
|
bool running_;
|
|
rtc::scoped_ptr<AndroidVideoCapturerDelegate> delegate_;
|
|
|
|
// |worker_thread_| is the thread that calls Start and is used for
|
|
// communication with the Java capturer.
|
|
// Video frames are delivered to cricket::VideoCapturer::SignalFrameCaptured
|
|
// on this thread.
|
|
rtc::Thread* worker_thread_;
|
|
|
|
class FrameFactory;
|
|
FrameFactory* frame_factory_; // Owned by cricket::VideoCapturer.
|
|
|
|
cricket::CaptureState current_state_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
|