summaryrefslogtreecommitdiff
path: root/pjmedia/src/pjmedia-codec
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2011-10-25 11:13:53 +0000
committerNanang Izzuddin <nanang@teluu.com>2011-10-25 11:13:53 +0000
commitf1b44b5f63789413795892a28cc4841508148af0 (patch)
treeeee074406d0a1e46cc19bde57b8e42982adc9185 /pjmedia/src/pjmedia-codec
parentc219f00ea35aefab697dd520de107be432ea2dc5 (diff)
Re #1390: disable H264 encoder source format RGB24 as x264 doesn't support 4:4:4 for baseline profile.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3853 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec')
-rw-r--r--pjmedia/src/pjmedia-codec/ffmpeg_codecs.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
index 55f277f5..c936090f 100644
--- a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
@@ -652,7 +652,16 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_init(pjmedia_vid_codec_mgr *mgr,
"format %d", *p));
continue;
}
- raw_fmt[raw_fmt_cnt++] = fmt_id;
+
+ //raw_fmt[raw_fmt_cnt++] = fmt_id;
+ /* Disable some formats due to H.264 error:
+ * x264 [error]: baseline profile doesn't support 4:4:4
+ */
+ if (desc->info.pt != PJMEDIA_RTP_PT_H264 ||
+ fmt_id != PJMEDIA_FORMAT_RGB24)
+ {
+ raw_fmt[raw_fmt_cnt++] = fmt_id;
+ }
}
if (raw_fmt_cnt == 0) {