Rtp h265

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtpPayloadFormat.java

@@ -39,12 +39,14 @@ public final class RtpPayloadFormat {
   private static final String RTP_MEDIA_AC3 = "AC3";
   private static final String RTP_MEDIA_MPEG4_GENERIC = "MPEG4-GENERIC";
   private static final String RTP_MEDIA_H264 = "H264";
+  private static final String RTP_MEDIA_H265 = "H265";
 
   /** Returns whether the format of a {@link MediaDescription} is supported. */
   public static boolean isFormatSupported(MediaDescription mediaDescription) {
     switch (Ascii.toUpperCase(mediaDescription.rtpMapAttribute.mediaEncoding)) {
       case RTP_MEDIA_AC3:
       case RTP_MEDIA_H264:
+      case RTP_MEDIA_H265:
       case RTP_MEDIA_MPEG4_GENERIC:
         return true;
       default:
@@ -65,6 +67,8 @@ public static String getMimeTypeFromRtpMediaType(String mediaType) {
         return MimeTypes.AUDIO_AC3;
       case RTP_MEDIA_H264:
         return MimeTypes.VIDEO_H264;
+      case RTP_MEDIA_H265:
+        return MimeTypes.VIDEO_H265;
       case RTP_MEDIA_MPEG4_GENERIC:
         return MimeTypes.AUDIO_AAC;
       default:

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java

@@ -44,6 +44,11 @@
   // Format specific parameter names.
   private static final String PARAMETER_PROFILE_LEVEL_ID = "profile-level-id";
   private static final String PARAMETER_SPROP_PARAMS = "sprop-parameter-sets";
+  private static final String PARAMETER_SPROP_H265_SPS = "sprop-sps";
+  private static final String PARAMETER_SPROP_H265_PPS = "sprop-pps";
+  private static final String PARAMETER_SPROP_H265_VPS = "sprop-vps";
+  private static final String PARAMETER_SPROP_H265_MAX_DON_DIFF = "sprop-max-don-diff";
+
   /** Prefix for the RFC6381 codecs string for AAC formats. */
   private static final String AAC_CODECS_PREFIX = "mp4a.40.";
   /** Prefix for the RFC6381 codecs string for AVC formats. */
@@ -120,6 +125,10 @@ public int hashCode() {
         checkArgument(!fmtpParameters.isEmpty());
         processH264FmtpAttribute(formatBuilder, fmtpParameters);
         break;
+      case MimeTypes.VIDEO_H265:
+        checkArgument(!fmtpParameters.isEmpty());
+        processH265FmtpAttribute(formatBuilder, fmtpParameters);
+        break;
       case MimeTypes.AUDIO_AC3:
         // AC3 does not require a FMTP attribute. Fall through.
       default:
@@ -160,6 +169,26 @@ private static void processAacFmtpAttribute(
             AacUtil.buildAacLcAudioSpecificConfig(sampleRate, channelCount)));
   }
 
+  /** Returns H264/H265 initialization data from RTP parameter set. */
+  private static byte[] getInitializationDataFromParameterSet(String parameterSet) {
+    byte[] decodedParameterNalData = Base64.decode(parameterSet, Base64.DEFAULT);
+    byte[] decodedParameterNalUnit =
+        new byte[decodedParameterNalData.length + NAL_START_CODE.length];
+    System.arraycopy(
+        NAL_START_CODE,
+        /* srcPos= */ 0,
+        decodedParameterNalUnit,
+        /* destPos= */ 0,
+        NAL_START_CODE.length);
+    System.arraycopy(
+        decodedParameterNalData,
+        /* srcPos= */ 0,
+        decodedParameterNalUnit,
+        /* destPos= */ NAL_START_CODE.length,
+        decodedParameterNalData.length);
+    return decodedParameterNalUnit;
+  }
+
   private static void processH264FmtpAttribute(
       Format.Builder formatBuilder, ImmutableMap<String, String> fmtpAttributes) {
     checkArgument(fmtpAttributes.containsKey(PARAMETER_SPROP_PARAMS));
@@ -168,8 +197,8 @@ private static void processH264FmtpAttribute(
     checkArgument(parameterSets.length == 2);
     ImmutableList<byte[]> initializationData =
         ImmutableList.of(
-            getH264InitializationDataFromParameterSet(parameterSets[0]),
-            getH264InitializationDataFromParameterSet(parameterSets[1]));
+            getInitializationDataFromParameterSet(parameterSets[0]),
+            getInitializationDataFromParameterSet(parameterSets[1]));
     formatBuilder.setInitializationData(initializationData);
 
     // Process SPS (Sequence Parameter Set).
@@ -191,23 +220,45 @@ private static void processH264FmtpAttribute(
     }
   }
 
-  private static byte[] getH264InitializationDataFromParameterSet(String parameterSet) {
-    byte[] decodedParameterNalData = Base64.decode(parameterSet, Base64.DEFAULT);
-    byte[] decodedParameterNalUnit =
-        new byte[decodedParameterNalData.length + NAL_START_CODE.length];
-    System.arraycopy(
-        NAL_START_CODE,
-        /* srcPos= */ 0,
-        decodedParameterNalUnit,
-        /* destPos= */ 0,
-        NAL_START_CODE.length);
-    System.arraycopy(
-        decodedParameterNalData,
-        /* srcPos= */ 0,
-        decodedParameterNalUnit,
-        /* destPos= */ NAL_START_CODE.length,
-        decodedParameterNalData.length);
-    return decodedParameterNalUnit;
+  private static void processH265FmtpAttribute(
+      Format.Builder formatBuilder, ImmutableMap<String, String> fmtpAttributes) {
+    if (fmtpAttributes.containsKey(PARAMETER_SPROP_H265_MAX_DON_DIFF)) {
+      checkArgument(
+          Integer.parseInt(checkNotNull(fmtpAttributes.get(PARAMETER_SPROP_H265_MAX_DON_DIFF)))
+              == 0,
+          "non-zero sprop-max-don-diff is not supported");
+    }
+
+    checkArgument(fmtpAttributes.containsKey(PARAMETER_SPROP_H265_VPS));
+    String spropVPS = checkNotNull(fmtpAttributes.get(PARAMETER_SPROP_H265_VPS));
+    checkArgument(fmtpAttributes.containsKey(PARAMETER_SPROP_H265_SPS));
+    String spropSPS = checkNotNull(fmtpAttributes.get(PARAMETER_SPROP_H265_SPS));
+    checkArgument(fmtpAttributes.containsKey(PARAMETER_SPROP_H265_PPS));
+    String spropPPS = checkNotNull(fmtpAttributes.get(PARAMETER_SPROP_H265_PPS));
+    ImmutableList<byte[]> initializationData =
+        ImmutableList.of(
+            getInitializationDataFromParameterSet(spropVPS),
+            getInitializationDataFromParameterSet(spropSPS),
+            getInitializationDataFromParameterSet(spropPPS));
+    formatBuilder.setInitializationData(initializationData);
+
+    // Process SPS (Sequence Parameter Set).
+    byte[] spsNalDataWithStartCode = initializationData.get(1);
+    NalUnitUtil.H265SpsData spsData =
+        NalUnitUtil.parseH265SpsNalUnit(
+            spsNalDataWithStartCode, NAL_START_CODE.length, spsNalDataWithStartCode.length);
+    formatBuilder.setPixelWidthHeightRatio(spsData.pixelWidthHeightRatio);
+    formatBuilder.setHeight(spsData.height);
+    formatBuilder.setWidth(spsData.width);
+
+    formatBuilder.setCodecs(
+        CodecSpecificDataUtil.buildHevcCodecString(
+            spsData.generalProfileSpace,
+            spsData.generalTierFlag,
+            spsData.generalProfileIdc,
+            spsData.generalProfileCompatibilityFlags,
+            spsData.constraintBytes,
+            spsData.generalLevelIdc));
   }
 
   /**

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/DefaultRtpPayloadReaderFactory.java

@@ -38,6 +38,8 @@ public RtpPayloadReader createPayloadReader(RtpPayloadFormat payloadFormat) {
         return new RtpAacReader(payloadFormat);
       case MimeTypes.VIDEO_H264:
         return new RtpH264Reader(payloadFormat);
+      case MimeTypes.VIDEO_H265:
+        return new RtpH265Reader(payloadFormat);
       default:
         // No supported reader, returning null.
     }