From 55e77856866cfd49060b22b300bab5ba8c5e1f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1ri=20Tristan=20Helgason?= Date: Mon, 27 Aug 2018 15:04:07 +0200 Subject: [PATCH] Remove kVideoCodecUnknown completely. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to cl https://webrtc-review.googlesource.com/92086 Bug: webrtc:8136 Change-Id: I077d18ac6def475d05424ff0c5e545c939cd8e61 Reviewed-on: https://webrtc-review.googlesource.com/95642 Reviewed-by: Karl Wiberg Reviewed-by: Niels Moller Commit-Queue: Kári Helgason Cr-Commit-Position: refs/heads/master@{#24475} --- common_types.h | 2 -- modules/rtp_rtcp/source/rtp_video_header.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common_types.h b/common_types.h index 8617c9ee93..60d88b39ce 100644 --- a/common_types.h +++ b/common_types.h @@ -340,8 +340,6 @@ enum VideoCodecType { kVideoCodecH264, kVideoCodecI420, kVideoCodecMultiplex, - // DEPRECATED. Do not use. - kVideoCodecUnknown, }; // Translates from name of codec to codec type and vice versa. diff --git a/modules/rtp_rtcp/source/rtp_video_header.h b/modules/rtp_rtcp/source/rtp_video_header.h index 74b48caea9..520f4d4d66 100644 --- a/modules/rtp_rtcp/source/rtp_video_header.h +++ b/modules/rtp_rtcp/source/rtp_video_header.h @@ -65,7 +65,7 @@ struct RTPVideoHeader { VideoContentType content_type = VideoContentType::UNSPECIFIED; bool is_first_packet_in_frame = false; uint8_t simulcastIdx = 0; - VideoCodecType codec = VideoCodecType::kVideoCodecUnknown; + VideoCodecType codec = VideoCodecType::kVideoCodecGeneric; PlayoutDelay playout_delay; VideoSendTiming video_timing;