Expand codec bitfield from 32 bits to 64 bits.

Reviewboard: https://reviewboard.asterisk.org/r/416/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@227580 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 10 insertions, 10 deletions

diff --git a/apps/app_fax.c b/apps/app_fax.c
index 39e00641a..6f6111639 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -180,7 +180,7 @@ static int t38_tx_packet_handler(t38_core_state_t *s, void *user_data, const uin
 
 	struct ast_frame outf = {
 		.frametype = AST_FRAME_MODEM,
-		.subclass = AST_MODEM_T38,
+		.subclass.integer = AST_MODEM_T38,
 		.src = __FUNCTION__,
 	};
 
@@ -327,7 +327,7 @@ static int fax_generator_generate(struct ast_channel *chan, void *data, int len,
     
 	struct ast_frame outf = {
 		.frametype = AST_FRAME_VOICE,
-		.subclass = AST_FORMAT_SLINEAR,
+		.subclass.codec = AST_FORMAT_SLINEAR,
 		.src = __FUNCTION__,
 	};
 
@@ -413,7 +413,7 @@ static int transmit_audio(fax_session *s)
 					return -1;
 				}
 				if ((inf->frametype == AST_FRAME_CONTROL) &&
-				    (inf->subclass == AST_CONTROL_T38_PARAMETERS) &&
+				    (inf->subclass.integer == AST_CONTROL_T38_PARAMETERS) &&
 				    (inf->datalen == sizeof(t38_parameters))) {
 					struct ast_control_t38_parameters *parameters = inf->data.ptr;
 					
@@ -517,12 +517,12 @@ static int transmit_audio(fax_session *s)
 			break;
 		}
 
-		ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen);
+		ast_debug(10, "frame %d/%llu, len=%d\n", inf->frametype, (unsigned long long) inf->subclass.codec, inf->datalen);
 
 		/* Check the frame type. Format also must be checked because there is a chance
 		   that a frame in old format was already queued before we set channel format
 		   to slinear so it will still be received by ast_read */
-		if (inf->frametype == AST_FRAME_VOICE && inf->subclass == AST_FORMAT_SLINEAR) {
+		if (inf->frametype == AST_FRAME_VOICE && inf->subclass.codec == AST_FORMAT_SLINEAR) {
 			if (fax_rx(&fax, inf->data.ptr, inf->samples) < 0) {
 				/* I know fax_rx never returns errors. The check here is for good style only */
 				ast_log(LOG_WARNING, "fax_rx returned error\n");
@@ -534,7 +534,7 @@ static int transmit_audio(fax_session *s)
 				last_state = t30state->state;
 			}
 		} else if ((inf->frametype == AST_FRAME_CONTROL) &&
-			   (inf->subclass == AST_CONTROL_T38_PARAMETERS)) {
+			   (inf->subclass.integer == AST_CONTROL_T38_PARAMETERS)) {
 			struct ast_control_t38_parameters *parameters = inf->data.ptr;
 
 			if (parameters->request_response == AST_T38_NEGOTIATED) {
@@ -678,15 +678,15 @@ static int transmit_t38(fax_session *s)
 			break;
 		}
 
-		ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass, inf->datalen);
+		ast_debug(10, "frame %d/%d, len=%d\n", inf->frametype, inf->subclass.integer, inf->datalen);
 
-		if (inf->frametype == AST_FRAME_MODEM && inf->subclass == AST_MODEM_T38) {
+		if (inf->frametype == AST_FRAME_MODEM && inf->subclass.integer == AST_MODEM_T38) {
 			t38_core_rx_ifp_packet(t38state, inf->data.ptr, inf->datalen, inf->seqno);
 			if (last_state != t30state->state) {
 				state_change = ast_tvnow();
 				last_state = t30state->state;
 			}
-		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass == AST_CONTROL_T38_PARAMETERS) {
+		} else if (inf->frametype == AST_FRAME_CONTROL && inf->subclass.integer == AST_CONTROL_T38_PARAMETERS) {
 			struct ast_control_t38_parameters *parameters = inf->data.ptr;
 			if (parameters->request_response == AST_T38_TERMINATED) {
 				ast_debug(1, "T38 down, finishing\n");
@@ -733,7 +733,7 @@ disable_t38:
 					return -1;
 				}
 				if ((inf->frametype == AST_FRAME_CONTROL) &&
-				    (inf->subclass == AST_CONTROL_T38_PARAMETERS) &&
+				    (inf->subclass.integer == AST_CONTROL_T38_PARAMETERS) &&
 				    (inf->datalen == sizeof(t38_parameters))) {
 					struct ast_control_t38_parameters *parameters = inf->data.ptr;