November 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r21119 - trunk/Makefile
by diego 21 Nov '06

21 Nov '06

Author: diego Date: Tue Nov 21 12:21:09 2006 New Revision: 21119 Modified: trunk/Makefile Log: Add VIDIX to LIBS_MPLAYER directly. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Nov 21 12:21:09 2006 @@ -130,7 +130,7 @@ PARTS += tremor endif ifeq ($(VIDIX),yes) -VO_LIBS += libdha/libdha.so vidix/libvidix.a +LIBS_MPLAYER += libdha/libdha.so vidix/libvidix.a PARTS += libdha vidix endif ifeq ($(DVDREAD_INTERNAL),yes)

1 0

r21117 - trunk/ChangeLog
by nicodvb 21 Nov '06

21 Nov '06

Author: nicodvb Date: Tue Nov 21 00:34:27 2006 New Revision: 21117 Modified: trunk/ChangeLog Log: demux_lavf handles video stream switching Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog (original) +++ trunk/ChangeLog Tue Nov 21 00:34:27 2006 @@ -16,8 +16,9 @@ XAN ADPCM audio via lavc Demuxers: * implemented switch_video and switch_program consistently with switch_audio - (default keys are "_" and TAB, respectively). For the time being this functionality - is only available in TS streams handled by demux_ts.c (not lavf). + (default keys are "_" and TAB, respectively). For the time being program switching + is only available in TS streams handled by demux_ts.c (not lavf), while video + switching is also handled by demux_lavf.c. Streaming: * authentication for Real RTSP streams

3 2

r21116 - trunk/libmpdemux/demux_lavf.c
by nicodvb 20 Nov '06

20 Nov '06

