c464f504dc
The primary fix in this CL is to remove the dangling |thread_| pointer in AndroidVideoCapturerJni. That thread is not safe to use after Stop() has been called. Even after Stop() has been called, we must still be able to return late frames to Java in order to not leak them, so that path has been made thread safe instead. To make sure that we always return frames, the Java frame should be wrapped in a scoped_refptr as quickly as possible, so this CL moves the wrapping from AndroidVideoCapturer to AndroidVideoCapturerJni. This also removes the need for the interface function AndroidVideoCapturerDelegate::ReturnBuffer(). Some other minor changes are: * Remove |valid_global_refs_| and all logic related to that. Now that rtc::Bind() captures method objects as scoped_refptr, the destructor of AndroidVideoCapturerJni will not be called before all frames are returned. * Remove global ref |j_frame_observer_|. No need for this, we don’t call it and it is kept alive with standard Java memory management. * Add helper function ShallowCenterCrop() for VideoFrameBuffers. This functionality already exists in the constructor of WrappedI420Buffer, but it’s more convenient to have it as a separate function. BUG=webrtc:4742,webrtc:4909 R=glaznev@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1307973002 . Cr-Commit-Position: refs/heads/master@{#9784}
111 lines
4.4 KiB
C++
111 lines
4.4 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_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
|
|
#define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
|
|
|
|
#include <string>
|
|
|
|
#include "talk/app/webrtc/androidvideocapturer.h"
|
|
#include "talk/app/webrtc/java/jni/jni_helpers.h"
|
|
#include "webrtc/base/asyncinvoker.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/thread_checker.h"
|
|
|
|
namespace webrtc_jni {
|
|
|
|
// AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate.
|
|
// The purpose of the delegate is to hide the JNI specifics from the C++ only
|
|
// AndroidVideoCapturer.
|
|
class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
|
public:
|
|
static int SetAndroidObjects(JNIEnv* jni, jobject appliction_context);
|
|
|
|
// Creates a new instance of AndroidVideoCapturerJni. Returns a nullptr if
|
|
// it can't be created. This happens if |device_name| is invalid.
|
|
static rtc::scoped_refptr<AndroidVideoCapturerJni> Create(
|
|
JNIEnv* jni,
|
|
jobject j_video_capture, // Instance of VideoCapturerAndroid
|
|
jstring device_name); // Name of the camera to use.
|
|
|
|
void Start(int width, int height, int framerate,
|
|
webrtc::AndroidVideoCapturer* capturer) override;
|
|
void Stop() override;
|
|
|
|
std::string GetSupportedFormats() override;
|
|
|
|
// Called from VideoCapturerAndroid::NativeObserver on a Java thread.
|
|
void OnCapturerStarted(bool success);
|
|
void OnIncomingFrame(void* video_frame,
|
|
int length,
|
|
int width,
|
|
int height,
|
|
int rotation,
|
|
int64 time_stamp);
|
|
void OnOutputFormatRequest(int width, int height, int fps);
|
|
protected:
|
|
AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer);
|
|
~AndroidVideoCapturerJni();
|
|
|
|
private:
|
|
bool Init(jstring device_name);
|
|
void ReturnBuffer(int64 time_stamp);
|
|
JNIEnv* jni();
|
|
|
|
// Helper function to make safe asynchronous calls to |capturer_|. The calls
|
|
// are not guaranteed to be delivered.
|
|
template <typename... Args>
|
|
void AsyncCapturerInvoke(
|
|
const char* method_name,
|
|
void (webrtc::AndroidVideoCapturer::*method)(Args...),
|
|
Args... args);
|
|
|
|
const ScopedGlobalRef<jobject> j_capturer_global_;
|
|
const ScopedGlobalRef<jclass> j_video_capturer_class_;
|
|
const ScopedGlobalRef<jclass> j_observer_class_;
|
|
|
|
rtc::ThreadChecker thread_checker_;
|
|
|
|
// |capturer| is a guaranteed to be a valid pointer between a call to
|
|
// AndroidVideoCapturerDelegate::Start
|
|
// until AndroidVideoCapturerDelegate::Stop.
|
|
rtc::CriticalSection capturer_lock_;
|
|
webrtc::AndroidVideoCapturer* capturer_ GUARDED_BY(capturer_lock_);
|
|
// |invoker_| is used to communicate with |capturer_| on the thread Start() is
|
|
// called on.
|
|
rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
|
|
|
|
static jobject application_context_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
|
|
};
|
|
|
|
} // namespace webrtc_jni
|
|
|
|
#endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
|