@@ -3305,7 +3305,7 @@ PJ_DEF(pjsua_conf_port_id) pjsua_avi_player_get_conf_port(
33053305{
33063306 PJ_ASSERT_RETURN (id >= 0 && id < (int )PJ_ARRAY_SIZE (pjsua_var .avi_player ),
33073307 PJSUA_INVALID_ID );
3308- PJ_ASSERT_RETURN (strm_idx >= 0 , PJSUA_INVALID_ID );
3308+ PJ_ASSERT_RETURN (strm_idx < PJSUA_MAX_AVI_NUM_STREAMS , PJSUA_INVALID_ID );
33093309
33103310 switch (strm_type ) {
33113311 case PJMEDIA_TYPE_AUDIO :
@@ -3330,19 +3330,18 @@ PJ_DEF(pj_status_t) pjsua_avi_player_get_port(pjsua_avi_player_id id,
33303330{
33313331 pj_status_t status = PJ_SUCCESS ;
33323332 PJ_ASSERT_RETURN (id >= 0 && id < (int )PJ_ARRAY_SIZE (pjsua_var .avi_player ),
3333- PJ_EINVAL );
3333+ PJ_EINVAL );
3334+ PJ_ASSERT_RETURN (strm_idx < PJSUA_MAX_AVI_NUM_STREAMS , PJSUA_INVALID_ID );
33343335
33353336 switch (strm_type ) {
33363337 case PJMEDIA_TYPE_AUDIO :
3337- PJ_ASSERT_RETURN (strm_idx >= 0 &&
3338- strm_idx < pjsua_var .avi_player [id ].aud_cnt ,
3338+ PJ_ASSERT_RETURN (strm_idx < pjsua_var .avi_player [id ].aud_cnt ,
33393339 PJSUA_INVALID_ID );
33403340
33413341 * p_port = pjsua_var .avi_player [id ].port [AUD_IDX (id , strm_idx )];
33423342 break ;
33433343 case PJMEDIA_TYPE_VIDEO :
3344- PJ_ASSERT_RETURN (strm_idx >= 0 &&
3345- strm_idx < pjsua_var .avi_player [id ].vid_cnt ,
3344+ PJ_ASSERT_RETURN (strm_idx < pjsua_var .avi_player [id ].vid_cnt ,
33463345 PJSUA_INVALID_ID );
33473346
33483347 * p_port = pjsua_var .avi_player [id ].port [strm_idx ];
@@ -3356,7 +3355,7 @@ PJ_DEF(pj_status_t) pjsua_avi_player_get_port(pjsua_avi_player_id id,
33563355PJ_DECL (pj_status_t ) pjsua_avi_player_destroy (pjsua_avi_player_id id )
33573356{
33583357 PJ_ASSERT_RETURN (id >= 0 && id < (int )PJ_ARRAY_SIZE (pjsua_var .avi_player ),
3359- PJ_EINVAL );
3358+ PJ_EINVAL );
33603359
33613360 PJ_LOG (4 , (THIS_FILE , "Destroying avi file player %d.." , id ));
33623361 pj_log_push_indent ();
@@ -3518,7 +3517,8 @@ PJ_DEF(pj_status_t) pjsua_avi_recorder_create(const pj_str_t *filename,
35183517 } else {
35193518 fmt [1 ] = * aud_fmt ;
35203519 }
3521- status = pjmedia_avi_writer_create_streams (pool , filename -> ptr , max_size ,
3520+ status = pjmedia_avi_writer_create_streams (pool , filename -> ptr ,
3521+ (pj_uint32_t )max_size ,
35223522 2 , fmt , options , & streams );
35233523 if (status != PJ_SUCCESS )
35243524 goto on_return ;
@@ -3584,11 +3584,15 @@ PJ_DEF(pj_status_t) pjsua_avi_recorder_get_port(pjsua_avi_rec_id id,
35843584
35853585 switch (strm_type ) {
35863586 case PJMEDIA_TYPE_AUDIO :
3587- p_port = & pjsua_var .avi_recorder [id ].aud_port ;
3587+ * p_port = pjsua_var .avi_recorder [id ].aud_port ;
3588+ break ;
35883589 case PJMEDIA_TYPE_VIDEO :
3589- p_port = & pjsua_var .avi_recorder [id ].vid_port ;
3590+ * p_port = pjsua_var .avi_recorder [id ].vid_port ;
3591+ break ;
35903592 default :
3593+ * p_port = NULL ;
35913594 status = PJ_ENOTFOUND ;
3595+ break ;
35923596 }
35933597 return status ;
35943598}
@@ -3605,7 +3609,7 @@ PJ_DEF(pj_status_t) pjsua_avi_recorder_set_cb(pjsua_avi_rec_id id,
36053609 pjsua_var .avi_recorder [id ].cb = cb ;
36063610 pjsua_var .avi_recorder [id ].user_data = user_data ;
36073611 pjmedia_avi_streams_set_cb (pjsua_var .avi_recorder [id ].avi_streams ,
3608- (void * )id , & avi_writer_cb );
3612+ (void * )( intptr_t ) id , & avi_writer_cb );
36093613 }
36103614
36113615 return PJ_SUCCESS ;
0 commit comments