stop using trunk directory in rectool

[rec10/rec10-git.git] / epgdump / sdt.c

diff --git a/epgdump/sdt.c b/epgdump/sdt.c
index bfc3c28..6192f6b 100755 (executable)
--- a/epgdump/sdt.c
+++ b/epgdump/sdt.c
@@ -176,10 +176,18 @@ void dumpSDT(unsigned char *ptr, SVT_CONTROL *top,STATION **station, int * stati
                                        logd.logo_version, logd.download_data_id);
                                #endif
 
                                        logd.logo_version, logd.download_data_id);
                                #endif
 

+                               /*
+                                       logd.logo_transmission_type
+                                       0x01 CDT 伝送方式1:CDT をダウンロードデータ識別で直接参照する場合
+                                       0x02 CDT 伝送方式2:CDT をロゴ識別を用いてダウンロードデータ識別を間接的に参照する場合
+                                       0x03 簡易ロゴ方式
+                               */

                                if ( logd.logo_transmission_type != 0x01 ) continue;
                                for (i=0; i<stationi; i++) {
                                if ( logd.logo_transmission_type != 0x01 ) continue;
                                for (i=0; i<stationi; i++) {

+                                       // FIXME: pStation[i].logo_version < logd.logo_version

                                        if ( pStation[i].svId == sdtb.service_id ) {
                                                pStation[i].logo_download_data_id = logd.download_data_id;
                                        if ( pStation[i].svId == sdtb.service_id ) {
                                                pStation[i].logo_download_data_id = logd.download_data_id;

+                                               pStation[i].logo_version = logd.logo_version;

                                        }
                                }
 
                                        }
                                }
 


@@ -214,14 +222,14 @@ void dumpSDT(unsigned char *ptr, SVT_CONTROL *top,STATION **station, int * stati
                                                }
                                        }
 
                                                }
                                        }
 

-                                       pStation = realloc(pStation,(stationi+1)*sizeof(STATION));
-                                       if (!pStation) printf( "Realloc returned NULL!!! stationi = %d\n", stationi);
+                                       pStation = realloc(pStation, (stationi + 1) * sizeof(STATION));
+                                       memset(&pStation[stationi], 0, sizeof(STATION));
+

                                        pStation[stationi].name = malloc( strlen(desc.service_name) + 1 );
                                        pStation[stationi].ontv = malloc( strlen(sid) + 1 );
                                        pStation[stationi].tsId = sdth.transport_stream_id;
                                        pStation[stationi].onId = sdth.original_network_id;
                                        pStation[stationi].svId = sdtb.service_id;
                                        pStation[stationi].name = malloc( strlen(desc.service_name) + 1 );
                                        pStation[stationi].ontv = malloc( strlen(sid) + 1 );
                                        pStation[stationi].tsId = sdth.transport_stream_id;
                                        pStation[stationi].onId = sdth.original_network_id;
                                        pStation[stationi].svId = sdtb.service_id;

-                                       memset(pStation[stationi].logo_array, 0, sizeof(pStation[stationi].logo_array));

 
                                        strcpy(pStation[stationi].name, desc.service_name);
                                        strcpy(pStation[stationi].ontv, sid);
 
                                        strcpy(pStation[stationi].name, desc.service_name);
                                        strcpy(pStation[stationi].ontv, sid);