[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r301843 - /team/dvossel/fixt...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Jan 14 13:34:18 2011
New Revision: 301843

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301843
Log:
all required updates to funcs/ directory

Modified:
    team/dvossel/fixtheworld_phase1_step3/funcs/func_frame_trace.c
    team/dvossel/fixtheworld_phase1_step3/funcs/func_pitchshift.c

Modified: team/dvossel/fixtheworld_phase1_step3/funcs/func_frame_trace.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/funcs/func_frame_trace.c?view=diff&rev=301843&r1=301842&r2=301843
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/funcs/func_frame_trace.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/funcs/func_frame_trace.c Fri Jan 14 13:34:18 2011
@@ -209,14 +209,14 @@
 		break;
 	case AST_FRAME_VOICE:
 		ast_verbose("FrameType: VOICE\n");
-		ast_verbose("Codec: %s\n", ast_getformatname(frame->subclass.codec));
+		ast_verbose("Codec: %s\n", ast_getformatname(&frame->subclass.format));
 		ast_verbose("MS: %ld\n", frame->len);
 		ast_verbose("Samples: %d\n", frame->samples);
 		ast_verbose("Bytes: %d\n", frame->datalen);
 		break;
 	case AST_FRAME_VIDEO:
 		ast_verbose("FrameType: VIDEO\n");
-		ast_verbose("Codec: %s\n", ast_getformatname(frame->subclass.codec));
+		ast_verbose("Codec: %s\n", ast_getformatname(&frame->subclass.format));
 		ast_verbose("MS: %ld\n", frame->len);
 		ast_verbose("Samples: %d\n", frame->samples);
 		ast_verbose("Bytes: %d\n", frame->datalen);

Modified: team/dvossel/fixtheworld_phase1_step3/funcs/func_pitchshift.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/funcs/func_pitchshift.c?view=diff&rev=301843&r1=301842&r2=301843
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/funcs/func_pitchshift.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/funcs/func_pitchshift.c Fri Jan 14 13:34:18 2011
@@ -170,8 +170,8 @@
 	}
 	if ((audiohook->status == AST_AUDIOHOOK_STATUS_DONE) ||
 		(f->frametype != AST_FRAME_VOICE) ||
-		((f->subclass.codec != AST_FORMAT_SLINEAR) &&
-		(f->subclass.codec != AST_FORMAT_SLINEAR16))) {
+		((f->subclass.format.id != AST_FORMAT_SLINEAR) &&
+		(f->subclass.format.id != AST_FORMAT_SLINEAR16))) {
 		return -1;
 	}
 
@@ -481,7 +481,7 @@
 		return 0;
 	}
 	for (samples = 0; samples < f->samples; samples += 32) {
-		smb_pitch_shift(amount, 32, MAX_FRAME_LENGTH, 32, ast_format_rate(f->subclass.codec), fun+samples, fun+samples, fft);
+		smb_pitch_shift(amount, 32, MAX_FRAME_LENGTH, 32, ast_format_rate(&f->subclass.format), fun+samples, fun+samples, fft);
 	}
 
 	return 0;