Author: nicodvb Date: Tue Nov 21 00:31:01 2006 New Revision: 21116 Modified: trunk/libmpdemux/demux_lavf.c Log: check we aren't short of sh_videos before allocating another one and fail if the allocation doesn't succeed; added support for video stream switching Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Tue Nov 21 00:31:01 2006 @@ -64,6 +64,7 @@ int video_streams; int64_t last_pts; int astreams[MAX_A_STREAMS]; + int vstreams[MAX_V_STREAMS]; }lavf_priv_t; extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); @@ -310,10 +311,16 @@ st->discard= AVDISCARD_ALL; break;} case CODEC_TYPE_VIDEO:{ - BITMAPINFOHEADER *bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); - sh_video_t* sh_video=new_sh_video(demuxer, i); + sh_video_t* sh_video; + BITMAPINFOHEADER *bih; + if(priv->video_streams >= MAX_V_STREAMS) + break; + sh_video=new_sh_video(demuxer, i); + if(!sh_video) break; + priv->vstreams[priv->video_streams] = i; + priv->video_streams++; + bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); - priv->video_streams++; if(!codec->codec_tag) codec->codec_tag= codec_get_bmp_tag(codec->codec_id); if(!codec->codec_tag) @@ -477,16 +484,31 @@ *((int *)arg) = (int)((priv->last_pts - priv->avfc->start_time)*100 / priv->avfc->duration); return DEMUXER_CTRL_OK; case DEMUXER_CTRL_SWITCH_AUDIO: + case DEMUXER_CTRL_SWITCH_VIDEO: { int id = *((int*)arg); int newid = -2; int i, curridx = -2; + int nstreams, *pstreams; + demux_stream_t *ds; - if(demuxer->audio->id == -2) + if(cmd == DEMUXER_CTRL_SWITCH_VIDEO) + { + ds = demuxer->video; + nstreams = priv->video_streams; + pstreams = priv->vstreams; + } + else + { + ds = demuxer->audio; + nstreams = priv->audio_streams; + pstreams = priv->astreams; + } + if(ds->id == -2) return DEMUXER_CTRL_NOTIMPL; - for(i = 0; i < priv->audio_streams; i++) + for(i = 0; i < nstreams; i++) { - if(priv->astreams[i] == demuxer->audio->id) //current stream id + if(pstreams[i] == ds->id) //current stream id { curridx = i; break; @@ -495,14 +517,14 @@ if(id < 0) { - i = (curridx + 1) % priv->audio_streams; - newid = priv->astreams[i]; + i = (curridx + 1) % nstreams; + newid = pstreams[i]; } else { - for(i = 0; i < priv->audio_streams; i++) + for(i = 0; i < nstreams; i++) { - if(priv->astreams[i] == id) + if(pstreams[i] == id) { newid = id; break; @@ -513,9 +535,9 @@ return DEMUXER_CTRL_NOTIMPL; else { - ds_free_packs(demuxer->audio); - priv->avfc->streams[demuxer->audio->id]->discard = AVDISCARD_ALL; - *((int*)arg) = demuxer->audio->id = newid; + ds_free_packs(ds); + priv->avfc->streams[ds->id]->discard = AVDISCARD_ALL; + *((int*)arg) = ds->id = newid; priv->avfc->streams[newid]->discard = AVDISCARD_NONE; return DEMUXER_CTRL_OK; }

1 0

r21075 - trunk/configure
by nplourde 20 Nov '06

20 Nov '06

Author: nplourde Date: Sun Nov 19 20:12:29 2006 New Revision: 21075 Modified: trunk/configure Log: disable x11 gl support on osx Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sun Nov 19 20:12:29 2006 @@ -4046,7 +4046,7 @@ echocheck "OpenGL" #Note: this test is run even with --enable-gl since we autodetect $_ld_gl -if (test "$_x11" = yes || win32) && test "$_gl" != no ; then +if (test "$_x11" = yes || win32 && test "$_macosx" = no) && test "$_gl" != no ; then cat > $TMPC << EOF #include <GL/gl.h> int main(void) { return 0; }

2 1

r21115 - trunk/libmpdemux/demux_ts.c
by nicodvb 20 Nov '06

20 Nov '06

Author: nicodvb Date: Mon Nov 20 22:03:46 2006 New Revision: 21115 Modified: trunk/libmpdemux/demux_ts.c Log: slight simplification in demux_control_ts: no need to check *arg with last_{aid,vid} (small bugfix, too) Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c (original) +++ trunk/libmpdemux/demux_ts.c Mon Nov 20 22:03:46 2006 @@ -3237,7 +3237,7 @@ } } } - else if(n <= priv->last_aid) + else //audio track <n> { for(i = 0; i < 8192; i++) {

1 0

r21114 - trunk/libass/ass_render.c
by eugeni 20 Nov '06

20 Nov '06

