zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access UIApplication on main thread

Browse Source 
Track UIApplication applicationState changes from a C++ class. Uses
NSNotificationCenter to access changes on the main thread and exposes
a local variable that can be checked from any thread.

This fixes a runtime warning on iOS 11 beta.

My Objective-C++ is a little rusty so please check if this follows
the conventions for C++ code in the project. It also changes the
interface exposed by RTCUIApplication.h, not sure if that has impact
on any public APIs that needs to be documented somewhere?

Bug: webrtc:7773
Change-Id: I9c8ba090ef9f28d812114026a906cef742192c39
Reviewed-on: https://chromium-review.googlesource.com/527442
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Kári Tristan Helgason <kthelgason@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18558}
This commit is contained in:
Anders Carlsson
2017-06-12 14:16:20 +02:00
committed by Commit Bot
parent 5b383c0ebd
commit fc309750a9
7 changed files with 99 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/sdk/objc/Framework/Classes/VideoToolbox/decoder.mm
View File

@ -13,9 +13,6 @@
#include <memory>
#if defined(WEBRTC_IOS)
#include "Common/RTCUIApplication.h"
#endif
#include "libyuv/convert.h"
#include "webrtc/api/video/video_frame.h"
#include "webrtc/base/checks.h"
@ -24,6 +21,10 @@
#include "webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
#if defined(WEBRTC_IOS)
#import "Common/RTCUIApplicationStatusObserver.h"
#endif
namespace webrtc {
namespace {
@ -74,9 +75,7 @@ void VTDecompressionOutputCallback(void* decoder,
} // namespace
H264VideoToolboxDecoder::H264VideoToolboxDecoder()
: callback_(nullptr),
video_format_(nullptr),
decompression_session_(nullptr) {}
: callback_(nullptr), video_format_(nullptr), decompression_session_(nullptr) {}
H264VideoToolboxDecoder::~H264VideoToolboxDecoder() {
DestroyDecompressionSession();
@ -97,7 +96,7 @@ int H264VideoToolboxDecoder::Decode(
RTC_DCHECK(input_image._buffer);
#if defined(WEBRTC_IOS)
if (!RTCIsUIApplicationActive()) {
if (![[RTCUIApplicationStatusObserver sharedInstance] isApplicationActive]) {
// Ignore all decode requests when app isn't active. In this state, the
// hardware decoder has been invalidated by the OS.
// Reset video format so that we won't process frames until the next

4
webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.mm
View File

@ -16,8 +16,8 @@
#include <vector>
#if defined(WEBRTC_IOS)
#import "Common/RTCUIApplicationStatusObserver.h"
#import "WebRTC/UIDevice+RTCDevice.h"
#include "Common/RTCUIApplication.h"
#endif
#include "libyuv/convert_from.h"
#include "webrtc/base/checks.h"
@ -386,7 +386,7 @@ int H264VideoToolboxEncoder::Encode(
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
#if defined(WEBRTC_IOS)
if (!RTCIsUIApplicationActive()) {
if (![[RTCUIApplicationStatusObserver sharedInstance] isApplicationActive]) {
// Ignore all encode requests when app isn't active. In this state, the
// hardware encoder has been invalidated by the OS.
return WEBRTC_VIDEO_CODEC_OK;

31
webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.cc → webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm
View File

@ -28,8 +28,7 @@ bool IsHighProfileEnabled() {
// VideoToolboxVideoEncoderFactory
VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() {
}
VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() {}
VideoToolboxVideoEncoderFactory::~VideoToolboxVideoEncoderFactory() {}
@ -43,14 +42,12 @@ VideoEncoder* VideoToolboxVideoEncoderFactory::CreateVideoEncoder(
return nullptr;
}
void VideoToolboxVideoEncoderFactory::DestroyVideoEncoder(
VideoEncoder* encoder) {
void VideoToolboxVideoEncoderFactory::DestroyVideoEncoder(VideoEncoder* encoder) {
delete encoder;
encoder = nullptr;
}
const std::vector<cricket::VideoCodec>&
VideoToolboxVideoEncoderFactory::supported_codecs() const {
const std::vector<cricket::VideoCodec>& VideoToolboxVideoEncoderFactory::supported_codecs() const {
supported_codecs_.clear();
// TODO(magjed): Enumerate actual level instead of using hardcoded level 3.1.
@ -59,22 +56,18 @@ VideoToolboxVideoEncoderFactory::supported_codecs() const {
if (IsHighProfileEnabled()) {
cricket::VideoCodec constrained_high(cricket::kH264CodecName);
const H264::ProfileLevelId constrained_high_profile(
H264::kProfileConstrainedHigh, level);
constrained_high.SetParam(
cricket::kH264FmtpProfileLevelId,
*H264::ProfileLevelIdToString(constrained_high_profile));
const H264::ProfileLevelId constrained_high_profile(H264::kProfileConstrainedHigh, level);
constrained_high.SetParam(cricket::kH264FmtpProfileLevelId,
*H264::ProfileLevelIdToString(constrained_high_profile));
constrained_high.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1");
constrained_high.SetParam(cricket::kH264FmtpPacketizationMode, "1");
supported_codecs_.push_back(constrained_high);
}
cricket::VideoCodec constrained_baseline(cricket::kH264CodecName);
const H264::ProfileLevelId constrained_baseline_profile(
H264::kProfileConstrainedBaseline, level);
constrained_baseline.SetParam(
cricket::kH264FmtpProfileLevelId,
*H264::ProfileLevelIdToString(constrained_baseline_profile));
const H264::ProfileLevelId constrained_baseline_profile(H264::kProfileConstrainedBaseline, level);
constrained_baseline.SetParam(cricket::kH264FmtpProfileLevelId,
*H264::ProfileLevelIdToString(constrained_baseline_profile));
constrained_baseline.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1");
constrained_baseline.SetParam(cricket::kH264FmtpPacketizationMode, "1");
supported_codecs_.push_back(constrained_baseline);
@ -90,8 +83,7 @@ VideoToolboxVideoDecoderFactory::VideoToolboxVideoDecoderFactory() {
VideoToolboxVideoDecoderFactory::~VideoToolboxVideoDecoderFactory() {}
VideoDecoder* VideoToolboxVideoDecoderFactory::CreateVideoDecoder(
VideoCodecType type) {
VideoDecoder* VideoToolboxVideoDecoderFactory::CreateVideoDecoder(VideoCodecType type) {
const rtc::Optional<const char*> codec_name = CodecTypeToPayloadName(type);
if (!codec_name) {
LOG(LS_ERROR) << "Invalid codec type: " << type;
@ -106,8 +98,7 @@ VideoDecoder* VideoToolboxVideoDecoderFactory::CreateVideoDecoder(
return nullptr;
}
void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder(
VideoDecoder* decoder) {
void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder(VideoDecoder* decoder) {
delete decoder;
decoder = nullptr;
}