summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/dvdnav.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/input/libdvdnav/dvdnav.c')
-rw-r--r--src/input/libdvdnav/dvdnav.c133
1 files changed, 69 insertions, 64 deletions
diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c
index 923f9736d..0b5fc59c8 100644
--- a/src/input/libdvdnav/dvdnav.c
+++ b/src/input/libdvdnav/dvdnav.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dvdnav.c,v 1.27 2003/04/29 22:18:14 jcdutton Exp $
+ * $Id: dvdnav.c,v 1.28 2003/05/11 13:44:05 jcdutton Exp $
*
*/
@@ -51,6 +51,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
memset(&this->pci,0,sizeof(this->pci));
memset(&this->dsi,0,sizeof(this->dsi));
+ this->last_cmd_nav_lbn = 0;
/* Set initial values of flags */
this->position_current.still = 0;
@@ -62,7 +63,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
dvdnav_read_cache_clear(this->cache);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
@@ -75,7 +76,7 @@ dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
(*dest) = NULL;
this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
if(!this)
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
memset(this, 0, (sizeof(dvdnav_t) ) ); /* Make sure this structure is clean */
pthread_mutex_init(&this->vm_lock, NULL);
@@ -88,14 +89,14 @@ dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
printerr("Error initialising the DVD VM.");
pthread_mutex_destroy(&this->vm_lock);
free(this);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if(!vm_reset(this->vm, path)) {
printerr("Error starting the VM / opening the DVD device.");
pthread_mutex_destroy(&this->vm_lock);
vm_free_vm(this->vm);
free(this);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* Set the path. FIXME: Is a deep copy 'right' */
@@ -115,7 +116,7 @@ dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
dvdnav_clear(this);
(*dest) = this;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_close(dvdnav_t *this) {
@@ -126,7 +127,7 @@ dvdnav_status_t dvdnav_close(dvdnav_t *this) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if (this->file) {
@@ -151,7 +152,7 @@ dvdnav_status_t dvdnav_close(dvdnav_t *this) {
else
free(this);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_reset(dvdnav_t *this) {
@@ -163,7 +164,7 @@ dvdnav_status_t dvdnav_reset(dvdnav_t *this) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
@@ -174,7 +175,7 @@ dvdnav_status_t dvdnav_reset(dvdnav_t *this) {
if(!vm_reset(this->vm, NULL)) {
printerr("Error restarting the VM.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
#ifdef LOG_DEBUG
fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n");
@@ -189,12 +190,12 @@ dvdnav_status_t dvdnav_path(dvdnav_t *this, const char** path) {
if(!this || !path) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
(*path) = this->path;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
const char* dvdnav_err_to_string(dvdnav_t *this) {
@@ -208,7 +209,7 @@ const char* dvdnav_err_to_string(dvdnav_t *this) {
/* converts a dvd_time_t to PTS ticks */
static int64_t dvdnav_convert_time(dvd_time_t *time) {
int64_t result;
- int frames;
+ int64_t frames;
result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000;
result += (time->hour & 0x0f) * 60 * 60 * 90000;
@@ -235,14 +236,14 @@ static int64_t dvdnav_convert_time(dvd_time_t *time) {
* Most of the code in here is copied from xine's MPEG demuxer
* so any bugs which are found in that should be corrected here also.
*/
-static int dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_t *nav_pci) {
- int bMpeg1 = 0;
+static int32_t dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_t *nav_pci) {
+ int32_t bMpeg1 = 0;
uint32_t nHeaderLen;
uint32_t nPacketLen;
uint32_t nStreamID;
if (p[3] == 0xBA) { /* program stream pack header */
- int nStuffingBytes;
+ int32_t nStuffingBytes;
bMpeg1 = (p[4] & 0x40) == 0;
@@ -273,7 +274,7 @@ static int dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_
if (nStreamID == 0xbf) { /* Private stream 2 */
#if 0
- int i;
+ int32_t i;
fprintf(MSG_OUT, "libdvdnav: nav packet=%u\n",p-p_start-6);
for(i=0;i<80;i++)
fprintf(MSG_OUT, "%02x ",p[i-6]);
@@ -300,9 +301,9 @@ static int dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_
/* DSI is used for most angle stuff.
* PCI is used for only non-seemless angle stuff
*/
-static int dvdnav_get_vobu(dvdnav_t *this, dsi_t *nav_dsi, pci_t *nav_pci, dvdnav_vobu_t *vobu) {
+static int32_t dvdnav_get_vobu(dvdnav_t *this, dsi_t *nav_dsi, pci_t *nav_pci, dvdnav_vobu_t *vobu) {
uint32_t next;
- int angle, num_angle;
+ int32_t angle, num_angle;
vobu->vobu_start = nav_dsi->dsi_gi.nv_pck_lbn; /* Absolute offset from start of disk */
vobu->vobu_length = nav_dsi->dsi_gi.vobu_ea; /* Relative offset from vobu_start */
@@ -377,14 +378,14 @@ static int dvdnav_get_vobu(dvdnav_t *this, dsi_t *nav_dsi, pci_t *nav_pci, dvdna
* The drawback is the additional memcopy.
*/
-dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, unsigned char *buf,
- int *event, int *len) {
+dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, uint8_t *buf,
+ int32_t *event, int32_t *len) {
unsigned char *block;
dvdnav_status_t status;
block = buf;
status = dvdnav_get_next_cache_block(this, &block, event, len);
- if (status == S_OK && block != buf) {
+ if (status == DVDNAV_STATUS_OK && block != buf) {
/* we received a block from the cache, copy it, so we can give it back */
memcpy(buf, block, DVD_VIDEO_LB_LEN);
dvdnav_free_cache_block(this, block);
@@ -392,14 +393,14 @@ dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, unsigned char *buf,
return status;
}
-dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
- int *event, int *len) {
+dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
+ int32_t *event, int32_t *len) {
dvd_state_t *state;
- int result;
+ int32_t result;
if(!this || !event || !len || !buf || !*buf) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
@@ -420,7 +421,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
(*event) = DVDNAV_STOP;
this->started = 0;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
vm_position_get(this->vm, &this->position_next);
@@ -439,12 +440,12 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
fprintf(MSG_OUT, "libdvdnav: HOP_CHANNEL\n");
#endif
if (this->position_next.hop_channel - this->position_current.hop_channel >= HOP_SEEK) {
- int num_angles = 0, current;
+ int32_t num_angles = 0, current;
/* we seeked -> check for multiple angles */
vm_get_angle_info(this->vm, &current, &num_angles);
if (num_angles > 1) {
- int result, block;
+ int32_t result, block;
/* we have to skip the first VOBU when seeking in a multiangle feature,
* because it might belong to the wrong angle */
block = this->position_next.cell_start + this->position_next.block;
@@ -452,13 +453,13 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
if(result <= 0) {
printerr("Error reading NAV packet.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* Decode nav into pci and dsi. Then get next VOBU info. */
if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) {
printerr("Expected NAV packet but none found.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu);
/* skip to next, if there is a next */
@@ -479,7 +480,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
this->vobu.blockN = 0;
this->sync_wait = 0;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Check the HIGHLIGHT flag */
@@ -495,7 +496,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
hevent->buttonN = this->position_next.button;
this->position_current.button = this->position_next.button;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Check the WAIT flag */
@@ -506,14 +507,14 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
#endif
(*len) = 0;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Check to see if we need to change the currently opened VOB */
if((this->position_current.vts != this->position_next.vts) ||
(this->position_current.domain != this->position_next.domain)) {
dvd_read_domain_t domain;
- int vtsN;
+ int32_t vtsN;
dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)*buf;
if(this->file) {
@@ -542,7 +543,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
default:
printerr("Unknown domain when changing VTS.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
this->position_current.vts = this->position_next.vts;
@@ -556,7 +557,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
if(this->file == NULL) {
printerrf("Error opening vtsN=%i, domain=%i.", vtsN, domain);
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* File opened successfully so return a VTS change event */
@@ -572,7 +573,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
this->position_current.audio_channel = -1; /* Force an update */;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Check if the cell changed */
@@ -580,7 +581,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
(this->position_current.cell_restart != this->position_next.cell_restart) ||
(this->position_current.cell_start != this->position_next.cell_start) ) {
dvdnav_cell_change_event_t *cell_event = (dvdnav_cell_change_event_t *)*buf;
- int first_cell_nr, last_cell_nr, i;
+ int32_t first_cell_nr, last_cell_nr, i;
dvd_state_t *state = &this->vm->state;
(*event) = DVDNAV_CELL_CHANGE;
@@ -635,7 +636,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
this->position_current.audio_channel = -1; /* Force an update */
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* has the CLUT changed? */
@@ -648,7 +649,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
memcpy(*buf, &(state->pgc->palette), 16 * sizeof(uint32_t));
this->spu_clut_changed = 0;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* has the SPU channel changed? */
@@ -673,10 +674,10 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
stream_change->physical_letterbox != -1 &&
stream_change->physical_pan_scan != -1) {
#ifdef LOG_DEBUG
- fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning S_OK\n");
+ fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning DVDNAV_STATUS_OK\n");
#endif
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
}
@@ -692,10 +693,10 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
stream_change->physical = vm_get_audio_active_stream( this->vm );
this->position_current.audio_channel = this->position_next.audio_channel;
#ifdef LOG_DEBUG
- fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change->physical);
+ fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning DVDNAV_STATUS_OK\n",stream_change->physical);
#endif
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Check the STILLFRAME flag */
@@ -709,7 +710,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
(*len) = sizeof(dvdnav_still_event_t);
still_event->length = this->position_current.still;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Have we reached the end of a VOBU? */
@@ -741,7 +742,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
(*event) = DVDNAV_NOP;
(*len) = 0;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* Perform remapping jump if necessary (this is always a
@@ -759,13 +760,13 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
if(result <= 0) {
printerr("Error reading NAV packet.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* Decode nav into pci and dsi. Then get next VOBU info. */
if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) {
printerr("Expected NAV packet but none found.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* We need to update the vm state->blockN with which VOBU we are in.
* This is so RSM resumes to the VOBU level and not just the CELL level.
@@ -779,6 +780,10 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
*/
dvdnav_pre_cache_blocks(this->cache, this->vobu.vobu_start+1, this->vobu.vobu_length+1);
+ /* release NAV menu filter, when we reach the same NAV packet again */
+ if (this->last_cmd_nav_lbn == this->pci.pci_gi.nv_pck_lbn)
+ this->last_cmd_nav_lbn = 0;
+
/* Successfully got a NAV packet */
(*event) = DVDNAV_NAV_PACKET;
#ifdef LOG_DEBUG
@@ -786,14 +791,14 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
#endif
(*len) = 2048;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
/* If we've got here, it must just be a normal block. */
if(!this->file) {
printerr("Attempting to read without opening file.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
this->vobu.blockN++;
@@ -801,24 +806,24 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
if(result <= 0) {
printerr("Error reading from DVD.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
(*event) = DVDNAV_BLOCK_OK;
(*len) = 2048;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_get_title_string(dvdnav_t *this, const char **title_str) {
if(!this || !title_str) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
(*title_str) = this->vm->dvd_name;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
uint8_t dvdnav_get_video_aspect(dvdnav_t *this) {
@@ -1036,12 +1041,12 @@ int8_t dvdnav_is_domain_vts(dvdnav_t *this) {
}
/* Generally delegate angle information handling to VM */
-dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int angle) {
- int num, current;
+dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int32_t angle) {
+ int32_t num, current;
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
@@ -1052,25 +1057,25 @@ dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int angle) {
} else {
printerr("Passed an invalid angle number.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
-dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int *current_angle,
- int *number_of_angles) {
+dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int32_t *current_angle,
+ int32_t *number_of_angles) {
if(!this || !current_angle || !number_of_angles) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
vm_get_angle_info(this->vm, current_angle, number_of_angles);
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
pci_t* dvdnav_get_current_nav_pci(dvdnav_t *this) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 00:57:34 +0000