@@ -3781,8 +3781,8 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia/vid_tee.c pjsip/pjmedia/src/pjmedia
37813781 if (tee->buf_pool)
37823782 pj_pool_release(tee->buf_pool);
37833783diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/src/pjmedia-audiodev/alsa_dev.c
3784- --- pjproject-2.10 /pjmedia/src/pjmedia-audiodev/alsa_dev.c 2020-02-14 10:48:27 .000000000 +0100
3785- +++ pjsip/pjmedia/src/pjmedia-audiodev/alsa_dev.c 2021-02-06 23:08:42.203153000 +0100
3784+ --- pjproject-2.11 /pjmedia/src/pjmedia-audiodev/alsa_dev.c 2021-03-17 08:34:46 .000000000 +0100
3785+ +++ pjsip/pjmedia/src/pjmedia-audiodev/alsa_dev.c 2026-01-22 16:58:14.647578243 +0100
37863786@@ -43,7 +43,7 @@
37873787 #define ALSASOUND_CAPTURE 2
37883788 #define MAX_SOUND_CARDS 5
@@ -4015,7 +4015,16 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
40154015 SND_PCM_STREAM_PLAYBACK,
40164016 0);
40174017 if (result < 0)
4018- @@ -722,7 +794,7 @@
4018+ @@ -677,7 +749,7 @@
4019+ if (result < 0) {
4020+ PJ_LOG (3,(THIS_FILE, "Unable to set a channel count of %d for "
4021+ "playback device '%s'", param->channel_count,
4022+ - stream->af->devs[param->play_id].name));
4023+ + stream->af->devs[param->play_id].alsa_name));
4024+ snd_pcm_close (stream->pb_pcm);
4025+ return PJMEDIA_EAUD_SYSERR;
4026+ }
4027+ @@ -734,7 +806,7 @@
40194028
40204029 PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for playing, sample rate=%d"
40214030 ", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
@@ -4024,7 +4033,7 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
40244033 rate, param->channel_count,
40254034 param->bits_per_sample, stream->pb_frames,
40264035 (int)stream->param.output_latency_ms));
4027- @@ -746 ,9 +818 ,9 @@
4036+ @@ -758 ,9 +830 ,9 @@
40284037
40294038 /* Open PCM for capture */
40304039 PJ_LOG (5,(THIS_FILE, "open_capture: Open capture device '%s'",
@@ -4036,7 +4045,16 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
40364045 SND_PCM_STREAM_CAPTURE,
40374046 0);
40384047 if (result < 0)
4039- @@ -842,7 +914,7 @@
4048+ @@ -809,7 +881,7 @@
4049+ if (result < 0) {
4050+ PJ_LOG (3,(THIS_FILE, "Unable to set a channel count of %d for "
4051+ "capture device '%s'", param->channel_count,
4052+ - stream->af->devs[param->rec_id].name));
4053+ + stream->af->devs[param->rec_id].alsa_name));
4054+ snd_pcm_close (stream->ca_pcm);
4055+ return PJMEDIA_EAUD_SYSERR;
4056+ }
4057+ @@ -866,7 +938,7 @@
40404058
40414059 PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for capture, sample rate=%d"
40424060 ", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
@@ -4045,7 +4063,7 @@ diff -ruN pjproject-2.10/pjmedia/src/pjmedia-audiodev/alsa_dev.c pjsip/pjmedia/s
40454063 rate, param->channel_count,
40464064 param->bits_per_sample, stream->ca_frames,
40474065 (int)stream->param.input_latency_ms));
4048- @@ -903 ,6 +975 ,27 @@
4066+ @@ -927 ,6 +999 ,27 @@
40494067 return PJ_SUCCESS;
40504068 }
40514069
0 commit comments