summaryrefslogtreecommitdiff
path: root/pjmedia/include
diff options
context:
space:
mode:
Diffstat (limited to 'pjmedia/include')
-rw-r--r--pjmedia/include/pjmedia-codec/config.h18
-rw-r--r--pjmedia/include/pjmedia/format.h8
2 files changed, 26 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h
index fb02d47a..6b55baa2 100644
--- a/pjmedia/include/pjmedia-codec/config.h
+++ b/pjmedia/include/pjmedia-codec/config.h
@@ -354,6 +354,24 @@
#endif
/**
+ * Enable FFMPEG H263+/H263-1998 codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_FFMPEG_CODEC_H263P
+# define PJMEDIA_HAS_FFMPEG_CODEC_H263P 1
+#endif
+
+/**
+ * Enable FFMPEG H264 codec (requires libx264).
+ *
+ * Default: 0
+ */
+#ifndef PJMEDIA_HAS_FFMPEG_CODEC_H264
+# define PJMEDIA_HAS_FFMPEG_CODEC_H264 0
+#endif
+
+/**
* @}
*/
diff --git a/pjmedia/include/pjmedia/format.h b/pjmedia/include/pjmedia/format.h
index 2fbbc66f..f279c568 100644
--- a/pjmedia/include/pjmedia/format.h
+++ b/pjmedia/include/pjmedia/format.h
@@ -111,6 +111,14 @@ typedef enum pjmedia_format_id
PJMEDIA_FORMAT_DIB = PJMEDIA_FORMAT_PACK('D', 'I', 'B', ' '),
/**
+ * This is planar 4:4:4/24bpp RGB format, the data can be treated as
+ * three planes of color components, where the first plane contains
+ * only the G samples, the second plane contains only the B samples,
+ * and the third plane contains only the R samples.
+ */
+ PJMEDIA_FORMAT_GBRP = PJMEDIA_FORMAT_PACK('G', 'B', 'R', 'P'),
+
+ /**
* This is a packed 4:4:4/32bpp format, where each pixel is encoded as
* four consecutive bytes, arranged in the following sequence: V0, U0,
* Y0, A0. Source: