diff options
-rw-r--r-- | src/input/libdvdread/ifo_print.c | 32 | ||||
-rw-r--r-- | src/input/libdvdread/ifo_read.c | 59 | ||||
-rw-r--r-- | src/input/libdvdread/ifo_types.h | 158 |
3 files changed, 126 insertions, 123 deletions
diff --git a/src/input/libdvdread/ifo_print.c b/src/input/libdvdread/ifo_print.c index 716f6897f..ab96f9373 100644 --- a/src/input/libdvdread/ifo_print.c +++ b/src/input/libdvdread/ifo_print.c @@ -25,7 +25,7 @@ #include <ctype.h> #include <assert.h> -#include "config.h" // Needed for WORDS_BIGENDIAN +#include "config.h" /* Needed for WORDS_BIGENDIAN */ #include "ifo_types.h" #include "ifo_read.h" #include "ifo_print.h" @@ -71,7 +71,7 @@ static void ifoPrint_CMD(int row, vm_cmd_t *command) { printf("%02x ", command->bytes[i]); printf("| "); - //vmcmd(command); + /* )vmcmd(command); */ printf("\n"); } @@ -126,19 +126,19 @@ static void ifoPrint_video_attributes(int level, video_attr_t *attr) { printf("(please send a bug report) "); } - // Wide is allways allowed..!!! + /* Wide is allways allowed..!!! */ switch(attr->permitted_df) { case 0: printf("pan&scan+letterboxed "); break; case 1: - printf("only pan&scan "); //?? + printf("only pan&scan "); /* ?? */ break; case 2: printf("only letterboxed "); break; case 3: - // not specified + /* not specified */ break; default: printf("(please send a bug report)"); @@ -184,7 +184,7 @@ static void ifoPrint_video_attributes(int level, video_attr_t *attr) { if(attr->film_mode) { printf("film"); } else { - printf("video"); //camera + printf("video"); /* camera */ } } @@ -235,7 +235,7 @@ static void ifoPrint_audio_attributes(int level, audio_attr_t *attr) { switch(attr->lang_type) { case 0: - // not specified + /* not specified */ assert(attr->lang_code == 0 || attr->lang_code == 0xffff); break; case 1: @@ -247,7 +247,7 @@ static void ifoPrint_audio_attributes(int level, audio_attr_t *attr) { switch(attr->application_mode) { case 0: - // not specified + /* not specified */ break; case 1: printf("karaoke mode "); @@ -294,19 +294,19 @@ static void ifoPrint_audio_attributes(int level, audio_attr_t *attr) { case 0: printf("Not specified "); break; - case 1: // Normal audio + case 1: /* Normal audio */ printf("Normal Caption "); break; - case 2: // visually imparied + case 2: /* visually imparied */ printf("Audio for visually impaired "); break; - case 3: // Directors 1 + case 3: /* Directors 1 */ printf("Director's comments 1 "); break; - case 4: // Directors 2 + case 4: /* Directors 2 */ printf("Director's comments 2 "); break; - //case 4: // Music score ? + /* case 4: Music score ? */ default: printf("(please send a bug report) "); } @@ -796,7 +796,7 @@ void ifoPrint_PTL_MAIT(ptl_mait_t *ptl_mait) { printf("Number of Countries: %i\n", ptl_mait->nr_of_countries); printf("Number of VTSs: %i\n", ptl_mait->nr_of_vtss); - //printf("Last byte: %i\n", ptl_mait->last_byte); + /* printf("Last byte: %i\n", ptl_mait->last_byte); */ for(i = 0; i < ptl_mait->nr_of_countries; i++) { printf("Country code: %c%c\n", @@ -825,7 +825,7 @@ void ifoPrint_C_ADT(c_adt_t *c_adt) { int i, entries; printf("Number of VOBs in this VOBS: %i\n", c_adt->nr_of_vobs); - //entries = c_adt->nr_of_vobs; + /* entries = c_adt->nr_of_vobs; */ entries = (c_adt->last_byte + 1 - C_ADT_SIZE)/sizeof(c_adt_t); for(i = 0; i < entries; i++) { @@ -975,7 +975,7 @@ void ifoPrint(dvd_reader_t *dvd, int title) { printf("\nText Data Manager Information\n"); printf( "-----------------------------\n"); if(ifohandle->txtdt_mgi) { - //ifoPrint_TXTDT_MGI(&(vmgi->txtdt_mgi)); + /* ifoPrint_TXTDT_MGI(&(vmgi->txtdt_mgi)); */ } else { printf("No Text Data Manager Information present\n"); } diff --git a/src/input/libdvdread/ifo_read.c b/src/input/libdvdread/ifo_read.c index d530bcf96..9654ae7eb 100644 --- a/src/input/libdvdread/ifo_read.c +++ b/src/input/libdvdread/ifo_read.c @@ -26,7 +26,7 @@ #include "dvd_reader.h" -#include "config.h" // Needed for WORDS_BIGENDIAN +#include "config.h" /* Needed for WORDS_BIGENDIAN */ #include "bswap.h" #include "ifo_types.h" #include "ifo_read.h" @@ -636,7 +636,7 @@ static int ifoRead_PGC(ifo_handle_t *ifofile, pgc_t *pgc, unsigned int offset) { /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */ if(pgc->nr_of_programs == 0) { CHECK_ZERO(pgc->still_time); - CHECK_ZERO(pgc->pg_playback_mode); // ?? + CHECK_ZERO(pgc->pg_playback_mode); /* ?? */ assert(pgc->program_map_offset == 0); assert(pgc->cell_playback_offset == 0); assert(pgc->cell_position_offset == 0); @@ -822,24 +822,24 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofile) { CHECK_ZERO(tt_srpt->zero_1); assert(tt_srpt->nr_of_srpts != 0); - assert(tt_srpt->nr_of_srpts < 100); // ?? + assert(tt_srpt->nr_of_srpts < 100); /* ?? */ assert((int)tt_srpt->nr_of_srpts * sizeof(title_info_t) <= info_length); for(i = 0; i < tt_srpt->nr_of_srpts; i++) { assert(tt_srpt->title[i].pb_ty.zero_1 == 0); assert(tt_srpt->title[i].nr_of_angles != 0); assert(tt_srpt->title[i].nr_of_angles < 10); - //assert(tt_srpt->title[i].nr_of_ptts != 0); - // XXX: this assertion breaks Ghostbusters: - assert(tt_srpt->title[i].nr_of_ptts < 1000); // ?? + /* assert(tt_srpt->title[i].nr_of_ptts != 0); */ + /* XXX: this assertion breaks Ghostbusters: */ + assert(tt_srpt->title[i].nr_of_ptts < 1000); /* ?? */ assert(tt_srpt->title[i].title_set_nr != 0); - assert(tt_srpt->title[i].title_set_nr < 100); // ?? + assert(tt_srpt->title[i].title_set_nr < 100); /* ?? */ assert(tt_srpt->title[i].vts_ttn != 0); - assert(tt_srpt->title[i].vts_ttn < 100); // ?? - //assert(tt_srpt->title[i].title_set_sector != 0); + assert(tt_srpt->title[i].vts_ttn < 100); /* ?? */ + /* assert(tt_srpt->title[i].title_set_sector != 0); */ } - // Make this a function + /* Make this a function */ #if 0 if(memcmp((uint8_t *)tt_srpt->title + tt_srpt->nr_of_srpts * sizeof(title_info_t), @@ -903,7 +903,7 @@ int ifoRead_VTS_PTT_SRPT(ifo_handle_t *ifofile) { CHECK_ZERO(vts_ptt_srpt->zero_1); assert(vts_ptt_srpt->nr_of_srpts != 0); - assert(vts_ptt_srpt->nr_of_srpts < 100); // ?? + assert(vts_ptt_srpt->nr_of_srpts < 100); /* ?? */ info_length = vts_ptt_srpt->last_byte + 1 - VTS_PTT_SRPT_SIZE; @@ -978,12 +978,12 @@ int ifoRead_VTS_PTT_SRPT(ifo_handle_t *ifofile) { } for(i = 0; i < vts_ptt_srpt->nr_of_srpts; i++) { - assert(vts_ptt_srpt->title[i].nr_of_ptts < 1000); // ?? + assert(vts_ptt_srpt->title[i].nr_of_ptts < 1000); /* ?? */ for(j = 0; j < vts_ptt_srpt->title[i].nr_of_ptts; j++) { assert(vts_ptt_srpt->title[i].ptt[j].pgcn != 0 ); - assert(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); // ?? + assert(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); /* ?? */ assert(vts_ptt_srpt->title[i].ptt[j].pgn != 0); - assert(vts_ptt_srpt->title[i].ptt[j].pgn < 100); // ?? + assert(vts_ptt_srpt->title[i].ptt[j].pgn < 100); /* ?? */ } } @@ -1043,9 +1043,9 @@ int ifoRead_PTL_MAIT(ifo_handle_t *ifofile) { info_length = ptl_mait->last_byte + 1 - PTL_MAIT_SIZE; assert(ptl_mait->nr_of_countries != 0); - assert(ptl_mait->nr_of_countries < 100); // ?? + assert(ptl_mait->nr_of_countries < 100); /* ?? */ assert(ptl_mait->nr_of_vtss != 0); - assert(ptl_mait->nr_of_vtss < 100); // ?? + assert(ptl_mait->nr_of_vtss < 100); /* ?? */ assert(ptl_mait->nr_of_countries * PTL_MAIT_COUNTRY_SIZE <= info_length); /* Change this to read and 'translate' the tables too. @@ -1383,7 +1383,7 @@ static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit, /* assert(pgcit->nr_of_pgci_srp != 0); Magic Knight Rayearth Daybreak is mastered very strange and has Titles with 0 PTTs. */ - assert(pgcit->nr_of_pgci_srp < 10000); // ?? seen max of 1338 + assert(pgcit->nr_of_pgci_srp < 10000); /* ?? seen max of 1338 */ info_length = pgcit->nr_of_pgci_srp * PGCI_SRP_SIZE; data = malloc(info_length); @@ -1504,7 +1504,7 @@ int ifoRead_PGCI_UT(ifo_handle_t *ifofile) { CHECK_ZERO(pgci_ut->zero_1); assert(pgci_ut->nr_of_lus != 0); - assert(pgci_ut->nr_of_lus < 100); // ?? 3-4 ? + assert(pgci_ut->nr_of_lus < 100); /* ?? 3-4 ? */ assert((uint32_t)pgci_ut->nr_of_lus * PGCI_LU_SIZE < pgci_ut->last_byte); info_length = pgci_ut->nr_of_lus * PGCI_LU_SIZE; @@ -1539,8 +1539,9 @@ int ifoRead_PGCI_UT(ifo_handle_t *ifofile) { for(i = 0; i < pgci_ut->nr_of_lus; i++) { CHECK_ZERO(pgci_ut->lu[i].zero_1); - // Maybe this is only defined for v1.1 and later titles? - /* If the bits in 'lu[i].exists' are enumerated abcd efgh then: + /* + Maybe this is only defined for v1.1 and later titles? + If the bits in 'lu[i].exists' are enumerated abcd efgh then: VTS_x_yy.IFO VIDEO_TS.IFO a == 0x83 "Root" 0x82 "Title" b == 0x84 "Subpicture" @@ -1578,8 +1579,10 @@ int ifoRead_PGCI_UT(ifo_handle_t *ifofile) { ifofile->pgci_ut = 0; return 0; } - // FIXME: Iterate and verify that all menus that should exists accordingly - // to pgci_ut->lu[i].exists really do? + /* + * FIXME: Iterate and verify that all menus that should exists accordingly + * to pgci_ut->lu[i].exists really do? + */ } return 1; @@ -1640,8 +1643,8 @@ static int ifoRead_VTS_ATTRIBUTES(ifo_handle_t *ifofile, unsigned int nr_coded; assert(vts_attributes->last_byte + 1 >= VTS_ATTRIBUTES_MIN_SIZE); nr_coded = (vts_attributes->last_byte + 1 - VTS_ATTRIBUTES_MIN_SIZE)/6; - // This is often nr_coded = 70, how do you know how many there really are? - if(nr_coded > 32) { // We haven't read more from disk/file anyway + /* This is often nr_coded = 70, how do you know how many there really are? */ + if(nr_coded > 32) { /* We haven't read more from disk/file anyway */ nr_coded = 32; } assert(vts_attributes->nr_of_vtstt_subp_streams <= nr_coded); @@ -1689,7 +1692,7 @@ int ifoRead_VTS_ATRT(ifo_handle_t *ifofile) { CHECK_ZERO(vts_atrt->zero_1); assert(vts_atrt->nr_of_vtss != 0); - assert(vts_atrt->nr_of_vtss < 100); //?? + assert(vts_atrt->nr_of_vtss < 100); /* ?? */ assert((uint32_t)vts_atrt->nr_of_vtss * (4 + VTS_ATTRIBUTES_MIN_SIZE) + VTS_ATRT_SIZE < vts_atrt->last_byte + 1); @@ -1730,9 +1733,9 @@ int ifoRead_VTS_ATRT(ifo_handle_t *ifofile) { return 0; } - // This assert cant be in ifoRead_VTS_ATTRIBUTES + /* This assert cant be in ifoRead_VTS_ATTRIBUTES */ assert(offset + vts_atrt->vts[i].last_byte <= vts_atrt->last_byte + 1); - // Is this check correct? + /* Is this check correct? */ } free(data); @@ -1782,7 +1785,7 @@ int ifoRead_TXTDT_MGI(ifo_handle_t *ifofile) { return 0; } - // fprintf(stderr, "-- Not done yet --\n"); + /* fprintf(stderr, "-- Not done yet --\n"); */ return 1; } diff --git a/src/input/libdvdread/ifo_types.h b/src/input/libdvdread/ifo_types.h index efc4a96b2..f424e64ab 100644 --- a/src/input/libdvdread/ifo_types.h +++ b/src/input/libdvdread/ifo_types.h @@ -59,7 +59,7 @@ typedef struct { uint8_t hour; uint8_t minute; uint8_t second; - uint8_t frame_u; // The two high bits are the frame rate. + uint8_t frame_u; /* The two high bits are the frame rate. */ } ATTRIBUTE_PACKED dvd_time_t; /** @@ -130,7 +130,7 @@ typedef struct { unsigned int quantization : 2; #endif uint16_t lang_code; - uint8_t lang_code2; // ?? + uint8_t lang_code2; /* ?? */ uint8_t lang_extension; uint16_t unknown2; } ATTRIBUTE_PACKED audio_attr_t; @@ -235,65 +235,65 @@ typedef struct { */ typedef struct { #ifdef WORDS_BIGENDIAN - unsigned int zero : 7; // 25-31 - unsigned int video_pres_mode_change : 1; // 24 - - unsigned int karaoke_audio_pres_mode_change : 1; // 23 - unsigned int angle_change : 1; // 22 - unsigned int subpic_stream_change : 1; // 21 - unsigned int audio_stream_change : 1; // 20 - unsigned int pause_on : 1; // 19 - unsigned int still_off : 1; // 18 - unsigned int button_select_or_activate : 1; // 17 - unsigned int resume : 1; // 16 - - unsigned int chapter_menu_call : 1; // 15 - unsigned int angle_menu_call : 1; // 14 - unsigned int audio_menu_call : 1; // 13 - unsigned int subpic_menu_call : 1; // 12 - unsigned int root_menu_call : 1; // 11 - unsigned int title_menu_call : 1; // 10 - unsigned int backward_scan : 1; // 9 - unsigned int forward_scan : 1; // 8 - - unsigned int next_pg_search : 1; // 7 - unsigned int prev_or_top_pg_search : 1; // 6 - unsigned int time_or_chapter_search : 1; // 5 - unsigned int go_up : 1; // 4 - unsigned int stop : 1; // 3 - unsigned int title_play : 1; // 2 - unsigned int chapter_search_or_play : 1; // 1 - unsigned int title_or_time_play : 1; // 0 + unsigned int zero : 7; /* 25-31 */ + unsigned int video_pres_mode_change : 1; /* 24 */ + + unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */ + unsigned int angle_change : 1; /* 22 */ + unsigned int subpic_stream_change : 1; /* 21 */ + unsigned int audio_stream_change : 1; /* 20 */ + unsigned int pause_on : 1; /* 19 */ + unsigned int still_off : 1; /* 18 */ + unsigned int button_select_or_activate : 1; /* 17 */ + unsigned int resume : 1; /* 16 */ + + unsigned int chapter_menu_call : 1; /* 15 */ + unsigned int angle_menu_call : 1; /* 14 */ + unsigned int audio_menu_call : 1; /* 13 */ + unsigned int subpic_menu_call : 1; /* 12 */ + unsigned int root_menu_call : 1; /* 11 */ + unsigned int title_menu_call : 1; /* 10 */ + unsigned int backward_scan : 1; /* 9 */ + unsigned int forward_scan : 1; /* 8 */ + + unsigned int next_pg_search : 1; /* 7 */ + unsigned int prev_or_top_pg_search : 1; /* 6 */ + unsigned int time_or_chapter_search : 1; /* 5 */ + unsigned int go_up : 1; /* 4 */ + unsigned int stop : 1; /* 3 */ + unsigned int title_play : 1; /* 2 */ + unsigned int chapter_search_or_play : 1; /* 1 */ + unsigned int title_or_time_play : 1; /* 0 */ #else - unsigned int video_pres_mode_change : 1; // 24 - unsigned int zero : 7; // 25-31 - - unsigned int resume : 1; // 16 - unsigned int button_select_or_activate : 1; // 17 - unsigned int still_off : 1; // 18 - unsigned int pause_on : 1; // 19 - unsigned int audio_stream_change : 1; // 20 - unsigned int subpic_stream_change : 1; // 21 - unsigned int angle_change : 1; // 22 - unsigned int karaoke_audio_pres_mode_change : 1; // 23 - - unsigned int forward_scan : 1; // 8 - unsigned int backward_scan : 1; // 9 - unsigned int title_menu_call : 1; // 10 - unsigned int root_menu_call : 1; // 11 - unsigned int subpic_menu_call : 1; // 12 - unsigned int audio_menu_call : 1; // 13 - unsigned int angle_menu_call : 1; // 14 - unsigned int chapter_menu_call : 1; // 15 - - unsigned int title_or_time_play : 1; // 0 - unsigned int chapter_search_or_play : 1; // 1 - unsigned int title_play : 1; // 2 - unsigned int stop : 1; // 3 - unsigned int go_up : 1; // 4 - unsigned int time_or_chapter_search : 1; // 5 - unsigned int prev_or_top_pg_search : 1; // 6 - unsigned int next_pg_search : 1; // 7 + unsigned int video_pres_mode_change : 1; /* 24 */ + unsigned int zero : 7; /* 25-31 */ + + unsigned int resume : 1; /* 16 */ + unsigned int button_select_or_activate : 1; /* 17 */ + unsigned int still_off : 1; /* 18 */ + unsigned int pause_on : 1; /* 19 */ + unsigned int audio_stream_change : 1; /* 20 */ + unsigned int subpic_stream_change : 1; /* 21 */ + unsigned int angle_change : 1; /* 22 */ + unsigned int karaoke_audio_pres_mode_change : 1; /* 23 */ + + unsigned int forward_scan : 1; /* 8 */ + unsigned int backward_scan : 1; /* 9 */ + unsigned int title_menu_call : 1; /* 10 */ + unsigned int root_menu_call : 1; /* 11 */ + unsigned int subpic_menu_call : 1; /* 12 */ + unsigned int audio_menu_call : 1; /* 13 */ + unsigned int angle_menu_call : 1; /* 14 */ + unsigned int chapter_menu_call : 1; /* 15 */ + + unsigned int title_or_time_play : 1; /* 0 */ + unsigned int chapter_search_or_play : 1; /* 1 */ + unsigned int title_play : 1; /* 2 */ + unsigned int stop : 1; /* 3 */ + unsigned int go_up : 1; /* 4 */ + unsigned int time_or_chapter_search : 1; /* 5 */ + unsigned int prev_or_top_pg_search : 1; /* 6 */ + unsigned int next_pg_search : 1; /* 7 */ #endif } ATTRIBUTE_PACKED user_ops_t; @@ -453,11 +453,11 @@ typedef struct { video_attr_t vmgm_video_attr; uint8_t zero_7; - uint8_t nr_of_vmgm_audio_streams; // should be 0 or 1 + uint8_t nr_of_vmgm_audio_streams; /* should be 0 or 1 */ audio_attr_t vmgm_audio_attr; audio_attr_t zero_8[7]; uint8_t zero_9[17]; - uint8_t nr_of_vmgm_subp_streams; // should be 0 or 1 + uint8_t nr_of_vmgm_subp_streams; /* should be 0 or 1 */ subp_attr_t vmgm_subp_attr; subp_attr_t zero_10[27]; /* XXX: how much 'padding' here? */ } ATTRIBUTE_PACKED vmgi_mat_t; @@ -465,21 +465,21 @@ typedef struct { typedef struct { #ifdef WORDS_BIGENDIAN unsigned int zero_1 : 1; - unsigned int multi_or_random_pgc_title : 1; // 0 == one sequential pgc title + unsigned int multi_or_random_pgc_title : 1; /* 0 == one sequential pgc title */ unsigned int jlc_exists_in_cell_cmd : 1; unsigned int jlc_exists_in_prepost_cmd : 1; unsigned int jlc_exists_in_button_cmd : 1; unsigned int jlc_exists_in_tt_dom : 1; - unsigned int chapter_search_or_play : 1; // UOP 1 - unsigned int title_or_time_play : 1; // UOP 0 + unsigned int chapter_search_or_play : 1; /* UOP 1 */ + unsigned int title_or_time_play : 1; /* UOP 0 */ #else - unsigned int title_or_time_play : 1; // UOP 0 - unsigned int chapter_search_or_play : 1; // UOP 1 + unsigned int title_or_time_play : 1; /* UOP 0 */ + unsigned int chapter_search_or_play : 1; /* UOP 1 */ unsigned int jlc_exists_in_tt_dom : 1; unsigned int jlc_exists_in_button_cmd : 1; unsigned int jlc_exists_in_prepost_cmd : 1; unsigned int jlc_exists_in_cell_cmd : 1; - unsigned int multi_or_random_pgc_title : 1; // 0 == one sequential pgc title + unsigned int multi_or_random_pgc_title : 1; /* 0 == one sequential pgc title */ unsigned int zero_1 : 1; #endif } ATTRIBUTE_PACKED playback_type_t; @@ -540,12 +540,12 @@ typedef struct { video_attr_t vtsm_vobs_attr; uint8_t zero_1; - uint8_t nr_of_vtsm_audio_streams; // should be 0 or 1 + uint8_t nr_of_vtsm_audio_streams; /* should be 0 or 1 */ audio_attr_t vtsm_audio_attr; audio_attr_t zero_2[7]; uint8_t zero_3[16]; uint8_t zero_4; - uint8_t nr_of_vtsm_subp_streams; // should be 0 or 1 + uint8_t nr_of_vtsm_subp_streams; /* should be 0 or 1 */ subp_attr_t vtsm_subp_attr; subp_attr_t zero_5[27]; @@ -581,18 +581,18 @@ typedef struct { uint32_t last_byte; /* offsets are relative here */ uint16_t offsets[100]; /* == nr_of_srpts + 1 (first is disc title) */ #if 0 - uint16_t unknown; // 0x48 ?? 0x48 words (16bit) info following + uint16_t unknown; /* 0x48 ?? 0x48 words (16bit) info following */ uint16_t zero_1; - uint8_t type_of_info;//?? 01 == disc, 02 == Title, 04 == Title part + uint8_t type_of_info; /* ?? 01 == disc, 02 == Title, 04 == Title part */ uint8_t unknown1; uint8_t unknown2; uint8_t unknown3; - uint8_t unknown4;//?? allways 0x30 language?, text format? + uint8_t unknown4; /*?? allways 0x30 language?, text format? */ uint8_t unknown5; - uint16_t offset; // from first + uint16_t offset; /* from first */ - char text[12]; // ended by 0x09 + char text[12]; /* ended by 0x09 */ #endif } ATTRIBUTE_PACKED txtdt_t; @@ -652,7 +652,7 @@ typedef struct { uint32_t vts_ptt_srpt; /* sector */ uint32_t vts_pgcit; /* sector */ uint32_t vtsm_pgci_ut; /* sector */ - uint32_t vts_tmapt; /* sector */ // XXX: FIXME TODO Implement + uint32_t vts_tmapt; /* sector */ /* XXX: FIXME TODO Implement */ uint32_t vtsm_c_adt; /* sector */ uint32_t vtsm_vobu_admap; /* sector */ uint32_t vts_c_adt; /* sector */ @@ -661,11 +661,11 @@ typedef struct { video_attr_t vtsm_video_attr; uint8_t zero_14; - uint8_t nr_of_vtsm_audio_streams; // should be 0 or 1 + uint8_t nr_of_vtsm_audio_streams; /* should be 0 or 1 */ audio_attr_t vtsm_audio_attr; audio_attr_t zero_15[7]; uint8_t zero_16[17]; - uint8_t nr_of_vtsm_subp_streams; // should be 0 or 1 + uint8_t nr_of_vtsm_subp_streams; /* should be 0 or 1 */ subp_attr_t vtsm_subp_attr; subp_attr_t zero_17[27]; uint8_t zero_18[2]; @@ -739,7 +739,7 @@ typedef struct { vtsi_mat_t *vtsi_mat; vts_ptt_srpt_t *vts_ptt_srpt; pgcit_t *vts_pgcit; - int *vts_tmapt; // FIXME add/correct the type + int *vts_tmapt; /* FIXME add/correct the type */ c_adt_t *vts_c_adt; vobu_admap_t *vts_vobu_admap; } ifo_handle_t; |