April 2007 - DVDnav-discuss - lists.mplayerhq.hu

r922 - trunk/libdvdnav2/src/remap.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:46:59 2007 New Revision: 922 Log: replaced sequency of strncpy() and strncat() by 1 snprintf() and fixed off-by-1 possible buffer oveflow; patch by Diego Petteno' Modified: trunk/libdvdnav2/src/remap.c Modified: trunk/libdvdnav2/src/remap.c ============================================================================== --- trunk/libdvdnav2/src/remap.c (original) +++ trunk/libdvdnav2/src/remap.c Sun Apr 29 13:46:59 2007 @@ -190,10 +190,7 @@ remap_t* remap_loadmap( char *title) { /* Build the map filename */ home = getenv("HOME"); assert(home); - strncpy(fname, home, sizeof(fname)); - strncat(fname, "/.dvdnav/", sizeof(fname)); - strncat(fname, title, sizeof(fname)); - strncat(fname, ".map", sizeof(fname)); + snprintf(fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title); /* Open the map file */ fp = fopen( fname, "r");

1 0

r921 - trunk/libdvdnav2/src/dvdread/dvd_input.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:44:46 2007 New Revision: 921 Log: support for dvdcss in Darwin; patch by Diego Petteno' and Reimar Modified: trunk/libdvdnav2/src/dvdread/dvd_input.c Modified: trunk/libdvdnav2/src/dvdread/dvd_input.c ============================================================================== --- trunk/libdvdnav2/src/dvdread/dvd_input.c (original) +++ trunk/libdvdnav2/src/dvdread/dvd_input.c Sun Apr 29 13:44:46 2007 @@ -287,11 +287,14 @@ int dvdinput_setup(void) #else /* dlopening libdvdcss */ -#ifndef WIN32 - dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); +#ifdef __APPLE__ + #define CSS_LIB "libdvdcss.2.dylib" +#elif defined(WIN32) + #define CSS_LIB "libdvdcss.dll" #else - dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); + #define CSS_LIB "libdvdcss.so.2" #endif + dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); if(dvdcss_library != NULL) { #if defined(__OpenBSD__) && !defined(__ELF__) @@ -323,8 +326,7 @@ int dvdinput_setup(void) dvdcss_library = NULL; } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek || !DVDcss_read || !DVDcss_error || !dvdcss_version) { - fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " - "this shouldn't happen !\n"); + fprintf(stderr, "libdvdread: Missing symbols in " CSS_LIB ", this shouldn't happen !\n"); dlclose(dvdcss_library); } }

1 0

r920 - trunk/libdvdnav2/src/dvdread/md5.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:40:48 2007 New Revision: 920 Log: removed redefinition of memcpy() as bcopy() (maybe done for some probably inexistent systems); patch by Diego Petteno Modified: trunk/libdvdnav2/src/dvdread/md5.c Modified: trunk/libdvdnav2/src/dvdread/md5.c ============================================================================== --- trunk/libdvdnav2/src/dvdread/md5.c (original) +++ trunk/libdvdnav2/src/dvdread/md5.c Sun Apr 29 13:40:48 2007 @@ -26,14 +26,8 @@ #include <sys/types.h> -#if STDC_HEADERS || defined _LIBC -# include <stdlib.h> -# include <string.h> -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif +#include <stdlib.h> +#include <string.h> #include "md5.h" /* #include "unlocked-io.h" */

1 0

r919 - in trunk/libdvdnav2/src/vm: decoder.c vmcmd.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:39:21 2007 New Revision: 919 Log: replaced 08llx with PRIx64; patch by Diego Petteno' Modified: trunk/libdvdnav2/src/vm/decoder.c trunk/libdvdnav2/src/vm/vmcmd.c Modified: trunk/libdvdnav2/src/vm/decoder.c ============================================================================== --- trunk/libdvdnav2/src/vm/decoder.c (original) +++ trunk/libdvdnav2/src/vm/decoder.c Sun Apr 29 13:39:21 2007 @@ -572,7 +572,7 @@ static int32_t eval_command(uint8_t *byt if(command.instruction & ~ command.examined) { fprintf(MSG_OUT, "libdvdnav: decoder.c: [WARNING, unknown bits:"); - fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) ); + fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) ); fprintf(MSG_OUT, "]\n"); } Modified: trunk/libdvdnav2/src/vm/vmcmd.c ============================================================================== --- trunk/libdvdnav2/src/vm/vmcmd.c (original) +++ trunk/libdvdnav2/src/vm/vmcmd.c Sun Apr 29 13:39:21 2007 @@ -520,7 +520,7 @@ void vm_print_mnemonic(vm_cmd_t *vm_comm if(command.instruction & ~ command.examined) { fprintf(MSG_OUT, " libdvdnav: vmcmd.c: [WARNING, unknown bits:"); - fprintf(MSG_OUT, " %08llx", (command.instruction & ~ command.examined) ); + fprintf(MSG_OUT, " %08"PRIx64, (command.instruction & ~ command.examined) ); fprintf(MSG_OUT, "]"); } }

