webrtc_m130/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

116 lines
4.0 KiB
C++
Raw Normal View History

Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
/*
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h"
#include "webrtc/base/logging.h"
#include "webrtc/common_video/h264/profile_level_id.h"
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
#include "webrtc/media/base/codec.h"
#include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h"
#include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h"
#include "webrtc/system_wrappers/include/field_trial.h"
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
namespace webrtc {
namespace {
const char kHighProfileExperiment[] = "WebRTC-H264HighProfile";
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
bool IsHighProfileEnabled() {
return field_trial::IsEnabled(kHighProfileExperiment);
}
}
// VideoToolboxVideoEncoderFactory
VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() {
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
}
VideoToolboxVideoEncoderFactory::~VideoToolboxVideoEncoderFactory() {}
VideoEncoder* VideoToolboxVideoEncoderFactory::CreateVideoEncoder(
const cricket::VideoCodec& codec) {
if (FindMatchingCodec(supported_codecs_, codec)) {
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
LOG(LS_INFO) << "Creating HW encoder for " << codec.name;
return new H264VideoToolboxEncoder(codec);
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
}
LOG(LS_INFO) << "No HW encoder found for codec " << codec.name;
return nullptr;
}
void VideoToolboxVideoEncoderFactory::DestroyVideoEncoder(
VideoEncoder* encoder) {
delete encoder;
encoder = nullptr;
}
const std::vector<cricket::VideoCodec>&
VideoToolboxVideoEncoderFactory::supported_codecs() const {
supported_codecs_.clear();
// TODO(magjed): Enumerate actual level instead of using hardcoded level 3.1.
// Level 3.1 is 1280x720@30fps which is enough for now.
const H264::Level level = H264::kLevel3_1;
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));
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));
constrained_baseline.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1");
constrained_baseline.SetParam(cricket::kH264FmtpPacketizationMode, "1");
supported_codecs_.push_back(constrained_baseline);
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
return supported_codecs_;
}
// VideoToolboxVideoDecoderFactory
VideoToolboxVideoDecoderFactory::VideoToolboxVideoDecoderFactory() {
supported_codecs_.push_back(cricket::VideoCodec("H264"));
}
VideoToolboxVideoDecoderFactory::~VideoToolboxVideoDecoderFactory() {}
VideoDecoder* VideoToolboxVideoDecoderFactory::CreateVideoDecoder(
VideoCodecType type) {
const rtc::Optional<const char*> codec_name = CodecTypeToPayloadName(type);
if (!codec_name) {
LOG(LS_ERROR) << "Invalid codec type: " << type;
return nullptr;
}
const cricket::VideoCodec codec(*codec_name);
if (FindMatchingCodec(supported_codecs_, codec)) {
Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) Reason for revert: Fix gyp build Original issue's description: > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > Reason for revert: > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > Original issue's description: > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > and all dependency on them has been removed from the rest of WebRTC. > > We now add it as an external encoder via a factory supplied to the > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > closer to what we do on Android for MediaCodec. > > > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > Cr-Commit-Position: refs/heads/master@{#14953} > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > BUG=webrtc:6619 > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > Cr-Commit-Position: refs/heads/master@{#14985} R=magjed@webrtc.org TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619 Review URL: https://codereview.webrtc.org/2487723004 . Cr-Commit-Position: refs/heads/master@{#14992}
2016-11-09 10:43:26 +01:00
LOG(LS_INFO) << "Creating HW decoder for " << codec.name;
return new H264VideoToolboxDecoder();
}
LOG(LS_INFO) << "No HW decoder found for codec " << codec.name;
return nullptr;
}
void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder(
VideoDecoder* decoder) {
delete decoder;
decoder = nullptr;
}
} // namespace webrtc