3db042e2f0
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
105 lines
3.9 KiB
C++
105 lines
3.9 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;
|
|
|
|
// 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. Called from a Java
|
|
// thread.
|
|
void OnCapturerStarted(bool success);
|
|
|
|
// Called from JNI when a new frame has been captured. Called from a Java
|
|
// thread.
|
|
void OnIncomingFrame(signed char* videoFrame,
|
|
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_
|