github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
Code Releases Activity

reimplemented nav_read_PCI() and nav_read_DSI() using getbits() rather than relying on bitfields layout in memory

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24108 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2007-08-20 21:27:44 +00:00
parent b284631167
commit af4c7a3fd8
2 changed files with 123 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
dvdread/nav_read.c
View File

@ -104,60 +104,104 @@ static uint32_t getbits(getbits_state_t *state, uint32_t number_of_bits) {
void navRead_PCI(pci_t *pci, unsigned char *buffer) { void navRead_PCI(pci_t *pci, unsigned char *buffer) {
int i, j; int i, j;
getbits_state_t state;
CHECK_VALUE(sizeof(pci_t) == PCI_BYTES - 1); // -1 for substream id if (!getbits_init(&state, buffer)) abort(); /* Passed NULL pointers */
memcpy(pci, buffer, sizeof(pci_t));
/* Endian conversions */
/* pci pci_gi */ /* pci pci_gi */
B2N_32(pci->pci_gi.nv_pck_lbn); pci->pci_gi.nv_pck_lbn = getbits(&state, 32 );
B2N_16(pci->pci_gi.vobu_cat); pci->pci_gi.vobu_cat = getbits(&state, 16 );
B2N_32(pci->pci_gi.vobu_s_ptm); pci->pci_gi.zero1 = getbits(&state, 16 );
B2N_32(pci->pci_gi.vobu_e_ptm); pci->pci_gi.vobu_uop_ctl.zero = getbits(&state, 7 );
B2N_32(pci->pci_gi.vobu_se_e_ptm); pci->pci_gi.vobu_uop_ctl.video_pres_mode_change = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.karaoke_audio_pres_mode_change = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.angle_change = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.subpic_stream_change = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.audio_stream_change = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.pause_on = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.still_off = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.button_select_or_activate = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.resume = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.chapter_menu_call = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.angle_menu_call = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.audio_menu_call = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.subpic_menu_call = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.root_menu_call = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.title_menu_call = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.backward_scan = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.forward_scan = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.next_pg_search = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.prev_or_top_pg_search = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.time_or_chapter_search = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.go_up = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.stop = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.title_play = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.chapter_search_or_play = getbits(&state, 1 );
pci->pci_gi.vobu_uop_ctl.title_or_time_play = getbits(&state, 1 );
pci->pci_gi.vobu_s_ptm = getbits(&state, 32 );
pci->pci_gi.vobu_e_ptm = getbits(&state, 32 );
pci->pci_gi.vobu_se_e_ptm = getbits(&state, 32 );
pci->pci_gi.e_eltm.hour = getbits(&state, 8 );
pci->pci_gi.e_eltm.minute = getbits(&state, 8 );
pci->pci_gi.e_eltm.second = getbits(&state, 8 );
pci->pci_gi.e_eltm.frame_u = getbits(&state, 8 );
for(i = 0; i < 32; i++)
pci->pci_gi.vobu_isrc[i] = getbits(&state, 8 );
/* pci nsml_agli */ /* pci nsml_agli */
for(i = 0; i < 9; i++) for(i = 0; i < 9; i++)
B2N_32(pci->nsml_agli.nsml_agl_dsta[i]); pci->nsml_agli.nsml_agl_dsta[i] = getbits(&state, 32 );
/* pci hli hli_gi */ /* pci hli hli_gi */
B2N_16(pci->hli.hl_gi.hli_ss); pci->hli.hl_gi.hli_ss = getbits(&state, 16 );
B2N_32(pci->hli.hl_gi.hli_s_ptm); pci->hli.hl_gi.hli_s_ptm = getbits(&state, 32 );
B2N_32(pci->hli.hl_gi.hli_e_ptm); pci->hli.hl_gi.hli_e_ptm = getbits(&state, 32 );
B2N_32(pci->hli.hl_gi.btn_se_e_ptm); pci->hli.hl_gi.btn_se_e_ptm = getbits(&state, 32 );
pci->hli.hl_gi.zero1 = getbits(&state, 2 );
pci->hli.hl_gi.btngr_ns = getbits(&state, 2 );
pci->hli.hl_gi.zero2 = getbits(&state, 1 );
pci->hli.hl_gi.btngr1_dsp_ty = getbits(&state, 3 );
pci->hli.hl_gi.zero3 = getbits(&state, 1 );
pci->hli.hl_gi.btngr2_dsp_ty = getbits(&state, 3 );
pci->hli.hl_gi.zero4 = getbits(&state, 1 );
pci->hli.hl_gi.btngr3_dsp_ty = getbits(&state, 3 );
pci->hli.hl_gi.btn_ofn = getbits(&state, 8 );
pci->hli.hl_gi.btn_ns = getbits(&state, 8 );
pci->hli.hl_gi.nsl_btn_ns = getbits(&state, 8 );
pci->hli.hl_gi.zero5 = getbits(&state, 8 );
pci->hli.hl_gi.fosl_btnn = getbits(&state, 8 );
pci->hli.hl_gi.foac_btnn = getbits(&state, 8 );
/* pci hli btn_colit */ /* pci hli btn_colit */
for(i = 0; i < 3; i++) for(i = 0; i < 3; i++)
for(j = 0; j < 2; j++) for(j = 0; j < 2; j++)
B2N_32(pci->hli.btn_colit.btn_coli[i][j]); pci->hli.btn_colit.btn_coli[i][j] = getbits(&state, 32 );
/* NOTE: I've had to change the structure from the disk layout to get
* the packing to work with Sun's Forte C compiler. */
/* pci hli btni */ /* pci hli btni */
for(i = 0; i < 36; i++) { for(i = 0; i < 36; i++) {
char tmp[sizeof(pci->hli.btnit[i])], swap; pci->hli.btnit[i].btn_coln = getbits(&state, 2 );
memcpy(tmp, &(pci->hli.btnit[i]), sizeof(pci->hli.btnit[i])); pci->hli.btnit[i].x_start = getbits(&state, 10 );
/* Byte 4 to 7 are 'rotated' was: ABCD EFGH IJ is: ABCG DEFH IJ */ pci->hli.btnit[i].zero1 = getbits(&state, 2 );
swap = tmp[6]; pci->hli.btnit[i].x_end = getbits(&state, 10 );
tmp[6] = tmp[5];
tmp[5] = tmp[4];
tmp[4] = tmp[3];
tmp[3] = swap;
/* Then there are the two B2N_24(..) calls */ pci->hli.btnit[i].auto_action_mode = getbits(&state, 2 );
#ifndef WORDS_BIGENDIAN pci->hli.btnit[i].y_start = getbits(&state, 10 );
swap = tmp[0]; pci->hli.btnit[i].zero2 = getbits(&state, 2 );
tmp[0] = tmp[2]; pci->hli.btnit[i].y_end = getbits(&state, 10 );
tmp[2] = swap;
swap = tmp[4]; pci->hli.btnit[i].zero3 = getbits(&state, 2 );
tmp[4] = tmp[6]; pci->hli.btnit[i].up = getbits(&state, 6 );
tmp[6] = swap; pci->hli.btnit[i].zero4 = getbits(&state, 2 );
#endif pci->hli.btnit[i].down = getbits(&state, 6 );
memcpy(&(pci->hli.btnit[i]), tmp, sizeof(pci->hli.btnit[i])); pci->hli.btnit[i].zero5 = getbits(&state, 2 );
pci->hli.btnit[i].left = getbits(&state, 6 );
pci->hli.btnit[i].zero6 = getbits(&state, 2 );
pci->hli.btnit[i].right = getbits(&state, 6 );
/* pci vm_cmd */
for(j = 0; j < 8; j++)
pci->hli.btnit[i].cmd.bytes[j] = getbits(&state, 8 );
} }
@ -224,51 +268,59 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
void navRead_DSI(dsi_t *dsi, unsigned char *buffer) { void navRead_DSI(dsi_t *dsi, unsigned char *buffer) {
int i; int i;
getbits_state_t state;
CHECK_VALUE(sizeof(dsi_t) == DSI_BYTES - 1); // -1 for substream id if (!getbits_init(&state, buffer)) abort(); /* Passed NULL pointers */
memcpy(dsi, buffer, sizeof(dsi_t));
/* Endian conversions */
/* dsi dsi gi */ /* dsi dsi gi */
B2N_32(dsi->dsi_gi.nv_pck_scr); dsi->dsi_gi.nv_pck_scr = getbits(&state, 32 );
B2N_32(dsi->dsi_gi.nv_pck_lbn); dsi->dsi_gi.nv_pck_lbn = getbits(&state, 32 );
B2N_32(dsi->dsi_gi.vobu_ea); dsi->dsi_gi.vobu_ea = getbits(&state, 32 );
B2N_32(dsi->dsi_gi.vobu_1stref_ea); dsi->dsi_gi.vobu_1stref_ea = getbits(&state, 32 );
B2N_32(dsi->dsi_gi.vobu_2ndref_ea); dsi->dsi_gi.vobu_2ndref_ea = getbits(&state, 32 );
B2N_32(dsi->dsi_gi.vobu_3rdref_ea); dsi->dsi_gi.vobu_3rdref_ea = getbits(&state, 32 );
B2N_16(dsi->dsi_gi.vobu_vob_idn); dsi->dsi_gi.vobu_vob_idn = getbits(&state, 16 );
dsi->dsi_gi.zero1 = getbits(&state, 8 );
dsi->dsi_gi.vobu_c_idn = getbits(&state, 8 );
dsi->dsi_gi.c_eltm.hour = getbits(&state, 8 );
dsi->dsi_gi.c_eltm.minute = getbits(&state, 8 );
dsi->dsi_gi.c_eltm.second = getbits(&state, 8 );
dsi->dsi_gi.c_eltm.frame_u = getbits(&state, 8 );
/* dsi sml pbi */ /* dsi sml pbi */
B2N_16(dsi->sml_pbi.category); dsi->sml_pbi.category = getbits(&state, 16 );
B2N_32(dsi->sml_pbi.ilvu_ea); dsi->sml_pbi.ilvu_ea = getbits(&state, 32 );
B2N_32(dsi->sml_pbi.ilvu_sa); dsi->sml_pbi.ilvu_sa = getbits(&state, 32 );
B2N_16(dsi->sml_pbi.size); dsi->sml_pbi.size = getbits(&state, 16 );
B2N_32(dsi->sml_pbi.vob_v_s_s_ptm); dsi->sml_pbi.vob_v_s_s_ptm = getbits(&state, 32 );
B2N_32(dsi->sml_pbi.vob_v_e_e_ptm); dsi->sml_pbi.vob_v_e_e_ptm = getbits(&state, 32 );
for(i = 0; i < 8; i++) {
dsi->sml_pbi.vob_a[i].stp_ptm1 = getbits(&state, 32 );
dsi->sml_pbi.vob_a[i].stp_ptm2 = getbits(&state, 32 );
dsi->sml_pbi.vob_a[i].gap_len1 = getbits(&state, 32 );
dsi->sml_pbi.vob_a[i].gap_len2 = getbits(&state, 32 );
}
/* dsi sml agli */ /* dsi sml agli */
for(i = 0; i < 9; i++) { for(i = 0; i < 9; i++) {
B2N_32(dsi->sml_agli.data[ i ].address); dsi->sml_agli.data[ i ].address = getbits(&state, 32 );
B2N_16(dsi->sml_agli.data[ i ].size); dsi->sml_agli.data[ i ].size = getbits(&state, 16 );
} }
/* dsi vobu sri */ /* dsi vobu sri */
B2N_32(dsi->vobu_sri.next_video); dsi->vobu_sri.next_video = getbits(&state, 32 );
for(i = 0; i < 19; i++) for(i = 0; i < 19; i++)
B2N_32(dsi->vobu_sri.fwda[i]); dsi->vobu_sri.fwda[i] = getbits(&state, 32 );
B2N_32(dsi->vobu_sri.next_vobu); dsi->vobu_sri.next_vobu = getbits(&state, 32 );
B2N_32(dsi->vobu_sri.prev_vobu); dsi->vobu_sri.prev_vobu = getbits(&state, 32 );
for(i = 0; i < 19; i++) for(i = 0; i < 19; i++)
B2N_32(dsi->vobu_sri.bwda[i]); dsi->vobu_sri.bwda[i] = getbits(&state, 32 );
B2N_32(dsi->vobu_sri.prev_video); dsi->vobu_sri.prev_video = getbits(&state, 32 );
/* dsi synci */ /* dsi synci */
for(i = 0; i < 8; i++) for(i = 0; i < 8; i++)
B2N_16(dsi->synci.a_synca[i]); dsi->synci.a_synca[i] = getbits(&state, 16 );
for(i = 0; i < 32; i++) for(i = 0; i < 32; i++)
B2N_32(dsi->synci.sp_synca[i]); dsi->synci.sp_synca[i] = getbits(&state, 32 );
/* Asserts */ /* Asserts */

38
dvdread/nav_types.h
View File

@ -102,7 +102,6 @@ typedef struct {
uint32_t hli_s_ptm; /**< start ptm of hli */ uint32_t hli_s_ptm; /**< start ptm of hli */
uint32_t hli_e_ptm; /**< end ptm of hli */ uint32_t hli_e_ptm; /**< end ptm of hli */
uint32_t btn_se_e_ptm; /**< end ptm of button select */ uint32_t btn_se_e_ptm; /**< end ptm of button select */
#ifdef WORDS_BIGENDIAN
unsigned int zero1 : 2; /**< reserved */ unsigned int zero1 : 2; /**< reserved */
unsigned int btngr_ns : 2; /**< number of button groups 1, 2 or 3 with 36/18/12 buttons */ unsigned int btngr_ns : 2; /**< number of button groups 1, 2 or 3 with 36/18/12 buttons */
unsigned int zero2 : 1; /**< reserved */ unsigned int zero2 : 1; /**< reserved */
@ -111,16 +110,6 @@ typedef struct {
unsigned int btngr2_dsp_ty : 3; /**< display type of subpic stream for button group 2 */ unsigned int btngr2_dsp_ty : 3; /**< display type of subpic stream for button group 2 */
unsigned int zero4 : 1; /**< reserved */ unsigned int zero4 : 1; /**< reserved */
unsigned int btngr3_dsp_ty : 3; /**< display type of subpic stream for button group 3 */ unsigned int btngr3_dsp_ty : 3; /**< display type of subpic stream for button group 3 */
#else
unsigned int btngr1_dsp_ty : 3;
unsigned int zero2 : 1;
unsigned int btngr_ns : 2;
unsigned int zero1 : 2;
unsigned int btngr3_dsp_ty : 3;
unsigned int zero4 : 1;
unsigned int btngr2_dsp_ty : 3;
unsigned int zero3 : 1;
#endif
uint8_t btn_ofn; /**< button offset number range 0-255 */ uint8_t btn_ofn; /**< button offset number range 0-255 */
uint8_t btn_ns; /**< number of valid buttons <= 36/18/12 (low 6 bits) */ uint8_t btn_ns; /**< number of valid buttons <= 36/18/12 (low 6 bits) */
uint8_t nsl_btn_ns; /**< number of buttons selectable by U_BTNNi (low 6 bits) nsl_btn_ns <= btn_ns */ uint8_t nsl_btn_ns; /**< number of buttons selectable by U_BTNNi (low 6 bits) nsl_btn_ns <= btn_ns */
@ -150,47 +139,24 @@ typedef struct {
* The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ
*/ */
typedef struct { typedef struct {
#ifdef WORDS_BIGENDIAN
unsigned int btn_coln : 2; /**< button color number */ unsigned int btn_coln : 2; /**< button color number */
unsigned int x_start : 10; /**< x start offset within the overlay */ unsigned int x_start : 10; /**< x start offset within the overlay */
unsigned int zero1 : 2; /**< reserved */ unsigned int zero1 : 2; /**< reserved */
unsigned int x_end : 10; /**< x end offset within the overlay */ unsigned int x_end : 10; /**< x end offset within the overlay */
unsigned int zero3 : 2; /**< reserved */
unsigned int up : 6; /**< button index when pressing up */
unsigned int auto_action_mode : 2; /**< 0: no, 1: activated if selected */ unsigned int auto_action_mode : 2; /**< 0: no, 1: activated if selected */
unsigned int y_start : 10; /**< y start offset within the overlay */ unsigned int y_start : 10; /**< y start offset within the overlay */
unsigned int zero2 : 2; /**< reserved */ unsigned int zero2 : 2; /**< reserved */
unsigned int y_end : 10; /**< y end offset within the overlay */ unsigned int y_end : 10; /**< y end offset within the overlay */
unsigned int zero3 : 2; /**< reserved */
unsigned int up : 6; /**< button index when pressing up */
unsigned int zero4 : 2; /**< reserved */ unsigned int zero4 : 2; /**< reserved */
unsigned int down : 6; /**< button index when pressing down */ unsigned int down : 6; /**< button index when pressing down */
unsigned int zero5 : 2; /**< reserved */ unsigned int zero5 : 2; /**< reserved */
unsigned int left : 6; /**< button index when pressing left */ unsigned int left : 6; /**< button index when pressing left */
unsigned int zero6 : 2; /**< reserved */ unsigned int zero6 : 2; /**< reserved */
unsigned int right : 6; /**< button index when pressing right */ unsigned int right : 6; /**< button index when pressing right */
#else
unsigned int x_end : 10;
unsigned int zero1 : 2;
unsigned int x_start : 10;
unsigned int btn_coln : 2;
unsigned int up : 6;
unsigned int zero3 : 2;
unsigned int y_end : 10;
unsigned int zero2 : 2;
unsigned int y_start : 10;
unsigned int auto_action_mode : 2;
unsigned int down : 6;
unsigned int zero4 : 2;
unsigned int left : 6;
unsigned int zero5 : 2;
unsigned int right : 6;
unsigned int zero6 : 2;
#endif
vm_cmd_t cmd; vm_cmd_t cmd;
} ATTRIBUTE_PACKED btni_t; } ATTRIBUTE_PACKED btni_t;