Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Unified Diff: webrtc/sdk/objc/Framework/Classes/PeerConnection/objc_video_decoder_factory.mm

Issue 2975963002: Revert of Injectable Obj-C video codecs (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/sdk/objc/Framework/Classes/PeerConnection/objc_video_decoder_factory.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/objc_video_decoder_factory.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/objc_video_decoder_factory.mm
deleted file mode 100644
index 61c803220638bcc43d6ce4026499bea2d7e01560..0000000000000000000000000000000000000000
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/objc_video_decoder_factory.mm
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.
- */
-
-#include "webrtc/sdk/objc/Framework/Classes/PeerConnection/objc_video_decoder_factory.h"
-
-#import "RTCVideoCodec+Private.h"
-#import "WebRTC/RTCVideoCodec.h"
-#import "WebRTC/RTCVideoCodecFactory.h"
-#import "WebRTC/RTCVideoCodecH264.h"
-#import "WebRTC/RTCVideoFrame.h"
-#import "WebRTC/RTCVideoFrameBuffer.h"
-
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h"
-
-namespace webrtc {
-
-namespace {
-class ObjCVideoDecoder : public VideoDecoder {
- public:
- ObjCVideoDecoder(id<RTCVideoDecoder> decoder) : decoder_(decoder) {}
- ~ObjCVideoDecoder() {}
-
- int32_t InitDecode(const VideoCodec *codec_settings, int32_t number_of_cores) {
- RTCVideoEncoderSettings *settings =
- [[RTCVideoEncoderSettings alloc] initWithVideoCodec:codec_settings];
- return [decoder_ initDecodeWithSettings:settings numberOfCores:number_of_cores];
- }
-
- int32_t Decode(const EncodedImage &input_image,
- bool missing_frames,
- const RTPFragmentationHeader *fragmentation,
- const CodecSpecificInfo *codec_specific_info = NULL,
- int64_t render_time_ms = -1) {
- RTCEncodedImage *encodedImage = [[RTCEncodedImage alloc] initWithEncodedImage:input_image];
- RTCRtpFragmentationHeader *header =
- [[RTCRtpFragmentationHeader alloc] initWithFragmentationHeader:fragmentation];
-
- // webrtc::CodecSpecificInfo only handles a hard coded list of codecs
- id<RTCCodecSpecificInfo> rtcCodecSpecificInfo = nil;
- if (codec_specific_info) {
- if (codec_specific_info->codecType == kVideoCodecH264) {
- RTCCodecSpecificInfoH264 *h264Info = [[RTCCodecSpecificInfoH264 alloc] init];
- h264Info.packetizationMode =
- (RTCH264PacketizationMode)codec_specific_info->codecSpecific.H264.packetization_mode;
- rtcCodecSpecificInfo = h264Info;
- }
- }
-
- [decoder_ decode:encodedImage
- missingFrames:missing_frames
- fragmentationHeader:header
- codecSpecificInfo:rtcCodecSpecificInfo
- renderTimeMs:render_time_ms];
- return WEBRTC_VIDEO_CODEC_OK;
- }
-
- int32_t RegisterDecodeCompleteCallback(DecodedImageCallback *callback) {
- [decoder_ setCallback:^(RTCVideoFrame *frame) {
- const rtc::scoped_refptr<VideoFrameBuffer> buffer =
- new rtc::RefCountedObject<ObjCFrameBuffer>(frame.buffer);
- VideoFrame videoFrame(buffer,
- (uint32_t)(frame.timeStampNs / rtc::kNumNanosecsPerMicrosec),
- 0,
- (VideoRotation)frame.rotation);
- videoFrame.set_timestamp(frame.timeStamp);
-
- callback->Decoded(videoFrame);
- }];
-
- return WEBRTC_VIDEO_CODEC_OK;
- }
-
- int32_t Release() { return [decoder_ releaseDecode]; }
-
- private:
- id<RTCVideoDecoder> decoder_;
-};
-} // namespace
-
-ObjCVideoDecoderFactory::ObjCVideoDecoderFactory(id<RTCVideoDecoderFactory> decoder_factory)
- : decoder_factory_(decoder_factory) {}
-
-ObjCVideoDecoderFactory::~ObjCVideoDecoderFactory() {}
-
-id<RTCVideoDecoderFactory> ObjCVideoDecoderFactory::wrapped_decoder_factory() const {
- return decoder_factory_;
-}
-
-VideoDecoder *ObjCVideoDecoderFactory::CreateVideoDecoder(VideoCodecType type) {
- const rtc::Optional<const char *> codec_name = CodecTypeToPayloadName(type);
- if (!codec_name) {
- LOG(LS_ERROR) << "Invalid codec type: " << type;
- return nullptr;
- }
-
- NSString *codecName = [NSString stringWithUTF8String:codec_name.value()];
- for (RTCVideoCodecInfo *codecInfo in decoder_factory_.supportedCodecs) {
- if ([codecName isEqualToString:codecInfo.name]) {
- id<RTCVideoDecoder> decoder = [decoder_factory_ createDecoder:codecInfo];
- return new ObjCVideoDecoder(decoder);
- }
- }
-
- return nullptr;
-}
-
-void ObjCVideoDecoderFactory::DestroyVideoDecoder(VideoDecoder *decoder) {
- delete decoder;
- decoder = nullptr;
-}
-
-} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698