[Pkg-voip-commits] [mediastreamer2] 09/18: debian/patches/fix-spelling-errors.patch: fix more spelling mistakes

Johannes Schauer josch-guest at moszumanska.debian.org
Mon Apr 24 15:59:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository mediastreamer2.

commit 961815dcf8b95e9745d54d25afb40dbd8b30e412
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 17:06:28 2017 +0200

    debian/patches/fix-spelling-errors.patch: fix more spelling mistakes
---
 debian/patches/fix-spelling-errors.patch | 234 ++++++++++++++++++++++++++++++-
 1 file changed, 233 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 91db7ff..abd6ae0 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -15,9 +15,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  			}
  		}
  		if (!(*flags & VPX_EFLAG_FORCE_KF)){
+@@ -1046,7 +1046,7 @@ static int dec_freeze_on_error(MSFilter
+ 
+ static int dec_reset(MSFilter *f, void *data) {
+ 	DecState *s = (DecState *)f->data;
+-	ms_message("Reseting VP8 decoder");
++	ms_message("Resetting VP8 decoder");
+ 	ms_filter_lock(f);
+ 	vpx_codec_destroy(&s->codec);
+ 	if (dec_initialize_impl(f) != 0){
 --- a/src/crypto/ms_srtp.c
 +++ b/src/crypto/ms_srtp.c
-@@ -569,6 +569,6 @@ const char * ms_srtp_stream_type_to_stri
+@@ -571,6 +571,6 @@ const char * ms_srtp_stream_type_to_stri
  	case MSSRTP_RTCP_STREAM: return "MSSRTP_RTCP_STREAM";
  	case MSSRTP_ALL_STREAMS: return "MSSRTP_ALL_STREAMS";
  	}
@@ -25,3 +34,226 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +	return "Unknown srtp tream type";
  }
  
+--- a/src/audiofilters/genericplc.h
++++ b/src/audiofilters/genericplc.h
+@@ -26,7 +26,7 @@
+ /* 2/<min frequency we want to be able to reproduce> gives then length in seconds */
+ #define PLC_BUFFER_LEN	2/40
+ 
+-/* define in ms the maximum duration of PLC(after wich the output will be 0), and after how long we start decreasing the output volume to reach 0 at MAX_PLC_LEN */
++/* define in ms the maximum duration of PLC(after which the output will be 0), and after how long we start decreasing the output volume to reach 0 at MAX_PLC_LEN */
+ #define PLC_DECREASE_START 100
+ #define MAX_PLC_LEN 150
+ 
+--- a/src/crypto/dtls_srtp.c
++++ b/src/crypto/dtls_srtp.c
+@@ -232,7 +232,7 @@ static void schedule_rtcp(struct _RtpTra
+ }
+ /**
+  * Check if the incoming message is a DTLS packet.
+- * If it is, store it in the context incoming buffer and call the polarssl function wich will process it.
++ * If it is, store it in the context incoming buffer and call the polarssl function which will process it.
+  * This function also manages the client retransmission timer
+  *
+  * @param[in] 		msg	the incoming message
+@@ -533,7 +533,7 @@ static int ms_dtls_srtp_rtp_process_on_r
+ 			}
+ 
+ 			if (ctx->role != MSDtlsSrtpRoleIsServer) { /* close the connection only if we are client, if we are server, the client may ask again for last packets */
+-				/*FireFox version 43 requires DTLS channel to be kept openned, probably a bug in FireFox ret = ssl_close_notify( &(ctx->rtp_dtls_context->ssl) );*/
++				/*FireFox version 43 requires DTLS channel to be kept opened, probably a bug in FireFox ret = ssl_close_notify( &(ctx->rtp_dtls_context->ssl) );*/
+ 				
+ 			}
+ 
+@@ -614,7 +614,7 @@ static int ms_dtls_srtp_rtcp_process_on_
+ 			}
+ 
+ 			if (ctx->role != MSDtlsSrtpRoleIsServer) { /* close the connection only if we are client, if we are server, the client may ask again for last packets */
+-			/*FireFox version 43 requires DTLS channel to be kept openned, probably a bug in FireFox  ret = ssl_close_notify( &(ctx->rtcp_dtls_context->ssl) );*/
++			/*FireFox version 43 requires DTLS channel to be kept opened, probably a bug in FireFox  ret = ssl_close_notify( &(ctx->rtcp_dtls_context->ssl) );*/
+ 			}
+ 		}
+ 
+@@ -734,7 +734,7 @@ void ms_dtls_srtp_set_peer_fingerprint(M
+ 		size_t peer_fingerprint_length = strlen(peer_fingerprint)+1; // include the null termination
+ 		if (peer_fingerprint_length>sizeof(context->peer_fingerprint)) {
+ 			memcpy(context->peer_fingerprint, peer_fingerprint, sizeof(context->peer_fingerprint));
+-			ms_error("DTLS-SRTP received from SDP INVITE a peer fingerprint %d bytes length wich is longer than maximum storage %d bytes", (int)peer_fingerprint_length, (int)sizeof(context->peer_fingerprint));
++			ms_error("DTLS-SRTP received from SDP INVITE a peer fingerprint %d bytes length which is longer than maximum storage %d bytes", (int)peer_fingerprint_length, (int)sizeof(context->peer_fingerprint));
+ 		} else {
+ 			memcpy(context->peer_fingerprint, peer_fingerprint, peer_fingerprint_length);
+ 		}
+--- a/src/filter-template.c
++++ b/src/filter-template.c
+@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+  * filters.                                                                   *
+  * The procedure to follow to create a new filter is to:                      *
+  *  1. Copy this file to the file that will be your new filter                *
+- *  2. Replace any "MyFilter" and "my_filter" occurences to the name that     *
++ *  2. Replace any "MyFilter" and "my_filter" occurrences to the name that    *
+  *     suits your new filter                                                  *
+  *  3. Fill in the blanks where are located comments beginning with           *
+  *     FILTER_TODO                                                            *
+--- a/src/otherfilters/msrtp.c
++++ b/src/otherfilters/msrtp.c
+@@ -687,7 +687,7 @@ static void receiver_process(MSFilter *
+ 		return;
+ 	
+ 	if (d->reset_jb){
+-		ms_message("Reseting jitter buffer");
++		ms_message("Resetting jitter buffer");
+ 		rtp_session_resync(d->session);
+ 		d->reset_jb=FALSE;
+ 	}
+--- a/src/utils/audiodiff.c
++++ b/src/utils/audiodiff.c
+@@ -284,7 +284,7 @@ static int _ms_audio_diff_chunked(FileIn
+ 	*ret = cum_res / (double)tot_energy;
+ 	ms_message("Similarity factor weighted with most significant chunks is [%g]", *ret);
+ 	*ret = *ret * (1-variance);
+-	ms_message("After integrating max position variance accross chunks, it is [%g]", *ret);
++	ms_message("After integrating max position variance across chunks, it is [%g]", *ret);
+ 	ms_free(chunk_energies);
+ 	ms_free(max_pos_table);
+ 	return maxpos;
+--- a/src/videofilters/bb10_capture.cpp
++++ b/src/videofilters/bb10_capture.cpp
+@@ -93,7 +93,7 @@ typedef struct BB10Capture {
+ 	bool_t is_front_cam;
+ 	const char *window_group;
+ 	const char *window_id;
+-	bool_t camera_openned;
++	bool_t camera_opened;
+ 	bool_t capture_started;
+ 	MSAverageFPS avgfps;
+ 	MSYuvBufAllocator *yba;
+@@ -125,8 +125,8 @@ static void bb10capture_video_callback(c
+ static void bb10capture_open_camera(BB10Capture *d) {
+ 	camera_error_t error;
+ 	
+-	if (d->camera_openned) {
+-		ms_warning("[bb10_capture] camera already openned, skipping...");
++	if (d->camera_opened) {
++		ms_warning("[bb10_capture] camera already opened, skipping...");
+ 		return;
+ 	}
+ 	
+@@ -150,15 +150,15 @@ static void bb10capture_open_camera(BB10
+ 		camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_ROTATION, rotation);
+ 		ms_debug("[bb10_capture] camera capture rotation: %i", rotation);
+ 	
+-		d->camera_openned = TRUE;
++		d->camera_opened = TRUE;
+ 	} else {
+ 		ms_error("[bb10_capture] openning %i camera failed: %s", d->camera, error_to_string(error));
+ 	}
+ }
+ 
+ static void bb10capture_start_capture(BB10Capture *d) {
+-	if (!d->camera_openned) {
+-		ms_error("[bb10_capture] camera not openned, skipping...");
++	if (!d->camera_opened) {
++		ms_error("[bb10_capture] camera not opened, skipping...");
+ 		return;
+ 	}
+ 	if (d->capture_started) {
+@@ -186,13 +186,13 @@ static void bb10capture_stop_capture(BB1
+ }
+ 
+ static void bb10capture_close_camera(BB10Capture *d) {
+-	if (!d->camera_openned) {
+-		ms_warning("[bb10_capture] camera not openned, skipping...");
++	if (!d->camera_opened) {
++		ms_warning("[bb10_capture] camera not opened, skipping...");
+ 		return;
+ 	}
+ 	
+ 	camera_close(d->cam_handle);
+-	d->camera_openned = FALSE;
++	d->camera_opened = FALSE;
+ 	d->cam_handle = 0;
+ 	ms_debug("[bb10_capture] camera closed");
+ }
+@@ -202,7 +202,7 @@ static void bb10capture_init(MSFilter *f
+ 	MSVideoSize def_size;
+ 	
+ 	d->rotation = 0;
+-	d->camera_openned = FALSE;
++	d->camera_opened = FALSE;
+ 	d->capture_started = FALSE;
+ 	d->is_front_cam = TRUE;
+ 	def_size.width = MS_VIDEO_SIZE_QVGA_W;
+@@ -234,7 +234,7 @@ static void bb10capture_uninit(MSFilter
+ static void bb10capture_preprocess(MSFilter *f) {
+ 	BB10Capture *d = (BB10Capture*) f->data;
+ 	
+-	if (!d->camera_openned) {
++	if (!d->camera_opened) {
+ 		bb10capture_open_camera(d);
+ 	}
+ 	
+@@ -282,11 +282,11 @@ static int bb10capture_set_vsize(MSFilte
+ 	
+ 	ms_filter_lock(f);
+ 	
+-	if (!d->camera_openned) {
++	if (!d->camera_opened) {
+ 		bb10capture_open_camera(d);
+ 	}
+ 	
+-	if (d->camera_openned) {
++	if (d->camera_opened) {
+ 		camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_WIDTH, newSize.width, CAMERA_IMGPROP_HEIGHT, newSize.height);
+ 		camera_get_vf_property(d->cam_handle, CAMERA_IMGPROP_WIDTH, &(d->vsize.width), CAMERA_IMGPROP_HEIGHT, &(d->vsize.height));
+ 		if (ms_video_size_equal(d->vsize, newSize)) {
+@@ -318,7 +318,7 @@ static int bb10capture_set_fps(MSFilter
+ 	ms_filter_lock(f);
+ 	d->framerate = *(float*)arg;
+ 	
+-	if (d->camera_openned) {
++	if (d->camera_opened) {
+ 		if (d->framerate > 0) {
+ 			camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_VARIABLEFRAMERATE, 1);
+ 			camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_MINFRAMERATE, (double)d->framerate, CAMERA_IMGPROP_FRAMERATE, (double)d->framerate);
+@@ -379,7 +379,7 @@ static int bb10capture_set_device_rotati
+ 		rotation = 360 - d->rotation;
+ 	}
+ 	
+-	if (d->camera_openned) {
++	if (d->camera_opened) {
+ 		camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_ROTATION, rotation);
+ 	}
+ 	ms_debug("[bb10_capture] device rotation changed: %i", d->rotation);
+--- a/src/videofilters/msv4l2.c
++++ b/src/videofilters/msv4l2.c
+@@ -666,7 +666,7 @@ static void *msv4l2_thread(void *ptr){
+ 	ms_message("msv4l2_thread starting");
+ 	if (s->fd==-1){
+ 		if( msv4l2_open(s)!=0){
+-			ms_warning("msv4l2 could not be openned");
++			ms_warning("msv4l2 could not be opened");
+ 			goto close;
+ 		}
+ 	}
+--- a/src/voip/audiostream.c
++++ b/src/voip/audiostream.c
+@@ -893,7 +893,7 @@ int audio_stream_start_from_io(AudioStre
+ 	}
+ 
+ 	/* sample rate is already set for rtpsend and rtprcv, check if we have to adjust it to */
+-	/* be able to use the echo canceller wich may be limited (webrtc aecm max frequency is 16000 Hz) */
++	/* be able to use the echo canceller which may be limited (webrtc aecm max frequency is 16000 Hz) */
+ 	// First check if we need to use the echo canceller
+ 	// Overide feature if not requested or done at sound card level
+ 	if ( ((stream->features & AUDIO_STREAM_FEATURE_EC) && !stream->use_ec) || has_builtin_ec )
+--- a/src/voip/msvideo.c
++++ b/src/voip/msvideo.c
+@@ -873,7 +873,7 @@ void ms_average_fps_init(MSAverageFPS* a
+ 	afps->mean_inter_frame = 0;
+ 	afps->context = ctx;
+ 	if (!ctx || strstr(ctx, "%f") == 0) {
+-		ms_error("Invalid MSAverageFPS context given '%s' (must be not null and must contain one occurence of '%%f'", ctx);
++		ms_error("Invalid MSAverageFPS context given '%s' (must be not null and must contain one occurrence of '%%f'", ctx);
+ 	}
+ }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/mediastreamer2.git



More information about the Pkg-voip-commits mailing list