October 2003 - MPlayer-cvslog - lists.mplayerhq.hu

Rx: VICODIN is Here - Just Pennies per Tablet...feryal
by Terry Doherty 25 Oct '03

25 Oct '03

VICODIN Is Here FRE.E-shipping on a 3 month supply (90-count) www.rxanytime.biz/superstore Vicodin ES 30 tablets - 4.63 per tablet ES 90 tablets - 2.32 per tablet - BEST DEAL - Plus FRE.E-SHIPPING www.rxanytime.biz/superstore No more ads - www.rxanytime.biz/a.html cjh oqbfpwt aiu plsomla coa rs g dahd ozlh vat qj

1 0

CVS: main m_option.c,1.22,1.23 cfg-mencoder.h,1.70,1.71 cfg-common.h,1.117,1.118 AUTHORS,1.37,1.38
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv32042 Modified Files: m_option.c cfg-mencoder.h cfg-common.h AUTHORS Log Message: -vop ---> -vf Index: m_option.c =================================================================== RCS file: /cvsroot/mplayer/main/m_option.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- m_option.c 31 Aug 2003 21:11:35 -0000 1.22 +++ m_option.c 25 Oct 2003 18:44:41 -0000 1.23 @@ -613,7 +613,7 @@ "\t-pre: Add the given parameters at the begining of the list.\n" "\t-del: Remove the entry at the given indices.\n" "\t-clr: Clear the list.\n" - "e.g: -vop-add flip,mirror -vop-del 2,5\n", + "e.g: -vf-add flip,mirror -vf-del 2,5\n", sizeof(char**), M_OPT_TYPE_DYNAMIC | M_OPT_TYPE_ALLOW_WILDCARD, parse_str_list, Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- cfg-mencoder.h 19 Aug 2003 15:10:10 -0000 1.70 +++ cfg-mencoder.h 25 Oct 2003 18:44:41 -0000 1.71 @@ -168,8 +168,8 @@ {"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, 2, NULL}, {"audio-delay", &audio_delay, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, - {"x", "This option is obsolete, use -vop scale=w:h for scaling\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"xsize", "This option is obsolete, use -vop crop=w:h:x0:y0 for cropping\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"x", "This option is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"xsize", "This option is obsolete, use -vf crop=w:h:x0:y0 for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // output audio/video codec selection {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- cfg-common.h 22 Oct 2003 19:01:05 -0000 1.117 +++ cfg-common.h 25 Oct 2003 18:44:41 -0000 1.118 @@ -170,7 +170,7 @@ #else {"oldpp", "MPlayer was compiled without opendivx library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif - {"npp", "-npp has been removed, use -vop pp and read the fine manual\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"npp", "-npp has been removed, use -vf pp and read the fine manual.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #ifdef FF_POSTPROCESS {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, #endif Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- AUTHORS 22 Oct 2003 16:43:29 -0000 1.37 +++ AUTHORS 25 Oct 2003 18:44:41 -0000 1.38 @@ -345,7 +345,7 @@ * rawdv demuxer fixes Hampa Hug <hhug(a)student.ethz.ch> - * LUT-based soft eq video filter (-vop eq2) + * LUT-based soft eq video filter (-vf eq2) * .ogm demuxer endianess fixes Uwe Reder <Uwe.Reder(a)3SOFT.de>

1 0

CVS: main/help help_mp-fr.h,1.50,1.51
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv29788/help Modified Files: help_mp-fr.h Log Message: -vop ---> -vf Index: help_mp-fr.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-fr.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- help_mp-fr.h 20 Oct 2003 16:32:35 -0000 1.50 +++ help_mp-fr.h 25 Oct 2003 18:37:54 -0000 1.51 @@ -133,7 +133,7 @@ #define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Auteur: %s\n" #define MSGTR_AOComment "AO: Commentaire: %s\n" #define MSGTR_Video_NoVideo "Vidéo: pas de vidéo\n" -#define MSGTR_NotInitializeVOPorVO "\nFATAL: impossible d'initialiser les filtres vidéo (-vop) ou la sortie vidéo (-vo).\n" +#define MSGTR_NotInitializeVOPorVO "\nFATAL: impossible d'initialiser les filtres vidéo (-vf) ou la sortie vidéo (-vo).\n" #define MSGTR_Paused "\n ===== PAUSE =====\r" // no more than 23 characters (status line for audio files) #define MSGTR_PlaylistLoadUnable "\nImpossible de charger la liste de lecture %s.\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ @@ -352,7 +352,7 @@ // vd.c #define MSGTR_CodecDidNotSet "VDec: le codec n'a pas défini sh->disp_w et sh->disp_h, essai de contournement !\n" #define MSGTR_VoConfigRequest "VDec: requête de configuration de vo - %d x %d (csp préferé: %s)\n" -#define MSGTR_CouldNotFindColorspace "N'a pas pu trouver d'espace de couleur correspondant - nouvel essai avec -vop scale...\n" +#define MSGTR_CouldNotFindColorspace "N'a pas pu trouver d'espace de couleur correspondant - nouvel essai avec -vf scale...\n" #define MSGTR_MovieAspectIsSet "L'aspect du film est %.2f:1 - pré-redimensionnement à l'aspect correct.\n" #define MSGTR_MovieAspectUndefined "L'aspect du film est indéfini - pas de pré-redimensionnement appliqué.\n"

1 0

CVS: main/libvo vo_tdfxfb.c,1.26,1.27
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv29788/libvo Modified Files: vo_tdfxfb.c Log Message: -vop ---> -vf Index: vo_tdfxfb.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- vo_tdfxfb.c 15 Oct 2003 16:50:27 -0000 1.26 +++ vo_tdfxfb.c 25 Oct 2003 18:37:51 -0000 1.27 @@ -19,7 +19,7 @@ * * Hints and tricks: * - Use -dr to get direct rendering - * - Use -vop yuy2 to get yuy2 rendering, *MUCH* faster than yv12 + * - Use -vf yuy2 to get yuy2 rendering, *MUCH* faster than yv12 * - To get a black background and nice smooth OSD, use -double * - To get the console as a background, but with scaled OSD, use -nodouble * - The driver supports both scaling and shrinking the image using the -x and

1 0

CVS: main/libmpcodecs vd.c,1.71,1.72 ve_libdv.c,1.7,1.8 vf_cropdetect.c,1.7,1.8 vf_rectangle.c,1.8,1.9
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv29788/libmpcodecs Modified Files: vd.c ve_libdv.c vf_cropdetect.c vf_rectangle.c Log Message: -vop ---> -vf Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- vd.c 28 Aug 2003 21:23:01 -0000 1.71 +++ vd.c 25 Oct 2003 18:37:34 -0000 1.72 @@ -218,7 +218,7 @@ goto csp_again; } else if(palette==1){ - mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vop palette...\n"); + mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vf palette...\n"); palette=-1; vf=vf_open_filter(vf,"palette",NULL); goto csp_again; Index: ve_libdv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ve_libdv.c 19 Jan 2003 01:48:52 -0000 1.7 +++ ve_libdv.c 25 Oct 2003 18:37:34 -0000 1.8 @@ -43,7 +43,7 @@ unsigned int flags, unsigned int outfmt){ if(width!=DV_WIDTH || (height!=DV_PAL_HEIGHT && height!=DV_NTSC_HEIGHT)){ - mp_msg(MSGT_VFILTER,MSGL_ERR,"DV: only 720x480 (NTSC) and 720x576 (PAL) resolutions allowed! try with -vop scale=720:480\n"); + mp_msg(MSGT_VFILTER,MSGL_ERR,"DV: only 720x480 (NTSC) and 720x576 (PAL) resolutions allowed! Try with -vf scale=720:480\n"); } vf->priv->enc->isPAL=(height==DV_PAL_HEIGHT); Index: vf_cropdetect.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_cropdetect.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vf_cropdetect.c 15 Mar 2003 18:01:02 -0000 1.7 +++ vf_cropdetect.c 25 Oct 2003 18:37:34 -0000 1.8 @@ -106,7 +106,7 @@ x=(vf->priv->x1+1)&(~1); y=(vf->priv->y1+1)&(~1); - printf("crop area: X: %d..%d Y: %d..%d (-vop crop=%d:%d:%d:%d)\n", + printf("crop area: X: %d..%d Y: %d..%d (-vf crop=%d:%d:%d:%d)\n", vf->priv->x1,vf->priv->x2, vf->priv->y1,vf->priv->y2, (vf->priv->x2+1-x)&(~1),(vf->priv->y2+1-y)&(~1),x,y Index: vf_rectangle.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rectangle.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vf_rectangle.c 15 Mar 2003 18:01:02 -0000 1.8 +++ vf_rectangle.c 25 Oct 2003 18:37:34 -0000 1.9 @@ -85,7 +85,7 @@ /* Draw the rectangle */ - mp_msg(MSGT_VFILTER,MSGL_INFO, "rectangle: -vop rectangle=%d:%d:%d:%d \n", vf->priv->w, vf->priv->h, vf->priv->x, vf->priv->y); + mp_msg(MSGT_VFILTER,MSGL_INFO, "rectangle: -vf rectangle=%d:%d:%d:%d \n", vf->priv->w, vf->priv->h, vf->priv->x, vf->priv->y); if (vf->priv->x < 0) x = 0;

1 0

CVS: main/etc codecs.conf,1.303,1.304
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv29788/etc Modified Files: codecs.conf Log Message: -vop ---> -vf Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- codecs.conf 11 Oct 2003 22:02:40 -0000 1.303 +++ codecs.conf 25 Oct 2003 18:37:56 -0000 1.304 @@ -203,7 +203,7 @@ videocodec cram info "Microsoft Video 1" - comment "-vop palette required for 8bpp" + comment "-vf palette required for 8bpp" status buggy fourcc cram,CRAM CRAM fourcc msvc,MSVC CRAM

1 0

CVS: main/TOOLS mencvcd,1.14,1.15 sws-test,1.1,1.2
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var/tmp.root/cvs-serv28424/TOOLS Modified Files: mencvcd sws-test Log Message: -vop ---> -vf Index: mencvcd =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/mencvcd,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mencvcd 9 Jul 2003 20:10:44 -0000 1.14 +++ mencvcd 25 Oct 2003 18:33:13 -0000 1.15 @@ -162,7 +162,7 @@ echo "128 starting from 3:00 with frame rate 29.97 fps and input video norm NTSC" echo "and output frame rate 23.98 fps because of the 3:2 pulldown method in NTSC." echo - echo "'$HOWCALLED bj -size 640x272 -vop expand=640:480:0:104:0 \\" + echo "'$HOWCALLED bj -size 640x272 -vf expand=640:480:0:104:0 \\" echo " -cdsize 645 -noburn bj.avi'" echo "this example above shows you, how to deal with movies which are not" echo "created with aspect ratios of 4:3 or 16:9." @@ -296,7 +296,7 @@ shift 1 ;; -sid) # mplayer option: have to set vop expand, too!!! - sub="-vop pp,expand=-1:-1:-1:-1:1 -sid $2" + sub="-vf pp,expand=-1:-1:-1:-1:1 -sid $2" shift 1 ;; -size) Index: sws-test =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/sws-test,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sws-test 9 Jul 2002 21:53:29 -0000 1.1 +++ sws-test 25 Oct 2003 18:33:13 -0000 1.2 @@ -7,13 +7,13 @@ fi for i in `seq 0 10` ; do - mplayer -vo png $1 -ss $2 -frames 3 -sws $i -vop scale=$3 + mplayer -vo png $1 -ss $2 -frames 3 -sws $i -vf scale=$3 rm 00000001.png mv 00000002.png sws-`basename $1`-$2-$3-$i.png done #gauss with lowwer variance - mplayer -vo png $1 -ss $2 -frames 3 -sws 7 -vop scale=$3:0:50 + mplayer -vo png $1 -ss $2 -frames 3 -sws 7 -vf scale=$3:0:50 rm 00000001.png mv 00000002.png sws-`basename $1`-$2-$3-7-50.png

1 0

CVS: main/TOOLS/benchmark-gab benchmark,1.3,1.4
by Diego Biurrun CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/TOOLS/benchmark-gab In directory mail:/var/tmp.root/cvs-serv28424/TOOLS/benchmark-gab Modified Files: benchmark Log Message: -vop ---> -vf Index: benchmark =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/benchmark-gab/benchmark,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- benchmark 31 Aug 2002 14:19:11 -0000 1.3 +++ benchmark 25 Oct 2003 18:33:46 -0000 1.4 @@ -43,7 +43,7 @@ if [ ! -e no_codec ]; then wrtlog Starting CODEC benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vf disabled -autoq 0" benchsamples fi @@ -53,25 +53,25 @@ if [ ! -e no_xv ]; then if [ ! -e no_xv_nodr ]; then wrtlog Starting XVideo $no DR$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vf disabled -autoq 0" benchsamples fi if [ ! -e no_xv_nodr_noslices ]; then wrtlog Starting XVideo $no DR$ $no slices$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vf disabled -autoq 0" benchsamples fi if [ ! -e no_xv_dr ]; then wrtlog Starting XVideo $DR$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vf disabled -autoq 0" benchsamples fi if [ ! -e no_xv_dr_noslices ]; then wrtlog Starting XVideo $DR$ $no slices$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vf disabled -autoq 0" benchsamples fi fi @@ -79,25 +79,25 @@ if [ -e xmga ]; then if [ ! -e xmga_nodr ]; then wrtlog Starting XMGA $no DR$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vf disabled -autoq 0" benchsamples fi if [ ! -e xmga_nodr_noslices ]; then wrtlog Starting XMGA $no DR$ $no slices$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vf disabled -autoq 0" benchsamples fi if [ ! -e xmga_dr ]; then wrtlog Starting XMGA $DR$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vf disabled -autoq 0" benchsamples fi if [ ! -e xmga_dr ]; then wrtlog Starting XMGA $DR$ $no slices$ benchmark runs, with 3 tries... - DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0" + DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vf disabled -autoq 0" benchsamples fi fi

1 0

CVS: main/libmpdemux demux_mkv.cpp,1.40,1.41
by Moritz Bunkus CVS 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv17637 Modified Files: demux_mkv.cpp Log Message: Support for -chapter selection. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- demux_mkv.cpp 22 Oct 2003 17:59:28 -0000 1.40 +++ demux_mkv.cpp 25 Oct 2003 12:42:24 -0000 1.41 @@ -77,6 +77,9 @@ // for e.g. "-slang ger" extern char *dvdsub_lang; extern char *audio_lang; +// for "-chapter x-y" +extern int dvd_chapter; +extern int dvd_last_chapter; // default values for Matroska elements #define MKVD_TIMECODESCALE 1000000 // 1000000 = 1ms @@ -187,6 +190,10 @@ uint32_t enc_keyid_len, sig_keyid_len, signature_len; } mkv_content_encoding_t; +typedef struct { + int64_t start, end; +} mkv_chapter_t; + typedef struct mkv_track { uint32_t tnum, xid; @@ -268,6 +275,9 @@ int64_t skip_to_timecode; bool v_skip_to_keyframe, a_skip_to_keyframe; + + vector<mkv_chapter_t> *chapters; // No support for nested chapters atm. + uint64_t stop_timecode; } mkv_demuxer_t; typedef struct { @@ -1116,6 +1126,8 @@ delete d->in; if (d->segment != NULL) delete d->segment; + if (d->chapters != NULL) + delete d->chapters; free(d); } @@ -1295,6 +1307,79 @@ mkv_d->cues_found = 1; } +static void parse_chapters(mkv_demuxer_t *mkv_d, uint64_t pos) { + EbmlElement *l2 = NULL; + EbmlStream *es; + KaxChapters *kchapters; + KaxEditionEntry *keentry; + KaxChapterAtom *kcatom; + KaxChapterTimeStart *kctstart; + KaxChapterTimeEnd *kctend; + int upper_lvl_el, i, k; + mkv_chapter_t chapter; + + if (mkv_d->chapters != NULL) + return; + + es = mkv_d->es; + upper_lvl_el = 0; + + mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing chapters ] ---------\n"); + + mkv_d->in->setFilePointer(pos); + + kchapters = + (KaxChapters *)es->FindNextElement(mkv_d->segment->Generic().Context, + upper_lvl_el, 0xFFFFFFFFL, true, 1); + if (kchapters == NULL) + return; + + if (!(EbmlId(*kchapters) == KaxChapters::ClassInfos.GlobalId)) { + mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] No KaxChapters element found but %s.\n" + "[mkv] \\---- [ parsing chapters ] ---------\n", + kchapters->Generic().DebugName); + + return; + } + + mkv_d->chapters = new vector<mkv_chapter_t>; + kchapters->Read(*es, KaxChapters::ClassInfos.Context, upper_lvl_el, l2, + true); + + for (i = 0; i < (int)kchapters->ListSize(); i++) { + keentry = (KaxEditionEntry *)(*kchapters)[i]; + if (EbmlId(*keentry) == KaxEditionEntry::ClassInfos.GlobalId) { + for (k = 0; k < (int)keentry->ListSize(); k++) { + kcatom = (KaxChapterAtom *)(*keentry)[k]; + if (EbmlId(*kcatom) == KaxChapterAtom::ClassInfos.GlobalId) { + chapter.start = 0; + chapter.end = 0; + kctstart = FINDFIRST(kcatom, KaxChapterTimeStart); + if (kctstart != NULL) + chapter.start = uint64(*kctstart) / 1000000; + kctend = FINDFIRST(kcatom, KaxChapterTimeEnd); + if (kctend != NULL) + chapter.end = uint64(*kctend) / 1000000; + mkv_d->chapters->push_back(chapter); + mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Chapter %u from %02d:%02d:%02d." + "%03d to %02d:%02d:%02d.%03d\n", mkv_d->chapters->size(), + (int)(chapter.start / 60 / 60 / 1000), + (int)((chapter.start / 60 / 1000) % 60), + (int)((chapter.start / 1000) % 60), + (int)(chapter.start % 1000), + (int)(chapter.end / 60 / 60 / 1000), + (int)((chapter.end / 60 / 1000) % 60), + (int)((chapter.end / 1000) % 60), + (int)(chapter.end % 1000)); + } + } + } + } + + mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing chapters ] ---------\n"); + delete kchapters; +} + static void parse_seekhead(mkv_demuxer_t *mkv_d, uint64_t pos) { EbmlElement *l2 = NULL; EbmlStream *es; @@ -1369,6 +1454,8 @@ parse_seekhead(mkv_d, seek_pos); else if (*id == KaxCues::ClassInfos.GlobalId) parse_cues(mkv_d, seek_pos); + else if (*id == KaxChapters::ClassInfos.GlobalId) + parse_chapters(mkv_d, seek_pos); } if (id != NULL) @@ -1380,7 +1467,8 @@ mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing seek head ] ---------\n"); } -extern "C" void print_wave_header(WAVEFORMATEX *h); +extern "C" void demux_mkv_seek(demuxer_t *demuxer, float rel_seek_secs, + int flags); extern "C" int demux_mkv_open(demuxer_t *demuxer) { unsigned char signature[4]; @@ -1826,6 +1914,10 @@ cues_to_parse.push_back(l1->GetElementPosition()); l1->SkipData(*es, l1->Generic().Context); + } else if (EbmlId(*l1) == KaxChapters::ClassInfos.GlobalId) { + parse_chapters(mkv_d, l1->GetElementPosition()); + l1->SkipData(*es, l1->Generic().Context); + } else if (EbmlId(*l1) == KaxCluster::ClassInfos.GlobalId) { mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ found cluster, headers are " "parsed completely :)\n"); @@ -2294,16 +2386,34 @@ } } + demuxer->priv = mkv_d; + + if (mkv_d->chapters != NULL) { + for (i = 0; i < (int)mkv_d->chapters->size(); i++) { + (*mkv_d->chapters)[i].start -= mkv_d->first_tc; + (*mkv_d->chapters)[i].end -= mkv_d->first_tc; + } + if ((dvd_last_chapter > 0) && + (dvd_last_chapter <= (int)mkv_d->chapters->size())) { + if ((*mkv_d->chapters)[dvd_last_chapter - 1].end != 0) + mkv_d->stop_timecode = (*mkv_d->chapters)[dvd_last_chapter - 1].end; + else if ((dvd_last_chapter + 1) <= (int)mkv_d->chapters->size()) + mkv_d->stop_timecode = (*mkv_d->chapters)[dvd_last_chapter].start; + } + } + if (s->end_pos == 0) demuxer->seekable = 0; else { demuxer->movi_start = s->start_pos; demuxer->movi_end = s->end_pos; demuxer->seekable = 1; + if ((dvd_chapter != 1) && (mkv_d->chapters != NULL) && + (dvd_chapter <= (int)mkv_d->chapters->size())) + demux_mkv_seek(demuxer, (float)(*mkv_d->chapters)[dvd_chapter - 1].start + / 1000.0, 1); } - demuxer->priv = mkv_d; - return 1; } @@ -2718,8 +2828,15 @@ block_duration = uint64(*kbdur); kblock = FINDFIRST(l2, KaxBlock); - if (kblock != NULL) + if (kblock != NULL) { kblock->SetParent(*mkv_d->cluster); + if ((mkv_d->stop_timecode > 0) && + ((kblock->GlobalTimecode() / 1000000 - mkv_d->first_tc) >= + mkv_d->stop_timecode)) { + delete l2; + return 0; + } + } krefblock = FINDFIRST(l2, KaxReferenceBlock); while (krefblock != NULL) { @@ -3026,7 +3143,7 @@ if (!index->entries[k].is_key) continue; diff = target_timecode - (int64_t)index->entries[k].timecode; - if ((target_timecode <= (mkv_d->last_pts * 1000)) && + if (((flags & 1) || (target_timecode <= (mkv_d->last_pts * 1000))) && (diff >= 0) && (diff < min_diff)) { min_diff = diff; entry = &index->entries[k];

1 0

CVS: main/mp3lib Makefile,1.35,1.36 sr1.c,1.28,1.29 dct64_sse.s,1.2,NONE mp3lib_objfix.sh,1.2,NONE
by Alex Beregszaszi 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main/mp3lib In directory mail:/var/tmp.root/cvs-serv8979 Modified Files: Makefile sr1.c Removed Files: dct64_sse.s mp3lib_objfix.sh Log Message: removed obsoleted (or never ending) code Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Makefile 22 Jun 2003 03:32:16 -0000 1.35 +++ Makefile 22 Oct 2003 21:08:46 -0000 1.36 @@ -13,10 +13,6 @@ OBJS += decode_i586.o SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c OBJS += decode_MMX.o dct64_MMX.o tabinit_MMX.o -#ifeq ($(TARGET_SSE),yes) -#SRCS += dct64_sse.s -#OBJS += dct64_sse.o -#endif SRCS += dct36_3dnow.c dct64_3dnow.c OBJS += dct36_3dnow.o dct64_3dnow.o SRCS += dct36_k7.c dct64_k7.c @@ -67,7 +63,7 @@ $(CC) $(CFLAGS) test2.c ../libvo/aclib.c -o test2 -I.. ./libMP3.a ../mp_msg-mencoder.o ../cpudetect.o -lm clean: - rm -f *~ *.o *.a + rm -f *~ *.o *.a test1 test2 distclean: rm -f *~ *.o *.a Makefile.bak .depend Index: sr1.c =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sr1.c 22 Oct 2003 20:58:46 -0000 1.28 +++ sr1.c 22 Oct 2003 21:08:46 -0000 1.29 @@ -386,7 +386,6 @@ extern void dct64_MMX(real *, real *, real *); extern void dct64_MMX_3dnow(real *, real *, real *); extern void dct64_MMX_3dnowex(real *, real *, real *); -extern void dct64_MMX_sse(real *, real *, real *); void (*dct64_MMX_func)(real *, real *, real *); #include "../cpudetect.h" @@ -415,15 +414,6 @@ synth_func = synth_1to1_MMX; } -#if 0 - if(gCpuCaps.hasSSE) - { - /* SSE version is buggy */ - dct64_MMX_func = dct64_MMX_sse; - mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n"); - } - else -#endif if (gCpuCaps.has3DNowExt) { dct36_func=dct36_3dnowex; --- dct64_sse.s DELETED --- --- mp3lib_objfix.sh DELETED ---

3 2