Author: eugeni Date: Mon Nov 20 18:13:19 2006 New Revision: 21114 Modified: trunk/libass/ass_render.c Log: Cosmetics: remove unneeded curly brackets. Modified: trunk/libass/ass_render.c ============================================================================== --- trunk/libass/ass_render.c (original) +++ trunk/libass/ass_render.c Mon Nov 20 18:13:19 2006 @@ -2082,19 +2082,18 @@ int i; int shift = 0; - if (dir == 1) { // move down + if (dir == 1) // move down for (i = 0; i < *cnt; ++i) { if (s->b + shift <= fixed[i].a || s->a + shift >= fixed[i].b) continue; shift = fixed[i].b - s->a; } - } else { // dir == -1, move up + else // dir == -1, move up for (i = *cnt-1; i >= 0; --i) { if (s->b + shift <= fixed[i].a || s->a + shift >= fixed[i].b) continue; shift = fixed[i].a - s->b; } - } fixed[*cnt].a = s->a + shift; fixed[*cnt].b = s->b + shift;

1 0

r21113 - trunk/libass/ass_render.c
by eugeni 20 Nov '06

20 Nov '06

Author: eugeni Date: Mon Nov 20 18:10:18 2006 New Revision: 21113 Modified: trunk/libass/ass_render.c Log: Fix collision detection. The old method tried to avoid gaps between subtitles by moving the upper subtitle down. This is wrong. With this fix, a subtitle will be moved only if it overlaps with another one. Modified: trunk/libass/ass_render.c ============================================================================== --- trunk/libass/ass_render.c (original) +++ trunk/libass/ass_render.c Mon Nov 20 18:10:18 2006 @@ -2080,37 +2080,28 @@ static int fit_segment(segment_t* s, segment_t* fixed, int* cnt, int dir) { int i; - int shift; - - if (*cnt == 0) { - *cnt = 1; - fixed[0].a = s->a; - fixed[0].b = s->b; - return 0; - } + int shift = 0; if (dir == 1) { // move down - if (s->b <= fixed[0].a) // all ok - return 0; for (i = 0; i < *cnt; ++i) { + if (s->b + shift <= fixed[i].a || s->a + shift >= fixed[i].b) + continue; shift = fixed[i].b - s->a; - if (i == *cnt - 1 || fixed[i+1].a >= shift + s->b) { // here is a good place - fixed[i].b += s->b - s->a; - return shift; - } } } else { // dir == -1, move up - if (s->a >= fixed[*cnt-1].b) // all ok - return 0; for (i = *cnt-1; i >= 0; --i) { + if (s->b + shift <= fixed[i].a || s->a + shift >= fixed[i].b) + continue; shift = fixed[i].a - s->b; - if (i == 0 || fixed[i-1].b <= shift + s->a) { // here is a good place - fixed[i].a -= s->b - s->a; - return shift; - } } } - assert(0); // unreachable + + fixed[*cnt].a = s->a + shift; + fixed[*cnt].b = s->b + shift; + (*cnt)++; + qsort(fixed, *cnt, sizeof(segment_t), cmp_segment); + + return shift; } static void fix_collisions(event_images_t* imgs, int cnt)

1 0

r21112 - trunk/configure
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 18:08:13 2006 New Revision: 21112 Modified: trunk/configure Log: Remove --with-xmmsplugindir and --with-xmmslibdir. This is not perfect, whoever cares about this feature do it properly, please. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Nov 20 18:08:13 2006 @@ -423,8 +423,6 @@ --with-extralibdir=DIR extra linker search paths in DIR (*) --with-x11libdir=DIR X library files in DIR (*) --with-livelibdir=DIR LIVE555 Streaming Media in DIR - --with-xmmsplugindir=DIR XMMS plugins in DIR - --with-xmmslibdir=DIR libxmms.so.1 in DIR --with-xvmclib=NAME adapter-specific library name (e.g. XvMCNVIDIA) --with-freetype-config=PATH path to freetype-config @@ -2082,14 +2080,6 @@ _livelibdir=`echo $ac_option | cut -d '=' -f 2` ;; - --with-xmmslibdir=*) - _xmmslibdir=`echo $ac_option | cut -d '=' -f 2` - ;; - - --with-xmmsplugindir=*) - _xmmsplugindir=`echo $ac_option | cut -d '=' -f 2` - ;; - --enable-crash-debug) _crash_debug=yes ;; @@ -6859,21 +6849,12 @@ echocheck "XMMS inputplugin support" if test "$_xmms" = yes ; then - if ( xmms-config --version ) >/dev/null 2>&1 ; then - if test -z "$_xmmsplugindir" ; then _xmmsplugindir=`xmms-config --input-plugin-dir` - fi - if test -z "$_xmmslibdir" ; then _xmmslibdir=`xmms-config --exec-prefix`/lib - fi else - if test -z "$_xmmsplugindir" ; then _xmmsplugindir=/usr/lib/xmms/Input - fi - if test -z "$_xmmslibdir" ; then _xmmslibdir=/usr/lib - fi fi _def_xmms='#define HAVE_XMMS 1'

1 0

r21111 - trunk/configure
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 17:59:09 2006 New Revision: 21111 Modified: trunk/configure Log: Remove --with-x264libdir. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Nov 20 17:59:09 2006 @@ -422,7 +422,6 @@ --with-extraincdir=DIR extra header search paths in DIR (*) --with-extralibdir=DIR extra linker search paths in DIR (*) --with-x11libdir=DIR X library files in DIR (*) - --with-x264libdir=DIR libx264 in DIR --with-livelibdir=DIR LIVE555 Streaming Media in DIR --with-xmmsplugindir=DIR XMMS plugins in DIR --with-xmmslibdir=DIR libxmms.so.1 in DIR @@ -2135,9 +2134,6 @@ --with-xvmclib=*) _xvmclib=`echo $ac_option | cut -d '=' -f 2` ;; - --with-x264libdir=*) - _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` - ;; --with-sdl-config=*) _sdlconfig=`echo $ac_option | cut -d '=' -f 2` ;; @@ -6435,14 +6431,10 @@ #endif int main(void) { x264_encoder_open((void*)0); return 0; } EOF - _ld_x264="$_ld_x264 -lx264 $_ld_pthread" _x264=no - if cc_check $_ld_x264 $_ld_lm ; then - _x264=yes - elif test "$_x11" = yes && cc_check $_ld_x264 $_ld_x11 $_ld_lm ; then - _x264=yes - _ld_x264="$_ld_x264 $_ld_x11" - fi + for _ld_tmp in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_x11 $_ld_lm" ; do + cc_check $_ld_tmp && _ld_x264="$_ld_tmp" && _x264=yes && break + done fi if test "$_x264" = yes ; then @@ -6458,7 +6450,6 @@ fi else _x264=no - _ld_x264='' _lavc_x264=no _def_x264='#undef HAVE_X264' _def_lavc_x264='#undef CONFIG_X264'

1 0

r21110 - trunk/configure
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 17:51:09 2006 New Revision: 21110 Modified: trunk/configure Log: Remove --with-xvidlibdir. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Nov 20 17:51:09 2006 @@ -422,7 +422,6 @@ --with-extraincdir=DIR extra header search paths in DIR (*) --with-extralibdir=DIR extra linker search paths in DIR (*) --with-x11libdir=DIR X library files in DIR (*) - --with-xvidlibdir=DIR libxvidcore (XviD) in DIR (*) --with-x264libdir=DIR libx264 in DIR --with-livelibdir=DIR LIVE555 Streaming Media in DIR --with-xmmsplugindir=DIR XMMS plugins in DIR @@ -2136,9 +2135,6 @@ --with-xvmclib=*) _xvmclib=`echo $ac_option | cut -d '=' -f 2` ;; - --with-xvidlibdir=*) - _ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` - ;; --with-x264libdir=*) _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ;; @@ -6394,13 +6390,12 @@ echocheck "XviD" if test "$_xvid" = auto ; then _xvid=no - _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm" cat > $TMPC << EOF #include <xvid.h> int main(void) { xvid_global(0, 0, 0, 0); return 0; } EOF - for _ld_tmp in "$_ld_xvid" "$_ld_xvid $_ld_pthread" ; do - cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid=yes && break + for _ld_tmp in "-lxvidcore $_ld_lm" "-lxvidcore $_ld_lm $_ld_pthread" ; do + cc_check $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" && _xvid=yes && break done fi @@ -6410,7 +6405,6 @@ else _def_xvid='#undef HAVE_XVID4' _nocodecmodules="xvid $_nocodecmodules" - _ld_xvid="" fi echores "$_xvid" @@ -6420,7 +6414,7 @@ #include <xvid.h> int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } EOF - if cc_check $_ld_xvid $_ld_lb ; then + if cc_check ; then _lavc_xvid=yes _def_lavc_xvid='#define CONFIG_XVID 1' else @@ -7391,7 +7385,6 @@ EXTRA_LIB = $_ld_extra \ $_ld_static $_ld_win32 \ $_ld_win32libs $_ld_lm $_ld_gif \ - $_ld_xvid \ $_ld_vorbis $_ld_theora $_xmms_lib \ $_ld_arch VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \

1 0