Changeset 15 in svn

Timestamp:

Apr 7, 2015 12:49:22 PM (11 years ago)

Author:

megakiss

Message:

서경방송 TS 지원을 위한 수정
PID는 8160 1개만 사용하도록
image dii ddb 테이블아이디를 수정 4b 4c

File:

• trunk/zas_dstar/candidates/makeOTC.cpp (modified) (4 diffs)

trunk/zas_dstar/candidates/makeOTC.cpp

@@ -76 +76 @@
 }
 
-void write_ddb(FILE *fp, unsigned char *buff, int size, int pid, int nBlockNumber)
+void write_ddb(FILE *fp, unsigned char *buff, int size, int pid, int nBlockNumber, int tableid)
 {       
         if (nBlockNumber >= get_block_count(size)) nBlockNumber = nBlockNumber % get_block_count(size);
@@ -94 +94 @@
         memcpy(&tmp[23], p, nBuffSize);
         
-        write_table(fp, tmp, nBuffSize+23, pid, 0x3C);
-}
-
-void write_dii(FILE *fp, int size, int pid)
+        write_table(fp, tmp, nBuffSize+23, pid, tableid);
+}
+
+void write_dii(FILE *fp, int size, int pid, int tableid)
 {
                 unsigned char tmp[100];
@@ -110 +110 @@
                 tmp[41] = (size % 0x10000) / 0x100;
                 tmp[42] = size % 256;
-                write_table(fp, tmp, 100, pid, 0x3B);
+                write_table(fp, tmp, 100, pid, tableid);
 }
 
@@ -213 +213 @@
         for (int i = 0; i < nlenloop; i++)
         {
-                write_dii(fp, nlen_cvt, atoi(argv[2]));
+                write_dii(fp, nlen_cvt, atoi(argv[2]), 0x3B);
                 write_dummys(fp, 10);
-                write_ddb(fp, cvt, nlen_cvt, atoi(argv[2]), i);
+                write_ddb(fp, cvt, nlen_cvt, atoi(argv[2]), i, 0x3C);
                 write_dummys(fp, 10);
-                write_dii(fp, nlen_image, atoi(argv[4]));
+                write_dii(fp, nlen_image, atoi(argv[4]), 0x4B); // // ¼­°æ¹æ¼ÛÀ» À§ÇØ 3B -> 4B·Î º¯°æ
                 write_dummys(fp, 10);
-          write_ddb(fp, image, nlen_image, atoi(argv[4]), i);
+          write_ddb(fp, image, nlen_image, atoi(argv[4]), i, 0x4C);// ¼­°æ¹æ¼ÛÀ» À§ÇØ 3C -> 4C·Î º¯°æ
           write_dummys(fp, 10);
         }