summaryrefslogtreecommitdiff
path: root/pjmedia/include/pjmedia
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2011-10-18 01:51:01 +0000
committerNanang Izzuddin <nanang@teluu.com>2011-10-18 01:51:01 +0000
commit5586e0af18c3ba1ed079fae5901d0981fbbdf1a4 (patch)
tree8b80c000e2082becd8da05249062503ce503285a /pjmedia/include/pjmedia
parentf320d9e1d15975cc42c92e4aac50b4ba299981bb (diff)
Reenable ffmpeg H264 (re #1390):
- Review H264 codec settings such as profile, level, NAL unit size, bitrate, quality, latency. - Added new format PJMEDIA_FORMAT_GBRP, 24 bits planar RGB, one of the formats outputted by the latest ffmpeg H264 decoder. - Fixed format change detection bug in ffmpeg wrapper, decoder didn't update its internal state with the new format so format change event was generated in every decoding operation. - Added compile time configurations for enabling/disabling ffmpeg codec H263+ & H264. - Updated pjsua app to adjust window size to original video size. With H264, default window size will be too big as it is init'd with default H264 video size, e.g: 720x480 for profile level 30. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3819 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include/pjmedia')
-rw-r--r--pjmedia/include/pjmedia/format.h8
1 files changed, 8 insertions, 0 deletions
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: