Minor refactoring

metalefty · Aug 30, 2023 · 7db4415 · 7db4415
1 parent 29ae611
commit 7db4415
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h
@@ -224,10 +224,11 @@ enum xrdp_encoder_flags
     CONTAINS_DUAL_FRAME_AVC444             = 1 << 1,
     CONTAINS_SINGLE_FRAME_AVC444_YUV420    = 1 << 2,
     CONTAINS_SINGLE_FRAME_AVC444_CHROMA420 = 1 << 3,
-    CONTAINS_KEY_FRAME                     = 1 << 4
+    CONTAINS_KEY_FRAME                     = 1 << 4,
+    KEY_FRAME_REQUESTED                    = 1 << 5
 };
 
 /* yyyymmdd of last incompatible change to xrdp_client_info */
-#define CLIENT_INFO_CURRENT_VERSION 20230520
+#define CLIENT_INFO_CURRENT_VERSION 20230830
 
 #endif
diff --git a/xrdp/xrdp_encoder.c b/xrdp/xrdp_encoder.c
@@ -618,10 +618,8 @@ build_rfx_avc420_metablock(struct stream *s, short *rrects, int rcount,
     return comp_bytes_pre;
 }
 
-/*****************************************************************************/
-/* called from encoder thread */
 static int
-process_enc_h264(struct xrdp_encoder *self, XRDP_ENC_DATA *enc)
+build_enc_h264(struct xrdp_encoder *self, XRDP_ENC_DATA *enc)
 {
     int index;
     int x;
@@ -845,6 +843,14 @@ process_enc_h264(struct xrdp_encoder *self, XRDP_ENC_DATA *enc)
     return 0;
 }
 
+/*****************************************************************************/
+/* called from encoder thread */
+static int
+process_enc_h264(struct xrdp_encoder *self, XRDP_ENC_DATA *enc)
+{
+    return build_enc_h264(self, enc);
+}
+
 #else
 
 /*****************************************************************************/