1 0

r918 - trunk/libdvdnav2/src/searching.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:37:39 2007 New Revision: 918 Log: in dvdnav_time_search() vobu and start are uint32_t Modified: trunk/libdvdnav2/src/searching.c Modified: trunk/libdvdnav2/src/searching.c ============================================================================== --- trunk/libdvdnav2/src/searching.c (original) +++ trunk/libdvdnav2/src/searching.c Sun Apr 29 13:37:39 2007 @@ -197,13 +197,13 @@ dvdnav_status_t dvdnav_sector_search(dvd } if(found) { - int32_t vobu; + uint32_t vobu; #ifdef LOG_DEBUG fprintf(MSG_OUT, "libdvdnav: Seeking to cell %i from choice of %i to %i\n", cell_nr, first_cell_nr, last_cell_nr); #endif if (dvdnav_scan_admap(this, state->domain, target, &vobu) == DVDNAV_STATUS_OK) { - int32_t start = state->pgc->cell_playback[cell_nr-1].first_sector; + uint32_t start = state->pgc->cell_playback[cell_nr-1].first_sector; if (vm_jump_cell_block(this->vm, cell_nr, vobu - start)) { #ifdef LOG_DEBUG

1 0

r917 - trunk/libdvdnav2/src/dvdnav.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:35:32 2007 New Revision: 917 Log: removed unused format variable in dvdnav_audio_stream_channels() Modified: trunk/libdvdnav2/src/dvdnav.c Modified: trunk/libdvdnav2/src/dvdnav.c ============================================================================== --- trunk/libdvdnav2/src/dvdnav.c (original) +++ trunk/libdvdnav2/src/dvdnav.c Sun Apr 29 13:35:32 2007 @@ -943,7 +943,6 @@ uint16_t dvdnav_audio_stream_format(dvdn uint16_t dvdnav_audio_stream_channels(dvdnav_t *this, uint8_t stream) { audio_attr_t attr; - uint16_t format; if(!this) { printerr("Passed a NULL pointer.");

1 0

r916 - in trunk/libdvdnav2/src: dvdnav.c dvdnav.h
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:33:59 2007 New Revision: 916 Log: added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu) Modified: trunk/libdvdnav2/src/dvdnav.c trunk/libdvdnav2/src/dvdnav.h Modified: trunk/libdvdnav2/src/dvdnav.c ============================================================================== --- trunk/libdvdnav2/src/dvdnav.c (original) +++ trunk/libdvdnav2/src/dvdnav.c Sun Apr 29 13:33:59 2007 @@ -941,6 +941,26 @@ uint16_t dvdnav_audio_stream_format(dvdn return format; } +uint16_t dvdnav_audio_stream_channels(dvdnav_t *this, uint8_t stream) { + audio_attr_t attr; + uint16_t format; + + if(!this) { + printerr("Passed a NULL pointer."); + return -1; /* 0xffff */ + } + if(!this->started) { + printerr("Virtual DVD machine not started."); + return -1; /* 0xffff */ + } + + pthread_mutex_lock(&this->vm_lock); + attr = vm_get_audio_attr(this->vm, stream); + pthread_mutex_unlock(&this->vm_lock); + + return attr.channels + 1; +} + uint16_t dvdnav_spu_stream_to_lang(dvdnav_t *this, uint8_t stream) { subp_attr_t attr; Modified: trunk/libdvdnav2/src/dvdnav.h ============================================================================== --- trunk/libdvdnav2/src/dvdnav.h (original) +++ trunk/libdvdnav2/src/dvdnav.h Sun Apr 29 13:33:59 2007 @@ -567,6 +567,12 @@ uint16_t dvdnav_audio_stream_to_lang(dvd uint16_t dvdnav_audio_stream_format(dvdnav_t *self, uint8_t stream); /* + * Returns number of channelsn in *logical* audio stream 'stream' + * (returns 0xffff if no such stream). + */ +uint16_t dvdnav_audio_stream_channels(dvdnav_t *self, uint8_t stream); + +/* * Converts a *logical* subpicture stream id into country code * (returns 0xffff if no such stream). */

1 0

r915 - trunk/libdvdnav2/src/dvdnav.h
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:32:29 2007 New Revision: 915 Log: defined MP_DVDNAV Modified: trunk/libdvdnav2/src/dvdnav.h Modified: trunk/libdvdnav2/src/dvdnav.h ============================================================================== --- trunk/libdvdnav2/src/dvdnav.h (original) +++ trunk/libdvdnav2/src/dvdnav.h Sun Apr 29 13:32:29 2007 @@ -29,6 +29,8 @@ #ifndef DVDNAV_H_INCLUDED #define DVDNAV_H_INCLUDED +#define MP_DVDNAV 1 + #ifdef __cplusplus extern "C" { #endif

1 0

r914 - in trunk/libdvdnav2/src: dvdnav.c dvdnav.h dvdnav_internal.h searching.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:31:22 2007 New Revision: 914 Log: implemented dvdnav_get_current_time() to return the current time reported in the dsi Modified: trunk/libdvdnav2/src/dvdnav.c trunk/libdvdnav2/src/dvdnav.h trunk/libdvdnav2/src/dvdnav_internal.h trunk/libdvdnav2/src/searching.c Modified: trunk/libdvdnav2/src/dvdnav.c ============================================================================== --- trunk/libdvdnav2/src/dvdnav.c (original) +++ trunk/libdvdnav2/src/dvdnav.c Sun Apr 29 13:31:22 2007 @@ -56,6 +56,7 @@ static dvdnav_status_t dvdnav_clear(dvdn this->sync_wait_skip = 0; this->spu_clut_changed = 0; this->started = 0; + this->cur_cell_time = 0; dvdnav_read_cache_clear(this->cache); @@ -388,6 +389,23 @@ dvdnav_status_t dvdnav_get_next_block(dv } return status; } + +int64_t dvdnav_get_current_time(dvdnav_t *this) { + int i; + int64_t tm=0; + dvd_state_t *state = &this->vm->state; + + for(i=0; i<state->cellN-1; i++) { + if(! + (state->pgc->cell_playback[i].block_type == BLOCK_TYPE_ANGLE_BLOCK && + state->pgc->cell_playback[i].block_mode != BLOCK_MODE_FIRST_CELL) + ) + tm += dvdnav_convert_time(&state->pgc->cell_playback[i].playback_time); + } + tm += this->cur_cell_time; + + return tm; +} dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf, int32_t *event, int32_t *len) { @@ -583,6 +601,7 @@ dvdnav_status_t dvdnav_get_next_cache_bl int32_t first_cell_nr, last_cell_nr, i; dvd_state_t *state = &this->vm->state; + this->cur_cell_time = 0; (*event) = DVDNAV_CELL_CHANGE; #ifdef LOG_DEBUG fprintf(MSG_OUT, "libdvdnav: CELL_CHANGE\n"); @@ -783,6 +802,7 @@ dvdnav_status_t dvdnav_get_next_cache_bl fprintf(MSG_OUT, "libdvdnav: NAV_PACKET\n"); #endif (*len) = 2048; + this->cur_cell_time = dvdnav_convert_time(&this->dsi.dsi_gi.c_eltm); pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_OK; } Modified: trunk/libdvdnav2/src/dvdnav.h ============================================================================== --- trunk/libdvdnav2/src/dvdnav.h (original) +++ trunk/libdvdnav2/src/dvdnav.h Sun Apr 29 13:31:22 2007 @@ -359,6 +359,12 @@ dvdnav_status_t dvdnav_sector_search(dvd uint64_t offset, int32_t origin); /* + returns the current stream time in PTS ticks as reported by the IFO structures + divide it by 90000 to get the current play time in seconds + */ +int64_t dvdnav_get_current_time(dvdnav_t *this); + +/* * Stop playing the current position and start playback of the title * from the specified timecode. * Modified: trunk/libdvdnav2/src/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav2/src/dvdnav_internal.h (original) +++ trunk/libdvdnav2/src/dvdnav_internal.h Sun Apr 29 13:31:22 2007 @@ -171,6 +171,7 @@ struct dvdnav_s { int started; /* vm_start has been called? */ int use_read_ahead; /* 1 - use read-ahead cache, 0 - don't */ int pgc_based; /* positioning works PGC based instead of PG based */ + int cur_cell_time; /* time expired since the beginning of the current cell, read from the dsi */ /* VM */ vm_t *vm; Modified: trunk/libdvdnav2/src/searching.c ============================================================================== --- trunk/libdvdnav2/src/searching.c (original) +++ trunk/libdvdnav2/src/searching.c Sun Apr 29 13:31:22 2007 @@ -165,6 +165,8 @@ dvdnav_status_t dvdnav_sector_search(dvd return DVDNAV_STATUS_ERR; } + this->cur_cell_time = 0; + this->cur_cell_time = 0; if (this->pgc_based) { first_cell_nr = 1; last_cell_nr = state->pgc->nr_of_cells; @@ -253,6 +255,7 @@ dvdnav_status_t dvdnav_prev_pg_search(dv pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; } + this->cur_cell_time = 0; this->position_current.still = 0; this->vm->hop_channel++; #ifdef LOG_DEBUG @@ -286,6 +289,7 @@ dvdnav_status_t dvdnav_top_pg_search(dvd pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; } + this->cur_cell_time = 0; this->position_current.still = 0; this->vm->hop_channel++; #ifdef LOG_DEBUG @@ -329,6 +333,7 @@ dvdnav_status_t dvdnav_next_pg_search(dv return DVDNAV_STATUS_ERR; } } + this->cur_cell_time = 0; /* merge changes on success */ vm_merge(this->vm, try_vm); vm_free_copy(try_vm); @@ -357,6 +362,7 @@ dvdnav_status_t dvdnav_menu_call(dvdnav_ return DVDNAV_STATUS_ERR; } + this->cur_cell_time = 0; /* make a copy of current VM and try to navigate the copy to the menu */ try_vm = vm_new_copy(this->vm); if ( (menu == DVD_MENU_Escape) && (this->vm->state.domain != VTS_DOMAIN)) {

1 0

r913 - in trunk/libdvdnav2/src: dvdnav.c dvdnav.h
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:25:57 2007 New Revision: 913 Log: implemented dvdnav_audio_stream_format() to identify the codec used Modified: trunk/libdvdnav2/src/dvdnav.c trunk/libdvdnav2/src/dvdnav.h Modified: trunk/libdvdnav2/src/dvdnav.c ============================================================================== --- trunk/libdvdnav2/src/dvdnav.c (original) +++ trunk/libdvdnav2/src/dvdnav.c Sun Apr 29 13:25:57 2007 @@ -879,6 +879,48 @@ uint16_t dvdnav_audio_stream_to_lang(dvd return attr.lang_code; } +uint16_t dvdnav_audio_stream_format(dvdnav_t *this, uint8_t stream) { + audio_attr_t attr; + uint16_t format; + + if(!this) { + printerr("Passed a NULL pointer."); + return -1; /* 0xffff */ + } + if(!this->started) { + printerr("Virtual DVD machine not started."); + return -1; /* 0xffff */ + } + + pthread_mutex_lock(&this->vm_lock); + attr = vm_get_audio_attr(this->vm, stream); + pthread_mutex_unlock(&this->vm_lock); + + switch(attr.audio_format) { + case 0: + format = DVDNAV_FORMAT_AC3; + break; + case 2: /* MPEG-1 or MPEG-2 without extension bitstream. */ + case 3: /* MPEG-2 with extension bitstream. */ + format = DVDNAV_FORMAT_MPEGAUDIO; + break; + case 4: + format = DVDNAV_FORMAT_LPCM; + break; + case 6: + format = DVDNAV_FORMAT_DTS; + break; + case 7: + format = DVDNAV_FORMAT_SDDS; + break; + default: + format = 0xffff; + break; + } + + return format; +} + uint16_t dvdnav_spu_stream_to_lang(dvdnav_t *this, uint8_t stream) { subp_attr_t attr; Modified: trunk/libdvdnav2/src/dvdnav.h ============================================================================== --- trunk/libdvdnav2/src/dvdnav.h (original) +++ trunk/libdvdnav2/src/dvdnav.h Sun Apr 29 13:25:57 2007 @@ -70,6 +70,11 @@ typedef int32_t dvdnav_status_t; #define DVDNAV_STATUS_ERR 0 #define DVDNAV_STATUS_OK 1 +#define DVDNAV_FORMAT_AC3 0 +#define DVDNAV_FORMAT_MPEGAUDIO 3 +#define DVDNAV_FORMAT_LPCM 4 +#define DVDNAV_FORMAT_DTS 5 +#define DVDNAV_FORMAT_SDDS 6 /********************************************************************* * initialisation & housekeeping functions * @@ -548,6 +553,12 @@ uint8_t dvdnav_get_video_scale_permissio uint16_t dvdnav_audio_stream_to_lang(dvdnav_t *self, uint8_t stream); /* + * Returns the format of *logical* audio stream 'stream' + * (returns 0xffff if no such stream). + */ +uint16_t dvdnav_audio_stream_format(dvdnav_t *self, uint8_t stream); + +/* * Converts a *logical* subpicture stream id into country code * (returns 0xffff if no such stream). */

1 0