From 4f00075435286df070809eee304b5992eb6456e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Fri, 16 Nov 2018 14:26:25 +0100 Subject: [PATCH] Remove use of CodecSpecificInfo.codec_name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9890 Change-Id: I68bb73530f335e82d0d3f7885702fc6bb120a7a5 Reviewed-on: https://webrtc-review.googlesource.com/c/111241 Commit-Queue: Erik Språng Reviewed-by: Kári Helgason Cr-Commit-Position: refs/heads/master@{#25774} --- sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.mm | 1 - sdk/objc/unittests/objc_video_encoder_factory_tests.mm | 2 -- 2 files changed, 3 deletions(-) diff --git a/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.mm b/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.mm index 63e8bd7f42..57f2411e3b 100644 --- a/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.mm +++ b/sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.mm @@ -20,7 +20,6 @@ - (webrtc::CodecSpecificInfo)nativeCodecSpecificInfo { webrtc::CodecSpecificInfo codecSpecificInfo; codecSpecificInfo.codecType = webrtc::kVideoCodecH264; - codecSpecificInfo.codec_name = [kRTCVideoCodecH264Name cStringUsingEncoding:NSUTF8StringEncoding]; codecSpecificInfo.codecSpecific.H264.packetization_mode = (webrtc::H264PacketizationMode)_packetizationMode; diff --git a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm index 2aa59cfc1f..50c30c0c74 100644 --- a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm +++ b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm @@ -82,7 +82,6 @@ TEST(ObjCVideoEncoderFactoryTest, EncodeReturnsOKOnSuccess) { webrtc::VideoFrame frame(buffer, webrtc::kVideoRotation_0, 0); webrtc::CodecSpecificInfo info; info.codecType = webrtc::kVideoCodecH264; - info.codec_name = "H264"; std::vector frame_types; EXPECT_EQ(encoder->Encode(frame, &info, &frame_types), WEBRTC_VIDEO_CODEC_OK); @@ -99,7 +98,6 @@ TEST(ObjCVideoEncoderFactoryTest, EncodeReturnsErrorOnFail) { webrtc::VideoFrame frame(buffer, webrtc::kVideoRotation_0, 0); webrtc::CodecSpecificInfo info; info.codecType = webrtc::kVideoCodecH264; - info.codec_name = "H264"; std::vector frame_types; EXPECT_EQ(encoder->Encode(frame, &info, &frame_types), WEBRTC_VIDEO_CODEC_ERROR);