1 files changed, 43 insertions, 54 deletions

diff --git a/src/libac3/sanity_check.c b/src/libac3/sanity_check.c
index ef0af0bd2..199fe6b4c 100644
--- a/src/libac3/sanity_check.c
+++ b/src/libac3/sanity_check.c
@@ -21,10 +21,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include "ac3.h"
@@ -32,97 +28,90 @@
 #include "sanity_check.h"
 
 
-/**
- *
- **/
-
-void sanity_check_init(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
+void 
+sanity_check_init(ac3_state_t * state, audblk_t *audblk)
 {
-	syncinfo->magic = AC3_MAGIC_NUMBER;
-	bsi->magic = AC3_MAGIC_NUMBER;
-	audblk->magic1 = AC3_MAGIC_NUMBER;
-	audblk->magic2 = AC3_MAGIC_NUMBER;
-	audblk->magic3 = AC3_MAGIC_NUMBER;
+    audblk->magic1 = AC3_MAGIC_NUMBER;
+    audblk->magic2 = AC3_MAGIC_NUMBER;
+    audblk->magic3 = AC3_MAGIC_NUMBER;
 }
 
-
-/**
- *
- **/
-
-int sanity_check(syncinfo_t *syncinfo, bsi_t *bsi, audblk_t *audblk)
+void 
+sanity_check(ac3_state_t * state, audblk_t *audblk)
 {
 	int i;
 
-	if(syncinfo->magic != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- syncinfo magic number **");
-		return -1;
-	}
-	
-	if(bsi->magic != AC3_MAGIC_NUMBER) {
-		fprintf(stderr,"\n** Sanity check failed -- bsi magic number **");
-		return -1;
-	}
-
-	if(audblk->magic1 != AC3_MAGIC_NUMBER) {
+	if(audblk->magic1 != AC3_MAGIC_NUMBER)
+	{
 		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 1 **"); 
-		return -1;
+		error_flag = 1;
 	}
 
-	if(audblk->magic2 != AC3_MAGIC_NUMBER) {
+	if(audblk->magic2 != AC3_MAGIC_NUMBER)
+	{
 		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 2 **"); 
-		return -1;
+		error_flag = 1;
 	}
 
-	if(audblk->magic3 != AC3_MAGIC_NUMBER) {
+	if(audblk->magic3 != AC3_MAGIC_NUMBER)
+	{
 		fprintf(stderr,"\n** Sanity check failed -- audblk magic number 3 **"); 
-		return -1;
+		error_flag = 1;
 	}
 
-	for(i = 0;i < 5 ; i++) {
+	for(i = 0;i < 5 ; i++)
+	{
 		if (audblk->fbw_exp[i][255] !=0 || audblk->fbw_exp[i][254] !=0 || 
-				audblk->fbw_exp[i][253] !=0) {
+				audblk->fbw_exp[i][253] !=0)
+		{
 			fprintf(stderr,"\n** Sanity check failed -- fbw_exp out of bounds **"); 
-			return -1;
+			error_flag = 1;
 		}
 
 		if (audblk->fbw_bap[i][255] !=0 || audblk->fbw_bap[i][254] !=0 || 
-				audblk->fbw_bap[i][253] !=0) {
+				audblk->fbw_bap[i][253] !=0)
+		{
 			fprintf(stderr,"\n** Sanity check failed -- fbw_bap out of bounds **"); 
-			return -1;
+			error_flag = 1;
 		}
 
 	}
 
 	if (audblk->cpl_exp[255] !=0 || audblk->cpl_exp[254] !=0 || 
-			audblk->cpl_exp[253] !=0) {
+			audblk->cpl_exp[253] !=0)
+	{
 		fprintf(stderr,"\n** Sanity check failed -- cpl_exp out of bounds **"); 
-		return -1;
+		error_flag = 1;
 	}
 
 	if (audblk->cpl_bap[255] !=0 || audblk->cpl_bap[254] !=0 || 
-			audblk->cpl_bap[253] !=0) {
+			audblk->cpl_bap[253] !=0)
+	{
 		fprintf(stderr,"\n** Sanity check failed -- cpl_bap out of bounds **"); 
-		return -1;
+		error_flag = 1;
 	}
 
-	if (audblk->cpl_flt[255] !=0 || audblk->cpl_flt[254] !=0 || 
-			audblk->cpl_flt[253] !=0) {
+	if (audblk->cplmant[255] !=0 || audblk->cplmant[254] !=0 || 
+			audblk->cplmant[253] !=0)
+	{
 		fprintf(stderr,"\n** Sanity check failed -- cpl_mant out of bounds **"); 
-		return -1;
+		error_flag = 1;
 	}
 
-	if ((audblk->cplinu == 1) && (audblk->cplbegf > (audblk->cplendf+2))) {
+	if ((audblk->cplinu == 1) && (audblk->cplbegf > (audblk->cplendf+2)))
+	{
 		fprintf(stderr,"\n** Sanity check failed -- cpl params inconsistent **"); 
-		return -1;
+		error_flag = 1;
 	}
 
-	for(i=0; i < bsi->nfchans; i++) {
-		if((audblk->chincpl[i] == 0) && (audblk->chbwcod[i] > 60)) {
+	for(i=0; i < state->nfchans; i++)
+	{
+		if((audblk->chincpl[i] == 0) && (audblk->chbwcod[i] > 60))
+		{
 			fprintf(stderr,"\n** Sanity check failed -- chbwcod too big **"); 
-			return -1;
+			error_flag = 1;
 		}
 	}
 
-	return 0;
+	return;
 }