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

r863 - trunk/libdvdnav/ChangeLog
by nicodvb 11 Apr '07

11 Apr '07

Author: nicodvb Date: Wed Apr 11 21:53:43 2007 New Revision: 863 Modified: trunk/libdvdnav/ChangeLog Log: mention dvdnav_audio_stream_channels() by Andreas Oman (andreas olebyn nu) Modified: trunk/libdvdnav/ChangeLog ============================================================================== --- trunk/libdvdnav/ChangeLog (original) +++ trunk/libdvdnav/ChangeLog Wed Apr 11 21:53:43 2007 @@ -1,3 +1,4 @@ + * added dvdnav_audio_stream_channels() to return number of channels * fixed dvdnav_time_search() in multi-angle dvds (but it still needs improvements) * added dvdnav_audio_stream_format() to identify the codec used

1 0

r862 - in trunk/libdvdnav/src: dvdnav.c dvdnav.h
by nicodvb 11 Apr '07

11 Apr '07

Author: nicodvb Date: Wed Apr 11 21:52:10 2007 New Revision: 862 Modified: trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/dvdnav.h Log: added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu) Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Wed Apr 11 21:52:10 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/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Wed Apr 11 21:52:10 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

r861 - trunk/libdvdnav/ChangeLog
by nicodvb 10 Apr '07

10 Apr '07

Author: nicodvb Date: Wed Apr 11 00:09:23 2007 New Revision: 861 Modified: trunk/libdvdnav/ChangeLog Log: mention recent improvements Modified: trunk/libdvdnav/ChangeLog ============================================================================== --- trunk/libdvdnav/ChangeLog (original) +++ trunk/libdvdnav/ChangeLog Wed Apr 11 00:09:23 2007 @@ -1,3 +1,7 @@ + * fixed dvdnav_time_search() in multi-angle dvds (but it still needs + improvements) + * added dvdnav_audio_stream_format() to identify the codec used + in audio streams * starting DVD playback at specific title/part positions with dvdnav_{title,part}_play() works again * removed wrong SPU stream change event filter

1 0

r860 - trunk/libdvdnav/src/dvdnav.h
by nicodvb 10 Apr '07

10 Apr '07

