Remove framemarking RTP extension.
BUG=webrtc:11637
Change-Id: I47f8e22473429c9762956444e27cfbafb201b208
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176442
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31522}
diff --git a/api/rtp_headers.cc b/api/rtp_headers.cc
index bf973b6..e0ad9eb 100644
--- a/api/rtp_headers.cc
+++ b/api/rtp_headers.cc
@@ -26,9 +26,7 @@
videoRotation(kVideoRotation_0),
hasVideoContentType(false),
videoContentType(VideoContentType::UNSPECIFIED),
- has_video_timing(false),
- has_frame_marking(false),
- frame_marking({false, false, false, false, false, 0xFF, 0, 0}) {}
+ has_video_timing(false) {}
RTPHeaderExtension::RTPHeaderExtension(const RTPHeaderExtension& other) =
default;
diff --git a/api/rtp_headers.h b/api/rtp_headers.h
index 163347f..454149c 100644
--- a/api/rtp_headers.h
+++ b/api/rtp_headers.h
@@ -21,10 +21,9 @@
#include "api/units/timestamp.h"
#include "api/video/color_space.h"
#include "api/video/video_content_type.h"
-#include "api/video/video_frame_marking.h"
#include "api/video/video_rotation.h"
#include "api/video/video_timing.h"
-#include "common_types.h" // NOLINT(build/include)
+#include "common_types.h" // NOLINT (build/include)
namespace webrtc {
@@ -143,9 +142,6 @@
bool has_video_timing;
VideoSendTiming video_timing;
- bool has_frame_marking;
- FrameMarking frame_marking;
-
PlayoutDelay playout_delay = {-1, -1};
// For identification of a stream when ssrc is not signaled. See
diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc
index c44e4c4..28acb68 100644
--- a/api/rtp_parameters.cc
+++ b/api/rtp_parameters.cc
@@ -119,7 +119,6 @@
constexpr char RtpExtension::kVideoRotationUri[];
constexpr char RtpExtension::kVideoContentTypeUri[];
constexpr char RtpExtension::kVideoTimingUri[];
-constexpr char RtpExtension::kFrameMarkingUri[];
constexpr char RtpExtension::kGenericFrameDescriptorUri00[];
constexpr char RtpExtension::kDependencyDescriptorUri[];
constexpr char RtpExtension::kTransportSequenceNumberUri[];
@@ -158,7 +157,6 @@
uri == webrtc::RtpExtension::kVideoContentTypeUri ||
uri == webrtc::RtpExtension::kVideoTimingUri ||
uri == webrtc::RtpExtension::kMidUri ||
- uri == webrtc::RtpExtension::kFrameMarkingUri ||
uri == webrtc::RtpExtension::kGenericFrameDescriptorUri00 ||
uri == webrtc::RtpExtension::kDependencyDescriptorUri ||
uri == webrtc::RtpExtension::kColorSpaceUri ||
diff --git a/api/rtp_parameters.h b/api/rtp_parameters.h
index f831e51..addd406 100644
--- a/api/rtp_parameters.h
+++ b/api/rtp_parameters.h
@@ -310,10 +310,6 @@
static constexpr char kVideoTimingUri[] =
"http://www.webrtc.org/experiments/rtp-hdrext/video-timing";
- // Header extension for video frame marking.
- static constexpr char kFrameMarkingUri[] =
- "http://tools.ietf.org/html/draft-ietf-avtext-framemarking-07";
-
// Experimental codec agnostic frame descriptor.
static constexpr char kGenericFrameDescriptorUri00[] =
"http://www.webrtc.org/experiments/rtp-hdrext/"
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 1f145b7..ee7e51d 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -21,7 +21,6 @@
"hdr_metadata.h",
"video_content_type.cc",
"video_content_type.h",
- "video_frame_marking.h",
"video_rotation.h",
"video_timing.cc",
"video_timing.h",
diff --git a/api/video/video_frame_marking.h b/api/video/video_frame_marking.h
deleted file mode 100644
index 2a34852..0000000
--- a/api/video/video_frame_marking.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2018 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.
- */
-
-#ifndef API_VIDEO_VIDEO_FRAME_MARKING_H_
-#define API_VIDEO_VIDEO_FRAME_MARKING_H_
-
-namespace webrtc {
-
-struct FrameMarking {
- bool start_of_frame;
- bool end_of_frame;
- bool independent_frame;
- bool discardable_frame;
- bool base_layer_sync;
- uint8_t temporal_id;
- uint8_t layer_id;
- uint8_t tl0_pic_idx;
-};
-
-} // namespace webrtc
-
-#endif // API_VIDEO_VIDEO_FRAME_MARKING_H_