diff --git a/api/rtpparameters.cc b/api/rtpparameters.cc
index 9beae82d7a..ebf595d051 100644
--- a/api/rtpparameters.cc
+++ b/api/rtpparameters.cc
@@ -133,6 +133,10 @@ const char RtpExtension::kFrameMarkingUri[] =
     "http://tools.ietf.org/html/draft-ietf-avtext-framemarking-07";
 const int RtpExtension::kFrameMarkingDefaultId = 10;
 
+const char RtpExtension::kGenericFrameDescriptorUri[] =
+    "http://www.webrtc.org/experiments/rtp-hdrext/generic-frame-descriptor-00";
+const int RtpExtension::kGenericFrameDescriptorDefaultId = 11;
+
 const char RtpExtension::kEncryptHeaderExtensionsUri[] =
     "urn:ietf:params:rtp-hdrext:encrypt";
 
@@ -154,7 +158,8 @@ bool RtpExtension::IsSupportedForVideo(const std::string& uri) {
          uri == webrtc::RtpExtension::kVideoContentTypeUri ||
          uri == webrtc::RtpExtension::kVideoTimingUri ||
          uri == webrtc::RtpExtension::kMidUri ||
-         uri == webrtc::RtpExtension::kFrameMarkingUri;
+         uri == webrtc::RtpExtension::kFrameMarkingUri ||
+         uri == webrtc::RtpExtension::kGenericFrameDescriptorUri;
 }
 
 bool RtpExtension::IsEncryptionSupported(const std::string& uri) {
diff --git a/api/rtpparameters.h b/api/rtpparameters.h
index f2e4dcb2fa..70d7e007bc 100644
--- a/api/rtpparameters.h
+++ b/api/rtpparameters.h
@@ -286,6 +286,10 @@ struct RtpExtension {
   static const char kFrameMarkingUri[];
   static const int kFrameMarkingDefaultId;
 
+  // Experimental codec agnostic frame descriptor.
+  static const char kGenericFrameDescriptorUri[];
+  static const int kGenericFrameDescriptorDefaultId;
+
   // Header extension for transport sequence number, see url for details:
   // http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions
   static const char kTransportSequenceNumberUri[];
diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
index d6acbe562b..d59a9b03a4 100644
--- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
+++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
@@ -23,7 +23,8 @@ class RtpGenericFrameDescriptorExtension {
  public:
   static constexpr RTPExtensionType kId = kRtpExtensionGenericFrameDescriptor;
   static constexpr char kUri[] =
-      "http://www.webrtc.org/experiments/rtp-hdrext/generic-frame-descriptor";
+      "http://www.webrtc.org/experiments/rtp-hdrext/"
+      "generic-frame-descriptor-00";
 
   static bool Parse(rtc::ArrayView<const uint8_t> data,
                     RtpGenericFrameDescriptor* descriptor);