Author: nicodvb Date: Tue Apr 10 22:50:09 2007 New Revision: 860 Modified: trunk/libdvdnav/src/dvdnav.h Log: renamed dvdnav_audio_stream_to_format() as dvdnav_audio_stream_format() as implemeted in dvdnav.c; patch by Andreas Oman (andreas olebyn nu) Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Tue Apr 10 22:50:09 2007 @@ -564,7 +564,7 @@ uint16_t dvdnav_audio_stream_to_lang(dvd * Returns the format of *logical* audio stream 'stream' * (returns 0xffff if no such stream). */ -uint16_t dvdnav_audio_stream_to_format(dvdnav_t *self, uint8_t stream); +uint16_t dvdnav_audio_stream_format(dvdnav_t *self, uint8_t stream); /* * Converts a *logical* subpicture stream id into country code

1 0

r859 - trunk/libdvdnav/DEVELOPMENT-POLICY.txt
by nicodvb 09 Apr '07

09 Apr '07

Author: nicodvb Date: Mon Apr 9 20:39:52 2007 New Revision: 859 Modified: trunk/libdvdnav/DEVELOPMENT-POLICY.txt Log: mention that trivial fixes don't need authorization Modified: trunk/libdvdnav/DEVELOPMENT-POLICY.txt ============================================================================== --- trunk/libdvdnav/DEVELOPMENT-POLICY.txt (original) +++ trunk/libdvdnav/DEVELOPMENT-POLICY.txt Mon Apr 9 20:39:52 2007 @@ -17,6 +17,9 @@ When committing code to the repository a - if you break something by accident fix it immediately using the appropriate svn tools to revert your commit(s). If in doubt ask explanations to the mailing list +- trivial patches such as spell fixes, prototype mismatch, missing includes, + more proper variable typization and similar should be committed without asking + prior authorization If in violation of this changes your account will be deleted.

1 0

[Fwd: r858 - trunk/libdvdnav/src/searching.c]
by Nico Sabbi 09 Apr '07

09 Apr '07

-------- Original Message -------- Subject: r858 - trunk/libdvdnav/src/searching.c Date: Mon, 9 Apr 2007 11:56:41 +0200 (CEST) From: nicodvb <subversion(a)mplayerhq.hu> To: nicola_sabbi(a)fastwebnet.it Author: nicodvb Date: Mon Apr 9 11:56:41 2007 New Revision: 858 Modified: trunk/libdvdnav/src/searching.c Log: in dvdnav_time_search() skip secondary angles when searching the cell to hump to Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Mon Apr 9 11:56:41 2007 @@ -139,6 +139,8 @@ dvdnav_status_t dvdnav_time_search(dvdna found = 0; for(cell_nr = first_cell_nr; (cell_nr <= last_cell_nr) && !found; cell_nr ++) { cell = &(state->pgc->cell_playback[cell_nr-1]); + if(cell->block_type == BLOCK_TYPE_ANGLE_BLOCK && cell->block_mode != BLOCK_MODE_FIRST_CELL) + continue; length = dvdnav_convert_time(&cell->playback_time); if (target >= length) { target -= length;

1 0

[Fwd: r857 - trunk/libdvdnav/DEVELOPMENT-POLICY.txt]
by Nico Sabbi 09 Apr '07

09 Apr '07

-------- Original Message -------- Subject: r857 - trunk/libdvdnav/DEVELOPMENT-POLICY.txt Date: Mon, 9 Apr 2007 10:44:29 +0200 (CEST) From: nicodvb <subversion(a)mplayerhq.hu> To: nicola_sabbi(a)fastwebnet.it Author: nicodvb Date: Mon Apr 9 10:44:28 2007 New Revision: 857 Added: trunk/libdvdnav/DEVELOPMENT-POLICY.txt (contents, props changed) Log: some clarification on the development policy and goals Added: trunk/libdvdnav/DEVELOPMENT-POLICY.txt ============================================================================== --- (empty file) +++ trunk/libdvdnav/DEVELOPMENT-POLICY.txt Mon Apr 9 10:44:28 2007 @@ -0,0 +1,22 @@ +This fork of dvdnav was created to overcome the lack of responsiveness +of the official development channel, not to bastardize this library in +something for specific usagee by mplayer, so these are the rules to follow +when developing code: +- don't remove pre-existing code that mplayer doesn't need +- don't add code to expose the internals of dvdnav +- don't add code that binds applications to side-effects of the library +- don't alter the API in an incompatible manner + + +When committing code to the repository always follow these rules: +- don't break the compilability of the library - always keep svn checkouts usable +- never mix cosmetical and functional changes +- don't commit unrelated changes as a single transaction +- don't split strictly related changes over multiple commits +- never alter the indentation / bracing / prototyping style of existing files +- if you break something by accident fix it immediately using the appropriate + svn tools to revert your commit(s). If in doubt ask explanations to the + mailing list + + +If in violation of this changes your account will be deleted.

1 0

[Fwd: r856 - in trunk/libdvdnav/src: dvdnav.c dvdnav.h dvdnav_internal.h searching.c]
by Nico Sabbi 09 Apr '07

09 Apr '07

-------- Original Message -------- Subject: r856 - in trunk/libdvdnav/src: dvdnav.c dvdnav.h dvdnav_internal.h searching.c Date: Sun, 8 Apr 2007 19:45:19 +0200 (CEST) From: nicodvb <subversion(a)mplayerhq.hu> To: nicola_sabbi(a)fastwebnet.it Author: nicodvb Date: Sun Apr 8 19:45:19 2007 New Revision: 856 Modified: trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdnav_internal.h trunk/libdvdnav/src/searching.c Log: implemented dvdnav_get_current_time() with obvious meaning Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sun Apr 8 19:45:19 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/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Sun Apr 8 19:45:19 2007 @@ -361,6 +361,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/libdvdnav/src/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_internal.h (original) +++ trunk/libdvdnav/src/dvdnav_internal.h Sun Apr 8 19:45:19 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/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Sun Apr 8 19:45:19 2007 @@ -122,6 +122,7 @@ dvdnav_status_t dvdnav_time_search(dvdna } + this->cur_cell_time = 0; if (this->pgc_based) { first_cell_nr = 1; last_cell_nr = state->pgc->nr_of_cells; @@ -242,6 +243,7 @@ dvdnav_status_t dvdnav_sector_search(dvd return DVDNAV_STATUS_ERR; } + this->cur_cell_time = 0; if (this->pgc_based) { first_cell_nr = 1; last_cell_nr = state->pgc->nr_of_cells; @@ -328,6 +330,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 @@ -361,6 +364,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 @@ -404,6 +408,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); @@ -432,6 +437,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

[Fwd: r855 - trunk/libdvdnav/src/dvdnav.h]
by Nico Sabbi 09 Apr '07

09 Apr '07

-------- Original Message -------- Subject: r855 - trunk/libdvdnav/src/dvdnav.h Date: Sun, 8 Apr 2007 19:41:12 +0200 (CEST) From: nicodvb <subversion(a)mplayerhq.hu> To: nicola_sabbi(a)fastwebnet.it Author: nicodvb Date: Sun Apr 8 19:41:12 2007 New Revision: 855 Modified: trunk/libdvdnav/src/dvdnav.h Log: define MP_DVDNAV to identify the version of the library used used Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Sun Apr 8 19:41:12 2007 @@ -29,6 +29,8 @@ #ifndef DVDNAV_H_INCLUDED #define DVDNAV_H_INCLUDED +#define MP_DVDNAV 1 + #ifdef __cplusplus extern "C" { #endif

1 0

[Fwd: r854 - trunk/CVSROOT]
by Nico Sabbi 09 Apr '07

09 Apr '07

-------- Original Message -------- Subject: r854 - trunk/CVSROOT Date: Sat, 7 Apr 2007 20:09:58 +0200 (CEST) From: nicodvb <subversion(a)mplayerhq.hu> To: nicola_sabbi(a)fastwebnet.it Author: nicodvb Date: Sat Apr 7 20:09:58 2007 New Revision: 854 Removed: trunk/CVSROOT/ Log: removed CVSROOT

1 0