summaryrefslogtreecommitdiff
path: root/pjmedia/src/pjmedia-codec
diff options
context:
space:
mode:
Diffstat (limited to 'pjmedia/src/pjmedia-codec')
-rw-r--r--pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c15
-rw-r--r--pjmedia/src/pjmedia-codec/gsm.c2
-rw-r--r--pjmedia/src/pjmedia-codec/h263_packetizer.c6
-rw-r--r--pjmedia/src/pjmedia-codec/h264_packetizer.c16
-rw-r--r--pjmedia/src/pjmedia-codec/ilbc.c2
-rw-r--r--pjmedia/src/pjmedia-codec/speex_codec.c6
6 files changed, 24 insertions, 23 deletions
diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
index ee5abad9..e4c3aea8 100644
--- a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
@@ -454,7 +454,7 @@ static pj_status_t h264_preopen(ffmpeg_private *ff)
* extradata of ffmpeg codec context.
*/
if (data->fmtp.sprop_param_sets_len) {
- ctx->extradata_size = data->fmtp.sprop_param_sets_len;
+ ctx->extradata_size = (int)data->fmtp.sprop_param_sets_len;
ctx->extradata = data->fmtp.sprop_param_sets;
}
}
@@ -1288,10 +1288,10 @@ static pj_status_t ffmpeg_codec_open( pjmedia_vid_codec *codec,
/* Alloc buffers if needed */
ff->whole = (ff->param.packing == PJMEDIA_VID_PACKING_WHOLE);
if (!ff->whole) {
- ff->enc_buf_size = ff->enc_vafp.framebytes;
+ ff->enc_buf_size = (unsigned)ff->enc_vafp.framebytes;
ff->enc_buf = pj_pool_alloc(ff->pool, ff->enc_buf_size);
- ff->dec_buf_size = ff->dec_vafp.framebytes;
+ ff->dec_buf_size = (unsigned)ff->dec_vafp.framebytes;
ff->dec_buf = pj_pool_alloc(ff->pool, ff->dec_buf_size);
}
@@ -1420,7 +1420,7 @@ static pj_status_t ffmpeg_codec_encode_whole(pjmedia_vid_codec *codec,
*/
PJ_ALIGN_DATA(pj_uint32_t i[4], 16);
- if ((long)i & 0xF) {
+ if ((long)(pj_ssize_t)i & 0xF) {
PJ_LOG(2,(THIS_FILE, "Stack alignment fails"));
}
@@ -1502,7 +1502,8 @@ static pj_status_t ffmpeg_codec_encode_begin(pjmedia_vid_codec *codec,
whole_frm.buf = ff->enc_buf;
whole_frm.size = ff->enc_buf_size;
status = ffmpeg_codec_encode_whole(codec, opt, input,
- whole_frm.size, &whole_frm);
+ (unsigned)whole_frm.size,
+ &whole_frm);
if (status != PJ_SUCCESS)
return status;
@@ -1618,7 +1619,7 @@ static pj_status_t check_decode_result(pjmedia_vid_codec *codec,
PJ_LOG(5,(THIS_FILE, "Reallocating decoding buffer %u --> %u",
(unsigned)ff->dec_buf_size,
(unsigned)ff->dec_vafp.framebytes));
- ff->dec_buf_size = ff->dec_vafp.framebytes;
+ ff->dec_buf_size = (unsigned)ff->dec_vafp.framebytes;
ff->dec_buf = pj_pool_alloc(ff->pool, ff->dec_buf_size);
}
@@ -1681,7 +1682,7 @@ static pj_status_t ffmpeg_codec_decode_whole(pjmedia_vid_codec *codec,
/* Init packet, the container of the encoded data */
av_init_packet(&avpacket);
avpacket.data = (pj_uint8_t*)input->buf;
- avpacket.size = input->size;
+ avpacket.size = (int)input->size;
/* ffmpeg warns:
* - input buffer padding, at least FF_INPUT_BUFFER_PADDING_SIZE
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c
index 43149b78..86c3d57c 100644
--- a/pjmedia/src/pjmedia-codec/gsm.c
+++ b/pjmedia/src/pjmedia-codec/gsm.c
@@ -530,7 +530,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec,
{
struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
pj_int16_t *pcm_in;
- unsigned in_size;
+ pj_size_t in_size;
pj_assert(gsm_data && input && output);
diff --git a/pjmedia/src/pjmedia-codec/h263_packetizer.c b/pjmedia/src/pjmedia-codec/h263_packetizer.c
index df812c40..3bfafe18 100644
--- a/pjmedia/src/pjmedia-codec/h263_packetizer.c
+++ b/pjmedia/src/pjmedia-codec/h263_packetizer.c
@@ -155,7 +155,7 @@ PJ_DEF(pj_status_t) pjmedia_h263_packetize(pjmedia_h263_packetizer *pktz,
*payload = p;
*payload_len = end-p;
- *pos = end - bits;
+ *pos = (unsigned)(end - bits);
return PJ_SUCCESS;
}
@@ -273,7 +273,7 @@ PJ_DEF(pj_status_t) pjmedia_h263_unpacketize (pjmedia_h263_packetizer *pktz,
/* Write two zero octets when payload flagged with sync point */
if (P) {
- pktz->unpack_last_sync_pos = q - bits;
+ pktz->unpack_last_sync_pos = (unsigned)(q - bits);
*q++ = 0;
*q++ = 0;
}
@@ -283,7 +283,7 @@ PJ_DEF(pj_status_t) pjmedia_h263_unpacketize (pjmedia_h263_packetizer *pktz,
q += payload_len;
/* Update the bitstream writing offset */
- *pos = q - bits;
+ *pos = (unsigned)(q - bits);
pktz->unpack_prev_lost = PJ_FALSE;
diff --git a/pjmedia/src/pjmedia-codec/h264_packetizer.c b/pjmedia/src/pjmedia-codec/h264_packetizer.c
index c928dc20..0e71604b 100644
--- a/pjmedia/src/pjmedia-codec/h264_packetizer.c
+++ b/pjmedia/src/pjmedia-codec/h264_packetizer.c
@@ -214,7 +214,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetize(pjmedia_h264_packetizer *pktz,
*payload_len = pktz->cfg.mtu;
else
*payload_len = nal_end - nal_start + HEADER_SIZE_FU_A;
- *pos = *payload + *payload_len - buf;
+ *pos = (unsigned)(*payload + *payload_len - buf);
#if DBG_PACKETIZE
PJ_LOG(3, ("h264pack", "Packetized fragmented H264 NAL unit "
@@ -242,7 +242,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetize(pjmedia_h264_packetizer *pktz,
/* Init the first NAL unit in the packet */
nal[0] = nal_start;
nal_size[0] = nal_end - nal_start;
- total_size = nal_size[0] + HEADER_SIZE_STAP_A;
+ total_size = (int)nal_size[0] + HEADER_SIZE_STAP_A;
NRI = (*nal_octet & 0x60) >> 5;
/* Populate next NAL units */
@@ -266,7 +266,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetize(pjmedia_h264_packetizer *pktz,
}
/* Update total payload size (2 octet NAL size + NAL) */
- total_size += (2 + nal_size[nal_cnt]);
+ total_size += (2 + (int)nal_size[nal_cnt]);
if (total_size <= pktz->cfg.mtu) {
pj_uint8_t tmp_nri;
@@ -306,7 +306,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetize(pjmedia_h264_packetizer *pktz,
*payload = nal[0] - HEADER_SIZE_STAP_A;
pj_assert(*payload >= buf+*pos);
*payload_len = p - *payload;
- *pos = nal[nal_cnt-1] + nal_size[nal_cnt-1] - buf;
+ *pos = (unsigned)(nal[nal_cnt-1] + nal_size[nal_cnt-1] - buf);
#if DBG_PACKETIZE
PJ_LOG(3, ("h264pack", "Packetized aggregation of "
@@ -321,7 +321,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetize(pjmedia_h264_packetizer *pktz,
/* Single NAL unit packet */
*payload = nal_start;
*payload_len = nal_end - nal_start;
- *pos = nal_end - buf;
+ *pos = (unsigned)(nal_end - buf);
#if DBG_PACKETIZE
PJ_LOG(3, ("h264pack", "Packetized single H264 NAL unit "
@@ -399,7 +399,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_unpacketize(pjmedia_h264_packetizer *pktz,
p += payload_len;
/* Update the bitstream writing offset */
- *bits_pos = p - bits;
+ *bits_pos = (unsigned)(p - bits);
pktz->unpack_last_sync_pos = *bits_pos;
#if DBG_UNPACKETIZE
@@ -450,7 +450,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_unpacketize(pjmedia_h264_packetizer *pktz,
++cnt;
/* Update the bitstream writing offset */
- *bits_pos = p - bits;
+ *bits_pos = (unsigned)(p - bits);
pktz->unpack_last_sync_pos = *bits_pos;
}
@@ -509,7 +509,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_unpacketize(pjmedia_h264_packetizer *pktz,
p += (payload_len - 2);
/* Update the bitstream writing offset */
- *bits_pos = p - bits;
+ *bits_pos = (unsigned)(p - bits);
if (E) {
/* Update the sync pos only if the end bit flag is set */
pktz->unpack_last_sync_pos = *bits_pos;
diff --git a/pjmedia/src/pjmedia-codec/ilbc.c b/pjmedia/src/pjmedia-codec/ilbc.c
index c595477f..3a79ae33 100644
--- a/pjmedia/src/pjmedia-codec/ilbc.c
+++ b/pjmedia/src/pjmedia-codec/ilbc.c
@@ -668,7 +668,7 @@ static pj_status_t ilbc_codec_encode(pjmedia_codec *codec,
{
struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
pj_int16_t *pcm_in;
- unsigned nsamples;
+ pj_size_t nsamples;
#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
UInt32 npackets;
OSStatus err;
diff --git a/pjmedia/src/pjmedia-codec/speex_codec.c b/pjmedia/src/pjmedia-codec/speex_codec.c
index d5cc0a57..ab9b509a 100644
--- a/pjmedia/src/pjmedia-codec/speex_codec.c
+++ b/pjmedia/src/pjmedia-codec/speex_codec.c
@@ -840,7 +840,7 @@ static pj_status_t spx_codec_parse( pjmedia_codec *codec,
samples_per_frame=spx_factory.speex_param[spx->param_id].samples_per_frame;
/* Copy the data into the speex bit-stream */
- speex_bits_read_from(&spx->dec_bits, (char*)pkt, pkt_size);
+ speex_bits_read_from(&spx->dec_bits, (char*)pkt, (int)pkt_size);
while (speex_get_next_frame(&spx->dec_bits) == 0 &&
spx->dec_bits.charPtr != char_ptr)
@@ -877,7 +877,7 @@ static pj_status_t spx_codec_encode( pjmedia_codec *codec,
unsigned samples_per_frame;
int tx = 0;
spx_int16_t *pcm_in = (spx_int16_t*)input->buf;
- unsigned nsamples;
+ pj_size_t nsamples;
spx = (struct spx_private*) codec->codec_data;
@@ -952,7 +952,7 @@ static pj_status_t spx_codec_decode( pjmedia_codec *codec,
}
/* Copy the data into the bit-stream struct */
- speex_bits_read_from(&spx->dec_bits, (char*)input->buf, input->size);
+ speex_bits_read_from(&spx->dec_bits, (char*)input->buf, (int)input->size);
/* Set Speex dec_bits pointer to the start bit of the frame */
speex_bits_advance(&spx->dec_bits, input->bit_info);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 19:33:47 +0000