mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
77eb338ae4
This reverts commitf2d6fe62f2. Reason for revert: Downstream test updated. Original change's description: > Revert "Reland "Distinguish between send and receive video codecs"" > > This reverts commit26e6afe93f. > > Reason for revert: Breaks another downstream test. > > Original change's description: > > Reland "Distinguish between send and receive video codecs" > > > > This reverts commitf22af3cca7. > > > > Reason for revert: Downstream tests have been updated. > > > > Original change's description: > > > Revert "Distinguish between send and receive video codecs" > > > > > > This reverts commit18314bd8d2. > > > > > > Reason for revert: Breaks downstream test. > > > > > > Original change's description: > > > > Distinguish between send and receive video codecs > > > > > > > > Even though send and receive codecs are the same, > > > > they might have different support in HW. > > > > Distinguish between send and receive codecs to be able to keep > > > > track of which codecs have HW support. > > > > > > > > Bug: chromium:1029737 > > > > Change-Id: I16a80da44c5061ca42f2aabda76e6bf0b879bf7b > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161306 > > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#30041} > > > > > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > > > > > Change-Id: I7e5807460006db613e9b3b369ec6036b88f164fd > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: chromium:1029737 > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161662 > > > Reviewed-by: Johannes Kron <kron@webrtc.org> > > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#30042} > > > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: chromium:1029737 > > Change-Id: Ia70b11376b43888e2495ef21838c2d2e3c68d735 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161734 > > Reviewed-by: Johannes Kron <kron@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Commit-Queue: Johannes Kron <kron@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#30078} > > TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org > > Change-Id: Ia4971b898c9209a3736a916a1c2c48d392dfdad6 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: chromium:1029737 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162140 > Reviewed-by: Johannes Kron <kron@webrtc.org> > Commit-Queue: Johannes Kron <kron@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#30079} TBR=steveanton@webrtc.org,andersc@webrtc.org,kron@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:1029737 Change-Id: If2c3c5b5e7d86cb852a1f20f02b6ceae62b2e0c8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162186 Reviewed-by: Johannes Kron <kron@webrtc.org> Reviewed-by: Anders Carlsson <andersc@webrtc.org> Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Johannes Kron <kron@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30097}
73 lines
2.4 KiB
Objective-C
73 lines
2.4 KiB
Objective-C
/*
|
|
* Copyright 2017 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.
|
|
*/
|
|
|
|
#import "RTCDefaultVideoDecoderFactory.h"
|
|
|
|
#import "RTCH264ProfileLevelId.h"
|
|
#import "RTCVideoDecoderH264.h"
|
|
#import "api/video_codec/RTCVideoCodecConstants.h"
|
|
#import "api/video_codec/RTCVideoDecoderVP8.h"
|
|
#import "base/RTCVideoCodecInfo.h"
|
|
#if defined(RTC_ENABLE_VP9)
|
|
#import "api/video_codec/RTCVideoDecoderVP9.h"
|
|
#endif
|
|
|
|
@implementation RTCDefaultVideoDecoderFactory
|
|
|
|
- (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
|
|
NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
|
|
@"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedHigh,
|
|
@"level-asymmetry-allowed" : @"1",
|
|
@"packetization-mode" : @"1",
|
|
};
|
|
RTCVideoCodecInfo *constrainedHighInfo =
|
|
[[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name
|
|
parameters:constrainedHighParams];
|
|
|
|
NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
|
|
@"profile-level-id" : kRTCMaxSupportedH264ProfileLevelConstrainedBaseline,
|
|
@"level-asymmetry-allowed" : @"1",
|
|
@"packetization-mode" : @"1",
|
|
};
|
|
RTCVideoCodecInfo *constrainedBaselineInfo =
|
|
[[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name
|
|
parameters:constrainedBaselineParams];
|
|
|
|
RTCVideoCodecInfo *vp8Info = [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp8Name];
|
|
|
|
#if defined(RTC_ENABLE_VP9)
|
|
RTCVideoCodecInfo *vp9Info = [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp9Name];
|
|
#endif
|
|
|
|
return @[
|
|
constrainedHighInfo,
|
|
constrainedBaselineInfo,
|
|
vp8Info,
|
|
#if defined(RTC_ENABLE_VP9)
|
|
vp9Info,
|
|
#endif
|
|
];
|
|
}
|
|
|
|
- (id<RTCVideoDecoder>)createDecoder:(RTCVideoCodecInfo *)info {
|
|
if ([info.name isEqualToString:kRTCVideoCodecH264Name]) {
|
|
return [[RTCVideoDecoderH264 alloc] init];
|
|
} else if ([info.name isEqualToString:kRTCVideoCodecVp8Name]) {
|
|
return [RTCVideoDecoderVP8 vp8Decoder];
|
|
#if defined(RTC_ENABLE_VP9)
|
|
} else if ([info.name isEqualToString:kRTCVideoCodecVp9Name]) {
|
|
return [RTCVideoDecoderVP9 vp9Decoder];
|
|
#endif
|
|
}
|
|
|
|
return nil;
|
|
}
|
|
|
|
@end
|