sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc (re #1446): Added macro PJMEDIA_MAX_VID_PAYLOAD_SIZE, also updated the default encoding MTU of ffmpeg codec & H263/H264 packetizers to this macro setting. 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4006 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Nanang Izzuddin 2012-04-02 08:40:54 +00:00
parent 161e6918dd
commit b865b140af
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pjmedia/include/pjmedia/config.h
View File

@ -1159,6 +1159,18 @@
# define PJMEDIA_VID_STREAM_SKIP_PACKETS_TO_REDUCE_LATENCY 0
#endif
/**
* Maximum video payload size. Note that this must not be greater than
* PJMEDIA_MAX_MTU.
*
* Default: (PJMEDIA_MAX_MTU - 100)
*/
#ifndef PJMEDIA_MAX_VID_PAYLOAD_SIZE
# define PJMEDIA_MAX_VID_PAYLOAD_SIZE (PJMEDIA_MAX_MTU - 100)
#endif
/**
* @}
*/

8
pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
View File

@ -932,8 +932,8 @@ static pj_status_t ffmpeg_default_attr( pjmedia_vid_codec_factory *factory,
attr->enc_fmt.det.vid.avg_bps = desc->avg_bps;
attr->enc_fmt.det.vid.max_bps = desc->max_bps;
/* MTU */
attr->enc_mtu = PJMEDIA_MAX_MTU;
/* Encoding MTU */
attr->enc_mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
return PJ_SUCCESS;
}
@ -1214,6 +1214,10 @@ static pj_status_t ffmpeg_codec_open( pjmedia_vid_codec *codec,
pj_memcpy(&ff->param, attr, sizeof(*attr));
/* Normalize encoding MTU in codec param */
if (attr->enc_mtu > PJMEDIA_MAX_VID_PAYLOAD_SIZE)
attr->enc_mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
/* Open the codec */
ff_mutex = ((struct ffmpeg_factory*)codec->factory)->mutex;
status = open_ffmpeg_codec(ff, ff_mutex);

2
pjmedia/src/pjmedia-codec/h263_packetizer.c
View File

@ -98,7 +98,7 @@ PJ_DEF(pj_status_t) pjmedia_h263_packetizer_create(
pj_memcpy(&p_->cfg, cfg, sizeof(*cfg));
} else {
p_->cfg.mode = PJMEDIA_H263_PACKETIZER_MODE_RFC4629;
p_->cfg.mtu = PJMEDIA_MAX_MTU;
p_->cfg.mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
}
*p = p_;

2
pjmedia/src/pjmedia-codec/h264_packetizer.c
View File

@ -104,7 +104,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetizer_create(
pj_memcpy(&p_->cfg, cfg, sizeof(*cfg));
} else {
p_->cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
p_->cfg.mtu = PJMEDIA_MAX_MTU;
p_->cfg.mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
}
*p = p_;