[DVDnav-discuss] r1024 - in trunk/libdvdnav: Makefile src/dvdread/Makefile.am src/dvdread/bitreader.c src/dvdread/bitreader.h src/dvdread/nav_read.c
nicodvb
subversion at mplayerhq.hu
Thu May 1 19:13:36 CEST 2008
Author: nicodvb
Date: Thu May 1 19:13:36 2008
New Revision: 1024
Log:
split bitstream reader functions in 2 separate files for reuse
Added:
trunk/libdvdnav/src/dvdread/bitreader.c
- copied, changed from r1020, /trunk/libdvdnav/src/dvdread/nav_read.c
trunk/libdvdnav/src/dvdread/bitreader.h
- copied, changed from r1020, /trunk/libdvdnav/src/dvdread/nav_read.h
Modified:
trunk/libdvdnav/Makefile
trunk/libdvdnav/src/dvdread/Makefile.am
trunk/libdvdnav/src/dvdread/nav_read.c
Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile (original)
+++ trunk/libdvdnav/Makefile Thu May 1 19:13:36 2008
@@ -35,9 +35,10 @@ DVDREAD_HEADERS = src/dvdread/dvd_reader
src/dvdread/nav_print.h \
src/dvdread/nav_read.h \
src/dvdread/dvd_udf.h \
- src/dvdread/nav_types.h
+ src/dvdread/nav_types.h \
+ src/dvdread/bitreader.h
DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
- md5.c nav_print.c nav_read.c
+ md5.c nav_print.c nav_read.c bitreader.c
CFLAGS += -I$(SRC_PATH)/src/dvdread
else
CFLAGS += -I$(DVDREAD_DIR)
Modified: trunk/libdvdnav/src/dvdread/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/dvdread/Makefile.am (original)
+++ trunk/libdvdnav/src/dvdread/Makefile.am Thu May 1 19:13:36 2008
@@ -7,8 +7,8 @@ AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_s
lib_LTLIBRARIES = libdvdread.la
libdvdread_la_SOURCES = dvd_reader.c nav_read.c ifo_read.c \
- dvd_input.c dvd_udf.c md5.c nav_print.c ifo_print.c \
- bswap.h dvd_input.h dvdread_internal.h dvd_udf.h md5.h
+ dvd_input.c dvd_udf.c md5.c nav_print.c ifo_print.c bitreader.c \
+ bswap.h dvd_input.h dvdread_internal.h dvd_udf.h md5.h bitreader.h
libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS)
@@ -16,4 +16,4 @@ libdvdread_la_LDFLAGS = -version-info $(
-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
include_HEADERS = dvd_reader.h nav_read.h ifo_read.h \
- nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h
+ nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h bitreader.h
Copied: trunk/libdvdnav/src/dvdread/bitreader.c (from r1020, /trunk/libdvdnav/src/dvdread/nav_read.c)
==============================================================================
--- /trunk/libdvdnav/src/dvdread/nav_read.c (original)
+++ trunk/libdvdnav/src/dvdread/bitreader.c Thu May 1 19:13:36 2008
@@ -24,18 +24,9 @@
#include <inttypes.h>
#include "bswap.h"
-#include "nav_types.h"
-#include "nav_read.h"
-#include "dvdread_internal.h"
-
-typedef struct {
- uint8_t *start;
- uint32_t byte_position;
- uint32_t bit_position;
- uint8_t byte;
-} getbits_state_t;
+#include "bitreader.h"
-static int getbits_init(getbits_state_t *state, uint8_t *start) {
+int dvdread_getbits_init(getbits_state_t *state, uint8_t *start) {
if ((state == NULL) || (start == NULL)) return 0;
state->start = start;
state->bit_position = 0;
@@ -46,7 +37,7 @@ static int getbits_init(getbits_state_t
/* Non-optimized getbits. */
/* This can easily be optimized for particular platforms. */
-static uint32_t getbits(getbits_state_t *state, uint32_t number_of_bits) {
+uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits) {
uint32_t result=0;
uint8_t byte=0;
if (number_of_bits > 32) {
@@ -102,7 +93,7 @@ static uint32_t getbits(getbits_state_t
/* WARNING: This function can only be used on a byte boundary.
No checks are made that we are in fact on a byte boundary.
*/
-static uint16_t get16bits(getbits_state_t *state) {
+uint16_t dvdread_get16bits(getbits_state_t *state) {
uint16_t result;
state->byte_position++;
result = (state->byte << 8) + state->start[state->byte_position++];
@@ -113,7 +104,7 @@ static uint16_t get16bits(getbits_state_
/* WARNING: This function can only be used on a byte boundary.
No checks are made that we are in fact on a byte boundary.
*/
-static uint32_t get32bits(getbits_state_t *state) {
+uint32_t dvdread_get32bits(getbits_state_t *state) {
uint32_t result;
state->byte_position++;
result = (state->byte << 8) + state->start[state->byte_position++];
@@ -124,235 +115,3 @@ static uint32_t get32bits(getbits_state_
}
#endif
-
-void navRead_PCI(pci_t *pci, unsigned char *buffer) {
- int32_t i, j;
- getbits_state_t state;
- if (!getbits_init(&state, buffer)) abort(); /* Passed NULL pointers */
-
- /* pci pci_gi */
- pci->pci_gi.nv_pck_lbn = getbits(&state, 32 );
- pci->pci_gi.vobu_cat = getbits(&state, 16 );
- pci->pci_gi.zero1 = getbits(&state, 16 );
- pci->pci_gi.vobu_uop_ctl.zero = getbits(&state, 7 );
- 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 */
- for(i = 0; i < 9; i++)
- pci->nsml_agli.nsml_agl_dsta[i] = getbits(&state, 32 );
-
- /* pci hli hli_gi */
- pci->hli.hl_gi.hli_ss = getbits(&state, 16 );
- pci->hli.hl_gi.hli_s_ptm = getbits(&state, 32 );
- pci->hli.hl_gi.hli_e_ptm = getbits(&state, 32 );
- 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 */
- for(i = 0; i < 3; i++)
- for(j = 0; j < 2; 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 */
- for(i = 0; i < 36; i++) {
- pci->hli.btnit[i].btn_coln = getbits(&state, 2 );
- pci->hli.btnit[i].x_start = getbits(&state, 10 );
- pci->hli.btnit[i].zero1 = getbits(&state, 2 );
- pci->hli.btnit[i].x_end = getbits(&state, 10 );
-
- pci->hli.btnit[i].auto_action_mode = getbits(&state, 2 );
- pci->hli.btnit[i].y_start = getbits(&state, 10 );
- pci->hli.btnit[i].zero2 = getbits(&state, 2 );
- pci->hli.btnit[i].y_end = getbits(&state, 10 );
-
- pci->hli.btnit[i].zero3 = getbits(&state, 2 );
- pci->hli.btnit[i].up = getbits(&state, 6 );
- pci->hli.btnit[i].zero4 = getbits(&state, 2 );
- pci->hli.btnit[i].down = getbits(&state, 6 );
- 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 );
- }
-
-
-
-#ifndef NDEBUG
- /* Asserts */
-
- /* pci pci gi */
- CHECK_VALUE(pci->pci_gi.zero1 == 0);
-
- /* pci hli hli_gi */
- CHECK_VALUE(pci->hli.hl_gi.zero1 == 0);
- CHECK_VALUE(pci->hli.hl_gi.zero2 == 0);
- CHECK_VALUE(pci->hli.hl_gi.zero3 == 0);
- CHECK_VALUE(pci->hli.hl_gi.zero4 == 0);
- CHECK_VALUE(pci->hli.hl_gi.zero5 == 0);
-
- /* Are there buttons defined here? */
- if((pci->hli.hl_gi.hli_ss & 0x03) != 0) {
- CHECK_VALUE(pci->hli.hl_gi.btn_ns != 0);
- CHECK_VALUE(pci->hli.hl_gi.btngr_ns != 0);
- } else {
- CHECK_VALUE((pci->hli.hl_gi.btn_ns != 0 && pci->hli.hl_gi.btngr_ns != 0)
- || (pci->hli.hl_gi.btn_ns == 0 && pci->hli.hl_gi.btngr_ns == 0));
- }
-
- /* pci hli btnit */
- for(i = 0; i < pci->hli.hl_gi.btngr_ns; i++) {
- for(j = 0; j < (36 / pci->hli.hl_gi.btngr_ns); j++) {
- int n = (36 / pci->hli.hl_gi.btngr_ns) * i + j;
- CHECK_VALUE(pci->hli.btnit[n].zero1 == 0);
- CHECK_VALUE(pci->hli.btnit[n].zero2 == 0);
- CHECK_VALUE(pci->hli.btnit[n].zero3 == 0);
- CHECK_VALUE(pci->hli.btnit[n].zero4 == 0);
- CHECK_VALUE(pci->hli.btnit[n].zero5 == 0);
- CHECK_VALUE(pci->hli.btnit[n].zero6 == 0);
-
- if (j < pci->hli.hl_gi.btn_ns) {
- CHECK_VALUE(pci->hli.btnit[n].x_start <= pci->hli.btnit[n].x_end);
- CHECK_VALUE(pci->hli.btnit[n].y_start <= pci->hli.btnit[n].y_end);
- CHECK_VALUE(pci->hli.btnit[n].up <= pci->hli.hl_gi.btn_ns);
- CHECK_VALUE(pci->hli.btnit[n].down <= pci->hli.hl_gi.btn_ns);
- CHECK_VALUE(pci->hli.btnit[n].left <= pci->hli.hl_gi.btn_ns);
- CHECK_VALUE(pci->hli.btnit[n].right <= pci->hli.hl_gi.btn_ns);
- /* vmcmd_verify(pci->hli.btnit[n].cmd); */
- } else {
- int k;
- CHECK_VALUE(pci->hli.btnit[n].btn_coln == 0);
- CHECK_VALUE(pci->hli.btnit[n].auto_action_mode == 0);
- CHECK_VALUE(pci->hli.btnit[n].x_start == 0);
- CHECK_VALUE(pci->hli.btnit[n].y_start == 0);
- CHECK_VALUE(pci->hli.btnit[n].x_end == 0);
- CHECK_VALUE(pci->hli.btnit[n].y_end == 0);
- CHECK_VALUE(pci->hli.btnit[n].up == 0);
- CHECK_VALUE(pci->hli.btnit[n].down == 0);
- CHECK_VALUE(pci->hli.btnit[n].left == 0);
- CHECK_VALUE(pci->hli.btnit[n].right == 0);
- for (k = 0; k < 8; k++)
- CHECK_VALUE(pci->hli.btnit[n].cmd.bytes[k] == 0); /* CHECK_ZERO? */
- }
- }
- }
-#endif /* !NDEBUG */
-}
-
-void navRead_DSI(dsi_t *dsi, unsigned char *buffer) {
- int i;
- getbits_state_t state;
- if (!getbits_init(&state, buffer)) abort(); /* Passed NULL pointers */
-
- /* dsi dsi gi */
- dsi->dsi_gi.nv_pck_scr = getbits(&state, 32 );
- dsi->dsi_gi.nv_pck_lbn = getbits(&state, 32 );
- dsi->dsi_gi.vobu_ea = getbits(&state, 32 );
- dsi->dsi_gi.vobu_1stref_ea = getbits(&state, 32 );
- dsi->dsi_gi.vobu_2ndref_ea = getbits(&state, 32 );
- dsi->dsi_gi.vobu_3rdref_ea = getbits(&state, 32 );
- 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.category = getbits(&state, 16 );
- dsi->sml_pbi.ilvu_ea = getbits(&state, 32 );
- dsi->sml_pbi.ilvu_sa = getbits(&state, 32 );
- dsi->sml_pbi.size = getbits(&state, 16 );
- dsi->sml_pbi.vob_v_s_s_ptm = getbits(&state, 32 );
- 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 */
- for(i = 0; i < 9; i++) {
- dsi->sml_agli.data[ i ].address = getbits(&state, 32 );
- dsi->sml_agli.data[ i ].size = getbits(&state, 16 );
- }
-
- /* dsi vobu sri */
- dsi->vobu_sri.next_video = getbits(&state, 32 );
- for(i = 0; i < 19; i++)
- dsi->vobu_sri.fwda[i] = getbits(&state, 32 );
- dsi->vobu_sri.next_vobu = getbits(&state, 32 );
- dsi->vobu_sri.prev_vobu = getbits(&state, 32 );
- for(i = 0; i < 19; i++)
- dsi->vobu_sri.bwda[i] = getbits(&state, 32 );
- dsi->vobu_sri.prev_video = getbits(&state, 32 );
-
- /* dsi synci */
- for(i = 0; i < 8; i++)
- dsi->synci.a_synca[i] = getbits(&state, 16 );
- for(i = 0; i < 32; i++)
- dsi->synci.sp_synca[i] = getbits(&state, 32 );
-
-
- /* Asserts */
-
- /* dsi dsi gi */
- CHECK_VALUE(dsi->dsi_gi.zero1 == 0);
-}
-
Copied: trunk/libdvdnav/src/dvdread/bitreader.h (from r1020, /trunk/libdvdnav/src/dvdread/nav_read.h)
==============================================================================
--- /trunk/libdvdnav/src/dvdread/nav_read.h (original)
+++ trunk/libdvdnav/src/dvdread/bitreader.h Thu May 1 19:13:36 2008
@@ -1,5 +1,5 @@
-#ifndef NAV_READ_H_INCLUDED
-#define NAV_READ_H_INCLUDED
+#ifndef BITREADER_H_INCLUDED
+#define BITREADER_H_INCLUDED
/*
* Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort at dtek.chalmers.se>.
@@ -19,33 +19,22 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "nav_types.h"
-
-/**
- * Parsing of NAV data, PCI and DSI parts.
- */
#ifdef __cplusplus
extern "C" {
#endif
-/**
- * Reads the PCI packet data pointed to into th pci struct.
- *
- * @param pci Pointer to the PCI data structure to be filled in.
- * @param bufffer Pointer to the buffer of the on disc PCI data.
- */
-void navRead_PCI(pci_t *, unsigned char *);
+typedef struct {
+ uint8_t *start;
+ uint32_t byte_position;
+ uint32_t bit_position;
+ uint8_t byte;
+} getbits_state_t;
-/**
- * Reads the DSI packet data pointed to into dsi struct.
- *
- * @param dsi Pointer to the DSI data structure to be filled in.
- * @param bufffer Pointer to the buffer of the on disc DSI data.
- */
-void navRead_DSI(dsi_t *, unsigned char *);
+int dvdread_getbits_init(getbits_state_t *state, uint8_t *start);
+uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits);
#ifdef __cplusplus
};
#endif
-#endif /* NAV_READ_H_INCLUDED */
+#endif /* BITREADER_H_INCLUDED */
Modified: trunk/libdvdnav/src/dvdread/nav_read.c
==============================================================================
--- trunk/libdvdnav/src/dvdread/nav_read.c (original)
+++ trunk/libdvdnav/src/dvdread/nav_read.c Thu May 1 19:13:36 2008
@@ -27,103 +27,10 @@
#include "nav_types.h"
#include "nav_read.h"
#include "dvdread_internal.h"
+#include "bitreader.h"
-typedef struct {
- uint8_t *start;
- uint32_t byte_position;
- uint32_t bit_position;
- uint8_t byte;
-} getbits_state_t;
-
-static int getbits_init(getbits_state_t *state, uint8_t *start) {
- if ((state == NULL) || (start == NULL)) return 0;
- state->start = start;
- state->bit_position = 0;
- state->byte_position = 0;
- state->byte = start[0];
- return 1;
-}
-
-/* Non-optimized getbits. */
-/* This can easily be optimized for particular platforms. */
-static uint32_t getbits(getbits_state_t *state, uint32_t number_of_bits) {
- uint32_t result=0;
- uint8_t byte=0;
- if (number_of_bits > 32) {
- printf("Number of bits > 32 in getbits\n");
- abort();
- }
-
- if ((state->bit_position) > 0) { /* Last getbits left us in the middle of a byte. */
- if (number_of_bits > (8-state->bit_position)) { /* this getbits will span 2 or more bytes. */
- byte = state->byte;
- byte = byte >> (state->bit_position);
- result = byte;
- number_of_bits -= (8-state->bit_position);
- state->bit_position = 0;
- state->byte_position++;
- state->byte = state->start[state->byte_position];
- } else {
- byte=state->byte;
- state->byte = state->byte << number_of_bits;
- byte = byte >> (8 - number_of_bits);
- result = byte;
- state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 8 */
- if (state->bit_position == 8) {
- state->bit_position = 0;
- state->byte_position++;
- state->byte = state->start[state->byte_position];
- }
- number_of_bits = 0;
- }
- }
- if ((state->bit_position) == 0) {
- while (number_of_bits > 7) {
- result = (result << 8) + state->byte;
- state->byte_position++;
- state->byte = state->start[state->byte_position];
- number_of_bits -= 8;
- }
- if (number_of_bits > 0) { /* number_of_bits < 8 */
- byte = state->byte;
- state->byte = state->byte << number_of_bits;
- state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 7 */
- byte = byte >> (8 - number_of_bits);
- result = (result << number_of_bits) + byte;
- number_of_bits = 0;
- }
- }
-
- return result;
-}
-
-#if 0 /* TODO: optimized versions not yet used */
-
-/* WARNING: This function can only be used on a byte boundary.
- No checks are made that we are in fact on a byte boundary.
- */
-static uint16_t get16bits(getbits_state_t *state) {
- uint16_t result;
- state->byte_position++;
- result = (state->byte << 8) + state->start[state->byte_position++];
- state->byte = state->start[state->byte_position];
- return result;
-}
-
-/* WARNING: This function can only be used on a byte boundary.
- No checks are made that we are in fact on a byte boundary.
- */
-static uint32_t get32bits(getbits_state_t *state) {
- uint32_t result;
- state->byte_position++;
- result = (state->byte << 8) + state->start[state->byte_position++];
- result = (result << 8) + state->start[state->byte_position++];
- result = (result << 8) + state->start[state->byte_position++];
- state->byte = state->start[state->byte_position];
- return result;
-}
-
-#endif
+#define getbits_init dvdread_getbits_init
+#define getbits dvdread_getbits
void navRead_PCI(pci_t *pci, unsigned char *buffer) {
int32_t i, j;
More information about the DVDnav-discuss
mailing list