From 49ba068d867849ec9abc36fed9baa4f384f2b966 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sun, 9 Mar 2014 18:07:30 +0100 Subject: add options to mot-encoder, cleanup --- src/mot-encoder.c | 781 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 479 insertions(+), 302 deletions(-) (limited to 'src/mot-encoder.c') diff --git a/src/mot-encoder.c b/src/mot-encoder.c index a60a39a..de4987e 100644 --- a/src/mot-encoder.c +++ b/src/mot-encoder.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "lib_crc.h" @@ -53,7 +54,7 @@ typedef struct { unsigned char rindex; // 4 bits /// Session header - Segment field unsigned char last; // 1 bit - unsigned short int segnum; // 16 bits + unsigned short int segnum; // 16 bits // Session header - User access field unsigned char rfa; // 3 bits unsigned char tidflag; // 1 bit @@ -62,7 +63,7 @@ typedef struct { // MSC data group data field // Mot Segmentation header unsigned char rcount; // 3 bits - unsigned short int seglen; // 13 bits + unsigned short int seglen; // 13 bits // Mot segment unsigned char* segdata; // MSC data group CRC @@ -79,75 +80,140 @@ unsigned char triggertime[5]; // 0x85 0x00 0x00 0x00 0x00 => NOW unsigned char contname[14]; // 0xCC 0x0C 0x00 imgXXXX.jpg } MOTSLIDEHDR; */ -int encodeFile (char* fname, int fidx, int padlen); -void createMotHeader(size_t blobsize, int fidx, char* mothdr, int* mothdrlen); -void createMscDG(MSCDG* msc, unsigned short int dgtype, unsigned short int cindex, unsigned short int lastseg, unsigned short int tid, unsigned char* data, unsigned short int datalen); +int encodeFile(int output_fd, char* fname, int fidx, int padlen); +void createMotHeader(size_t blobsize, int fidx, unsigned char* mothdr, int* mothdrlen); +void createMscDG(MSCDG* msc, unsigned short int dgtype, unsigned short int cindex, + unsigned short int lastseg, unsigned short int tid, unsigned char* data, + unsigned short int datalen); + void packMscDG(unsigned char* mscblob, MSCDG* msc, unsigned short int *bsize); -void writeMotPAD(unsigned char* mscdg, unsigned short int mscdgsize, unsigned short int padlen); +void writeMotPAD(int output_fd, + unsigned char* mscdg, + unsigned short int mscdgsize, + unsigned short int padlen); + void create_dls_datagroup (char* text, int padlen, unsigned char*** p_dlsdg, int* p_numdg); -void writeDLS(int padlen); +void writeDLS(int output_fd, int padlen); void usage(char* name) { - fprintf(stderr, "DAB MOT encoder\n" - "for slideshow and DLS\n\n" + fprintf(stderr, "DAB MOT encoder for slideshow and DLS\n\n" "By CSP Innovazione nelle ICT s.c.a r.l. (http://rd.csp.it/)\n\n" "Reads image data from the specified directory, and outputs PAD data\n" "on standard output\n" - "Reads DLS from /tmp/dls.file\n"); - fprintf(stderr, "Usage: %s \n", name); + "Reads DLS from /tmp/dls.file\n\n" + "WARNING: This program has memory leaks! Do not attempt\n" + "to leave it running for long periods of time!\n\n" + " http://opendigitalradio.org\n\n" + ); + fprintf(stderr, "Usage: %s [OPTIONS...]\n", name); + fprintf(stderr, " -d, --dir=DIRNAME Directory to read images from.\n" + " Mandatory.\n" + " -o, --output=FILENAME Fifo to write PAD data into.\n" + " Default: /tmp/pad.fifo\n" + " -t, --dls=FILENAME Fifo or file to read DLS text from.\n" + " Default: /tmp/dls.txt\n" + ); } -int main (int argc, char *argv[]) +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 +int main(int argc, char *argv[]) { - int len,fidx,ret; + int len, fidx, ret; struct dirent *pDirent; DIR *pDir; char imagepath[128]; - char dlstext[MAXDLS],dlstextprev[MAXDLS]; + char dlstext[MAXDLS], dlstextprev[MAXDLS]; int padlen=53; + char* dir = NULL; + char* output = "/tmp/pad.fifo"; + char* dls_file = "/tmp/dls.txt"; + + const struct option longopts[] = { + {"dir", required_argument, 0, 'd'}, + {"output", required_argument, 0, 'o'}, + {"dls", required_argument, 0, 't'}, + {"help", no_argument, 0, 'h'}, + {0,0,0,0}, + }; if (argc < 2) { + fprintf(stderr, "Error: too few arguments!\n"); usage(argv[0]); - return 0; + return 2; } + int ch=0; + int index; + while(ch != -1) { + ch = getopt_long(argc, argv, "hd:o:t:", longopts, &index); + switch (ch) { + case 'd': + dir = optarg; + break; + case 'o': + output = optarg; + break; + case 't': + dls_file = optarg; + break; + case '?': + case 'h': + usage(argv[0]); + return 0; + } + } + + if (!dir) { + fprintf(stderr, "Error: image directory not defined!\n"); + usage(argv[0]); + return 3; + } + + int output_fd = open(output, O_WRONLY); + MagickWandGenesis(); - fidx=0; + fidx = 0; while(1) { - pDir = opendir (argv[1]); + pDir = opendir(dir); if (pDir == NULL) { - printf ("Cannot open directory '%s'\n", argv[1]); + printf ("Cannot open directory '%s'\n", dir); return 1; } - if (fidx == 9999) fidx=0; + if (fidx == 9999) { + fidx = 0; + } + while ((pDirent = readdir(pDir)) != NULL) { - if (pDirent->d_name[0]!='.') { - sprintf (imagepath,"%s/%s",argv[1],pDirent->d_name); - ret=encodeFile(imagepath, fidx, padlen); - if (ret!=1) { - fprintf(stderr,"Error - Cannot encode file %s\n",pDirent->d_name); - } else { + if (pDirent->d_name[0] != '.') { + sprintf(imagepath, "%s/%s", dir, pDirent->d_name); + ret = encodeFile(output_fd, imagepath, fidx, padlen); + if (ret != 1) { + fprintf(stderr, "Error - Cannot encode file %s\n", pDirent->d_name); + } + else { fidx++; - writeDLS(padlen); + writeDLS(output_fd, padlen); sleep(10); } } } - closedir (pDir); + closedir(pDir); } return 1; } -int encodeFile (char* fname, int fidx, int padlen) +int encodeFile(int output_fd, char* fname, int fidx, int padlen) { - int fd=0,ret,mothdrlen,nseg,lastseglen,i,last,curseglen; + int fd=0, ret, mothdrlen, nseg, lastseglen, i, last, curseglen; unsigned char mothdr[32]; MagickWand *m_wand = NULL; PixelWand *p_wand = NULL; - size_t blobsize,height,width; + size_t blobsize, height, width; unsigned char *blob = NULL, *curseg = NULL; MagickBooleanType err; MSCDG msc; @@ -155,25 +221,25 @@ int encodeFile (char* fname, int fidx, int padlen) unsigned short int mscblobsize; //float aspectRatio; - m_wand = NewMagickWand(); p_wand = NewPixelWand(); - PixelSetColor(p_wand,"black"); + PixelSetColor(p_wand, "black"); - err = MagickReadImage(m_wand,fname); - if (err==MagickFalse) { - fprintf(stderr,"Error - Unable to load image %s\n",fname); - ret=0; + err = MagickReadImage(m_wand, fname); + if (err == MagickFalse) { + fprintf(stderr, "Error - Unable to load image %s\n", fname); + ret = 0; goto RETURN; } - height=MagickGetImageHeight(m_wand); - width=MagickGetImageWidth(m_wand); + height = MagickGetImageHeight(m_wand); + width = MagickGetImageWidth(m_wand); //aspectRatio = (width * 1.0)/height; - fprintf(stderr,"Image: %s (id=%d). Original size: %d x %d. ",fname,fidx,width,height); + fprintf(stderr, "Image: %s (id=%d). Original size: %zu x %zu. ", + fname, fidx, width, height); - while (height>240 || width>320) { + while (height > 240 || width > 320) { if (height/240.0 > width/320.0) { //width = height * aspectRatio; width = width * 240.0 / height; @@ -184,49 +250,52 @@ int encodeFile (char* fname, int fidx, int padlen) height = height * 320.0 / width; width = 320; } - MagickResizeImage(m_wand,width,height,LanczosFilter,1); + MagickResizeImage(m_wand, width, height, LanczosFilter, 1); } - height=MagickGetImageHeight(m_wand); - width=MagickGetImageWidth(m_wand); + height = MagickGetImageHeight(m_wand); + width = MagickGetImageWidth(m_wand); - MagickBorderImage(m_wand,p_wand,(320-width)/2,(240-height)/2); + MagickBorderImage(m_wand, p_wand, (320-width)/2, (240-height)/2); - MagickSetImageCompressionQuality(m_wand,75); - MagickSetImageFormat(m_wand,"jpg"); - blob=MagickGetImagesBlob(m_wand, &blobsize); - fprintf(stderr,"Resized to %d x %d. Size after compression %d bytes\n",width,height,blobsize); + MagickSetImageCompressionQuality(m_wand, 75); + MagickSetImageFormat(m_wand, "jpg"); + blob = MagickGetImagesBlob(m_wand, &blobsize); + fprintf(stderr, "Resized to %zu x %zu. Size after compression %zu bytes\n", + width, height, blobsize); - nseg=blobsize / MAXSEGLEN; - lastseglen=blobsize % MAXSEGLEN; - if (lastseglen !=0) nseg++; + nseg = blobsize / MAXSEGLEN; + lastseglen = blobsize % MAXSEGLEN; + if (lastseglen != 0) { + nseg++; + } - createMotHeader(blobsize,fidx,mothdr,&mothdrlen); + createMotHeader(blobsize, fidx, mothdr, &mothdrlen); // Create the MSC Data Group C-Structure - createMscDG(&msc,3,0,1,fidx,mothdr,mothdrlen); + createMscDG(&msc, 3, 0, 1, fidx, mothdr, mothdrlen); // Generate the MSC DG frame (Figure 9 en 300 401) - packMscDG(mscblob,&msc,&mscblobsize); - writeMotPAD(mscblob,mscblobsize,padlen); - - for (i=0;i>24; - MotHeaderCore[1]=(blobsize<<4 & 0x00FF0000)>>16; - MotHeaderCore[2]=(blobsize<<4 & 0x0000FF00)>>8; - MotHeaderCore[3]=(blobsize<<4 & 0x000000FF); + MotHeaderCore[0] = (blobsize<<4 & 0xFF000000) >> 24; + MotHeaderCore[1] = (blobsize<<4 & 0x00FF0000) >> 16; + MotHeaderCore[2] = (blobsize<<4 & 0x0000FF00) >> 8; + MotHeaderCore[3] = (blobsize<<4 & 0x000000FF); - sprintf(cntemp,"img%04d.jpg",fidx); - for (i=0; iextflag=0; - msc->crcflag=1; - msc->segflag=1; - msc->accflag=1; - msc->dgtype=dgtype; - msc->cindex=cindex; - msc->rindex=0; - msc->last=lastseg; - msc->segnum=cindex; - msc->rfa=0; - msc->tidflag=1; - msc->lenid=2; - msc->tid=tid; - msc->segdata=data; - msc->rcount=0; - msc->seglen=datalen; - - return; + msc->extflag = 0; + msc->crcflag = 1; + msc->segflag = 1; + msc->accflag = 1; + msc->dgtype = dgtype; + msc->cindex = cindex; + msc->rindex = 0; + msc->last = lastseg; + msc->segnum = cindex; + msc->rfa = 0; + msc->tidflag = 1; + msc->lenid = 2; + msc->tid = tid; + msc->segdata = data; + msc->rcount = 0; + msc->seglen = datalen; } -void packMscDG(unsigned char* b, MSCDG* msc, unsigned short int* bsize) { - +void packMscDG(unsigned char* b, MSCDG* msc, unsigned short int* bsize) +{ int i; unsigned short int crc=0xFFFF; - b[0]=(msc->extflag<<7)|(msc->crcflag<<6)|(msc->segflag<<5)|(msc->accflag<<4)|msc->dgtype; - b[1]=(msc->cindex<<4)|msc->rindex; - b[2]=(msc->last<<7)|((msc->segnum & 0x7F00)>>8); - b[3]=msc->segnum & 0x00FF; - b[4]=0; - b[4]=(msc->rfa<<5)|(msc->tidflag<<4)|msc->lenid; - b[5]=(msc->tid & 0xFF00)>>8; - b[6]=msc->tid & 0x00FF; - b[7]=(msc->rcount<<5)|((msc->seglen & 0x1F00)>>8); - b[8]=msc->seglen & 0x00FF; - - for (i=0;i<9;i++) + b[0] = (msc->extflag<<7) | (msc->crcflag<<6) | (msc->segflag<<5) | + (msc->accflag<<4) | msc->dgtype; + + b[1] = (msc->cindex<<4) | msc->rindex; + b[2] = (msc->last<<7) | ((msc->segnum & 0x7F00) >> 8); + b[3] = msc->segnum & 0x00FF; + b[4] = 0; + b[4] = (msc->rfa << 5) | (msc->tidflag << 4) | msc->lenid; + b[5] = (msc->tid & 0xFF00) >> 8; + b[6] = msc->tid & 0x00FF; + b[7] = (msc->rcount << 5) | ((msc->seglen & 0x1F00)>>8); + b[8] = msc->seglen & 0x00FF; + + for (i = 0; i<9; i++) { crc = update_crc_ccitt(crc, b[i]); + } - for(i=0;iseglen;i++) { - b[i+9]=(msc->segdata)[i]; + for(i = 0; i < msc->seglen; i++) { + b[i+9] = (msc->segdata)[i]; crc = update_crc_ccitt(crc, b[i+9]); } - crc=~crc; - b[9+msc->seglen] = (crc & 0xFF00) >> 8; // HI CRC - b[9+msc->seglen+1] = crc & 0x00FF; // LO CRC + crc = ~crc; + b[9+msc->seglen] = (crc & 0xFF00) >> 8; // HI CRC + b[9+msc->seglen+1] = crc & 0x00FF; // LO CRC - *bsize=9+msc->seglen+1+1; + *bsize = 9 + msc->seglen + 1 + 1; //write(1,b,9+msc->seglen+1+1); } -void writeMotPAD(unsigned char* mscdg, unsigned short int mscdgsize, unsigned short int padlen) { +void writeMotPAD(int output_fd, + unsigned char* mscdg, + unsigned short int mscdgsize, + unsigned short int padlen) +{ unsigned char pad[128]; - int xpadlengthmask,i,j,numseg,lastseglen; + int xpadlengthmask, i, j, numseg, lastseglen; unsigned short int crc; - if (padlen==17) - xpadlengthmask=3; - else if (padlen==21) - xpadlengthmask=4; - else if (padlen==29) - xpadlengthmask=5; - else if (padlen==37) - xpadlengthmask=6; - else if (padlen==53) - xpadlengthmask=7; + if (padlen == 17) + xpadlengthmask = 3; + else if (padlen == 21) + xpadlengthmask = 4; + else if (padlen == 29) + xpadlengthmask = 5; + else if (padlen == 37) + xpadlengthmask = 6; + else if (padlen == 53) + xpadlengthmask = 7; // Write Data Group Length Indicator crc = 0xffff; - pad[padlen-1]=0x02; // FF-PAD Byte L (CI=1) - pad[padlen-2]=0x20; // FF-PAD Byte L-1 (Variable size X_PAD) - pad[padlen-3]=(xpadlengthmask<<5) | 0x01; // CI => data length = 12 (011) - Application Type=2 (DLS - start of X-PAD data group) - pad[padlen-4]=0x00; // End of CI list - pad[padlen-5]=(mscdgsize & 0x3F00)>>8; // RFA+HI Data group length - pad[padlen-6]=(mscdgsize & 0x00FF); + + // FF-PAD Byte L (CI=1) + pad[padlen-1] = 0x02; + + // FF-PAD Byte L-1 (Variable size X_PAD) + pad[padlen-2] = 0x20; + + // CI => data length = 12 (011) - Application Type=2 (DLS - start of X-PAD data group) + pad[padlen-3] = (xpadlengthmask << 5) | 0x01; + + // End of CI list + pad[padlen-4] = 0x00; + + // RFA+HI Data group length + pad[padlen-5] = (mscdgsize & 0x3F00) >> 8; + pad[padlen-6] = (mscdgsize & 0x00FF); + crc = update_crc_ccitt(crc, pad[padlen-5]); crc = update_crc_ccitt(crc, pad[padlen-6]); crc = ~crc; - pad[padlen-7]=(crc & 0xFF00) >> 8; // HI CRC - pad[padlen-8]=(crc & 0x00FF); // LO CRC - for (i=padlen-9;i>=0;i--) { // NULL PADDING - pad[i]=0x00; - } - write(STDOUT_FILENO,pad,padlen); + + // HI CRC + pad[padlen-7] = (crc & 0xFF00) >> 8; + + // LO CRC + pad[padlen-8] = (crc & 0x00FF); + + // NULL PADDING + for (i = padlen-9; i >= 0; i--) { + pad[i] = 0x00; + } + + write(output_fd, pad, padlen); + //fprintf(stderr,"Data Group Length Indicator: "); //for (i=0;i 0) { - numseg++; // The last incomplete segment + numseg++; // The last incomplete segment } - for (i=0;i data length = 12 (011) - Application Type=12 (start of MOT) - else - pad[padlen-3]=(xpadlengthmask<<5) | 13; // CI => data length = 12 (011) - Application Type=13 (MOT) + // FF-PAD Byte L (CI=1) + pad[padlen-1] = 0x02; + + // FF-PAD Byte L-1 (Variable size X_PAD) + pad[padlen-2] = 0x20; + + if (firstseg == 1) { + // CI => data length = 12 (011) - Application Type=12 (start of MOT) + pad[padlen-3] = (xpadlengthmask<<5) | 12; + } + else { + // CI => data length = 12 (011) - Application Type=13 (MOT) + pad[padlen-3] = (xpadlengthmask<<5) | 13; + } - pad[padlen-4]=0x00; // End of CI list + // End of CI list + pad[padlen-4] = 0x00; - for (j=0; j=0;j--) - pad[j]=0x00; + for (j = 0; j < curseglen; j++) { + pad[padlen-5-j] = curseg[j]; + } + for (j = padlen-5-curseglen; j >= 0; j--) { + pad[j] = 0x00; + } - write(STDOUT_FILENO,pad,padlen); + write(output_fd, pad, padlen); //fprintf(stderr,"MSC Data Group - Segment %d: ",i); //for (j=0;j= 16) { - if (lastseglen > 0) numseg++; // The last incomplete segment - numdg=numseg; // The PAD can contain the full segmnet and overhead (9 bytes) - } else { - numdg=numseg*2; // Each 16 char segment span over 2 dg + if (lastseglen > 0) { + numseg++; // The last incomplete segment + } + + // The PAD can contain the full segmnet and overhead (9 bytes) + numdg = numseg; + + } + else { + // Each 16 char segment span over 2 dg + numdg = numseg * 2; + if (lastseglen > 0) { numseg++; // The last incomplete segment - if (lastseglen <= padlen-9) - numdg+=1; - else - numdg+=2; + if (lastseglen <= padlen-9) { + numdg += 1; + } + else { + numdg += 2; + } } } - *p_numdg=numdg; - fprintf(stderr,"PAD Length: %d\n",padlen); - fprintf(stderr,"DLS text: %s\n",text); - fprintf(stderr,"Number od DLS segments: %d\n",numseg); - fprintf(stderr,"Number od DLS data grupus: %d\n",numdg); - - if (padlen==17) - xpadlengthmask=3; - else if (padlen==21) - xpadlengthmask=4; - else if (padlen==29) - xpadlengthmask=5; - else if (padlen==37) - xpadlengthmask=6; - else if (padlen==53) - xpadlengthmask=7; - - *p_dlsdg = (UCHAR**) malloc(numdg*sizeof(UCHAR*)); - dlsdg=*p_dlsdg; - - i=0; - for (z=0;z data length = 12 (011) - Application Type=2 (DLS - start of X-PAD data group) - dlsdg[i][padlen-4]=0x00; // End of CI list + if (curseglen <= padlen-9) { // Segment is composed of 1 data group + dlsdg[i] = (UCHAR*) malloc(padlen * sizeof(UCHAR)); - dlsdg[i][padlen-5]=((toggle*8+firstseg*4+lastseg*2+0)<<4) | (curseglen-1); // DLS Prefix (T=1,Only one segment,segment length-1) + // FF-PAD Byte L (CI=1) + dlsdg[i][padlen-1]=0x02; - if (firstseg==1) - dlsdg[i][padlen-6]=0x00; // DLS Prefix (Charset standard) - else - dlsdg[i][padlen-6]=z<<4; // DLS SegNum + // FF-PAD Byte L-1 (Variable size X_PAD) + dlsdg[i][padlen-2]=0x20; + + // CI => data length = 12 (011) - Application Type=2 + // (DLS - start of X-PAD data group) + dlsdg[i][padlen-3]=(xpadlengthmask<<5) | 0x02; + + // End of CI list + dlsdg[i][padlen-4]=0x00; + + // DLS Prefix (T=1,Only one segment,segment length-1) + dlsdg[i][padlen-5]=((toggle*8+firstseg*4+lastseg*2+0)<<4) | (curseglen-1); + + if (firstseg==1) { + // DLS Prefix (Charset standard) + dlsdg[i][padlen-6]=0x00; + } + else { + // DLS SegNum + dlsdg[i][padlen-6]=z<<4; + } - idx_start_crc = padlen-5; // CRC start from prefix - for (j=0;j=idx_stop_crc;j--) { + for (j = idx_start_crc; j >= idx_stop_crc; j--) { dlscrc = update_crc_ccitt(dlscrc, dlsdg[i][j]); } dlscrc = ~dlscrc; - fprintf(stderr,"crc=%x ~crc=%x\n",~dlscrc,dlscrc); + fprintf(stderr, "crc=%x ~crc=%x\n", ~dlscrc, dlscrc); dlsdg[i][padlen-7-curseglen] = (dlscrc & 0xFF00) >> 8; // HI CRC dlsdg[i][padlen-7-curseglen-1] = dlscrc & 0x00FF; // LO CRC - for (j=padlen-7-curseglen-2;j>=0;j--) { // NULL PADDING + // NULL PADDING + for (j = padlen-7-curseglen-2; j >= 0; j--) { dlsdg[i][j]=0x00; } - fprintf(stderr,"Data group: "); - for (j=0;j data length = 12 (011) - Application Type=2 (DLS - start of X-PAD data group) - dlsdg[i][padlen-4]=0x00; // End of CI list - dlsdg[i][padlen-5]=((toggle*8+firstseg*4+lastseg*2+0)<<4) | (curseglen-1); // DLS Prefix (T=1,Only one segment,segment length-1) + dlsdg[i] = (UCHAR*) malloc(padlen * sizeof(UCHAR)); - if (firstseg==1) - dlsdg[i][padlen-6]=0x00; // DLS Prefix (Charset standard) - else - dlsdg[i][padlen-6]=(i-1)<<4; // DLS SegNum + // FF-PAD Byte L (CI=1) + dlsdg[i][padlen-1]=0x02; + + // FF-PAD Byte L-1 (Variable size X_PAD) + dlsdg[i][padlen-2]=0x20; + + // CI => data length = 12 (011) - Application Type=2 + // (DLS - start of X-PAD data group) + dlsdg[i][padlen-3]=(xpadlengthmask<<5) | 0x02; + + // End of CI list + dlsdg[i][padlen-4]=0x00; + + // DLS Prefix (T=1,Only one segment,segment length-1) + dlsdg[i][padlen-5]=((toggle*8+firstseg*4+lastseg*2+0)<<4) | (curseglen-1); + + + if (firstseg == 1) { + // DLS Prefix (Charset standard) + dlsdg[i][padlen-6] = 0x00; + } + else { + // DLS SegNum + dlsdg[i][padlen-6]=(i-1)<<4; + } dlscrc = update_crc_ccitt(dlscrc, dlsdg[i][padlen-5]); dlscrc = update_crc_ccitt(dlscrc, dlsdg[i][padlen-6]); - for (j=0;j < MIN(curseglen,padlen-7); j++) { // DLS text - dlsdg[i][padlen-7-j]=curseg[j]; + // DLS text + for (j=0; j < MIN(curseglen, padlen-7); j++) { + dlsdg[i][padlen-7-j] = curseg[j]; dlscrc = update_crc_ccitt(dlscrc, dlsdg[i][padlen-7-j]); } - k=j; - if (curseglen==padlen-8) { // end of segment + k = j; + + // end of segment + if (curseglen == padlen-8) { dlscrc = ~dlscrc; dlsdg[i][1] = (dlscrc & 0xFF00) >> 8; // HI CRC - fprintf(stderr,"crc=%x ~crc=%x\n",~dlscrc,dlscrc); - } else if (curseglen==padlen-7) { + fprintf(stderr, "crc=%x ~crc=%x\n", ~dlscrc, dlscrc); + } + else if (curseglen == padlen-7) { dlscrc = ~dlscrc; - fprintf(stderr,"crc=%x ~crc=%x\n",~dlscrc,dlscrc); + fprintf(stderr, "crc=%x ~crc=%x\n", ~dlscrc, dlscrc); } dlsdg[i][0]=0x00; - fprintf(stderr,"First Data group: "); - for (j=0;j> 8; // HI CRC - dlsdg[i][padlen-4] = dlscrc & 0x00FF; // LO CRC - } else { - for (j=0;j < curseglen-k; j++) { // DLS text - dlsdg[i][padlen-3-j]=curseg[k+j]; + } + else if (curseglen==padlen-7) { + dlsdg[i][padlen-3] = (dlscrc & 0xFF00) >> 8; // HI CRC + dlsdg[i][padlen-4] = dlscrc & 0x00FF; // LO CRC + } + else { + // DLS text + for (j = 0; j < curseglen-k; j++) { + dlsdg[i][padlen-3-j] = curseg[k+j]; dlscrc = update_crc_ccitt(dlscrc, dlsdg[i][padlen-3-j]); } dlscrc = ~dlscrc; - dlsdg[i][padlen-3-curseglen+k]=(dlscrc & 0xFF00) >> 8; // HI CRC - dlsdg[i][padlen-3-curseglen+k-1]=dlscrc & 0x00FF; // LO CRC + dlsdg[i][padlen-3-curseglen+k] = (dlscrc & 0xFF00) >> 8; // HI CRC + dlsdg[i][padlen-3-curseglen+k-1] = dlscrc & 0x00FF; // LO CRC } - fprintf(stderr,"Second Data group: "); - for (j=0;j