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

CVS: main/libmpdemux matroska.h, 1.18, 1.19 demux_mkv.c, 1.49, 1.50
by syncmail＠mplayerhq.hu 22 Oct '05

22 Oct '05

CVS change done by Moritz Bunkus CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv27351 Modified Files: matroska.h demux_mkv.c Log Message: Added support for A_AAC. Index: matroska.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/matroska.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- matroska.h 21 Jan 2005 18:25:44 -0000 1.18 +++ matroska.h 22 Oct 2005 10:13:28 -0000 1.19 @@ -18,6 +18,7 @@ #define MKV_A_AAC_4SBR "A_AAC/MPEG4/LC/SBR" #define MKV_A_AAC_4SSR "A_AAC/MPEG4/SSR" #define MKV_A_AAC_4LTP "A_AAC/MPEG4/LTP" +#define MKV_A_AAC "A_AAC" #define MKV_A_AC3 "A_AC3" #define MKV_A_DTS "A_DTS" #define MKV_A_MP2 "A_MPEG/L2" Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- demux_mkv.c 13 Oct 2005 18:33:56 -0000 1.49 +++ demux_mkv.c 22 Oct 2005 10:13:28 -0000 1.50 @@ -1773,7 +1773,8 @@ !strncmp(track->codec_id, MKV_A_AAC_4LC, strlen(MKV_A_AAC_4LC)) || !strcmp(track->codec_id, MKV_A_AAC_4SSR) || - !strcmp(track->codec_id, MKV_A_AAC_4LTP)) + !strcmp(track->codec_id, MKV_A_AAC_4LTP) || + !strcmp(track->codec_id, MKV_A_AAC)) track->a_formattag = mmioFOURCC('M', 'P', '4', 'A'); else if (!strcmp(track->codec_id, MKV_A_VORBIS)) { @@ -1874,6 +1875,16 @@ sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1024; + if (!strcmp (track->codec_id, MKV_A_AAC) && + (NULL != track->private_data)) + { + sh_a->codecdata=(unsigned char *)malloc(track->private_size); + memcpy (sh_a->codecdata, track->private_data, + track->private_size); + sh_a->codecdata_len = track->private_size; + return 0; + } + /* Recreate the 'private data' */ /* which faad2 uses in its initialization */ srate_idx = aac_get_sample_rate_index (sh_a->samplerate);

1 0

CVS: main ChangeLog,1.258,1.259
by syncmail＠mplayerhq.hu 21 Oct '05

21 Oct '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv24321 Modified Files: ChangeLog Log Message: cross compiling probably worth mentioining Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- ChangeLog 18 Oct 2005 20:20:19 -0000 1.258 +++ ChangeLog 21 Oct 2005 14:44:13 -0000 1.259 @@ -124,6 +124,8 @@ * -rawaudio/-rawvideo requires -demuxer rawaudio/-demuxer rawvideo * libdvdcss updated to 1.2.9 * configure check and compiler optimization options for VIA C3 + * configure can now run with cross compiling, new configure option + --enable-cross-compile pre7try2: August 26, 2005

1 0

CVS: main/vidix/drivers mach64_vid.c,1.36,1.37
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/vidix/drivers In directory mail:/var2/tmp/cvs-serv15810/vidix/drivers Modified Files: mach64_vid.c Log Message: mach64_mmio size fix from vidix.sf.net, possible bugfix for #59 Index: mach64_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mach64_vid.c 20 Oct 2005 17:56:28 -0000 1.36 +++ mach64_vid.c 20 Oct 2005 18:03:43 -0000 1.37 @@ -465,7 +465,7 @@ } if(__verbose>0) printf("[mach64] version %s\n", VERSION); - if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x4000))==(void *)-1) return ENOMEM; + if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x1000))==(void *)-1) return ENOMEM; mach64_wait_for_idle(); mach64_ram_size = INREG(MEM_CNTL) & CTL_MEM_SIZEB; if (mach64_ram_size < 8) mach64_ram_size = (mach64_ram_size + 1) * 512; @@ -522,7 +522,7 @@ OUTREG(OVERLAY_GRAPHICS_KEY_CLR,SAVED_OVERLAY_GRAPHICS_KEY_CLR); unmap_phys_mem(mach64_mem_base,mach64_ram_size); - unmap_phys_mem(mach64_mmio_base,0x4000); + unmap_phys_mem(mach64_mmio_base,0x1000); } int vixGetCapability(vidix_capability_t *to)

1 0

CVS: main/vidix/drivers mach64_vid.c,1.35,1.36
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/vidix/drivers In directory mail:/var2/tmp/cvs-serv26740/vidix/drivers Modified Files: mach64_vid.c Log Message: sync amd64 fixes from vidix.sf.net Index: mach64_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mach64_vid.c 24 Dec 2003 22:00:50 -0000 1.35 +++ mach64_vid.c 20 Oct 2005 17:56:28 -0000 1.36 @@ -128,14 +128,14 @@ #define GETREG(TYPE,PTR,OFFZ) (*((volatile TYPE*)((PTR)+(OFFZ)))) #define SETREG(TYPE,PTR,OFFZ,VAL) (*((volatile TYPE*)((PTR)+(OFFZ))))=VAL -#define INREG8(addr) GETREG(uint8_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2) -#define OUTREG8(addr,val) SETREG(uint8_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2,val) +#define INREG8(addr) GETREG(uint8_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2) +#define OUTREG8(addr,val) SETREG(uint8_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2,val) static inline uint32_t INREG (uint32_t addr) { - uint32_t tmp = GETREG(uint32_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2); + uint32_t tmp = GETREG(uint32_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2); return le2me_32(tmp); } -#define OUTREG(addr,val) SETREG(uint32_t,(uint32_t)mach64_mmio_base,((addr)^0x100)<<2,le2me_32(val)) +#define OUTREG(addr,val) SETREG(uint32_t,(uint8_t *)mach64_mmio_base,((addr)^0x100)<<2,le2me_32(val)) #define OUTREGP(addr,val,mask) \ do { \

1 0

CVS: main/libmpdemux demux_audio.c,1.39,1.40
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv32098 Modified Files: demux_audio.c Log Message: Fix seeking in wav files: align relative to start of data, not start of file and use nBlockAlign if available. Index: demux_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- demux_audio.c 9 Sep 2005 20:05:42 -0000 1.39 +++ demux_audio.c 20 Oct 2005 15:15:53 -0000 1.40 @@ -518,7 +518,9 @@ switch(priv->frmt) { case WAV: - pos -= (pos % (sh_audio->channels * sh_audio->samplesize) ); + pos -= (pos - demuxer->movi_start) % + (sh_audio->wf->nBlockAlign ? sh_audio->wf->nBlockAlign : + (sh_audio->channels * sh_audio->samplesize)); // We need to decrease the pts by one step to make it the "last one" priv->last_pts -= sh_audio->wf->nAvgBytesPerSec/(float)sh_audio->i_bps; break;

1 0

CVS: main/DOCS/tech encoding-guide.txt,1.1,1.2
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv28046/tech Modified Files: encoding-guide.txt Log Message: ilmv --> ilme typo fix patch by compn < tempn == at == twmi == dot == rr == dot == com > Index: encoding-guide.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/encoding-guide.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- encoding-guide.txt 22 Jun 2005 09:39:27 -0000 1.1 +++ encoding-guide.txt 20 Oct 2005 13:45:41 -0000 1.2 @@ -814,6 +814,6 @@ With these things in mind, here is our first example: mencoder capture.avi -mc 0 -oac lavc -ovc lavc -lavcopts \ - vcodec=mpeg2video:vbitrate=6000:ilmv:ildct:acodec=mp2:abitrate=224 + vcodec=mpeg2video:vbitrate=6000:ilme:ildct:acodec=mp2:abitrate=224 -Note the ilmv and ildct options. +Note the ilme and ildct options.

1 0

CVS: main/libaf af.c,1.50,1.51
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libaf In directory mail:/var2/tmp/cvs-serv31982/libaf Modified Files: af.c Log Message: semi-hack: avoid passing 0-length blocks to audio filters. Fixes bugzilla bug #391 (lavcresample crashes). Index: af.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- af.c 1 Oct 2005 12:55:34 -0000 1.50 +++ af.c 20 Oct 2005 09:12:28 -0000 1.51 @@ -503,6 +503,7 @@ af_instance_t* af=s->first; // Iterate through all filters do{ + if (data->len <= 0) break; data=af->play(af,data); af=af->next; }while(af);

1 0

CVS: main mencoder.c,1.312,1.313
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv19724 Modified Files: mencoder.c Log Message: document hack Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- mencoder.c 19 Oct 2005 05:44:27 -0000 1.312 +++ mencoder.c 20 Oct 2005 05:54:51 -0000 1.313 @@ -512,6 +512,8 @@ vo_init_osd(); + /* HACK, for some weird reason, push() has to be called twice, + otherwise options are not saved correctly */ m_config_push(mconfig); play_next_file: m_config_push(mconfig);

1 0

CVS: main mencoder.c,1.308,1.309
by syncmail＠mplayerhq.hu 20 Oct '05

20 Oct '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv30009 Modified Files: mencoder.c Log Message: weirdness, flags aren't restored right unless you add this second push mencoder a.avi b.avi -flag c.avi -flag should've only applied to b, but it applied to both b and c!! No clue why this happens and more so why this solves it. but it does. Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- mencoder.c 13 Oct 2005 19:30:06 -0000 1.308 +++ mencoder.c 13 Oct 2005 20:27:48 -0000 1.309 @@ -508,6 +508,7 @@ vo_init_osd(); + m_config_push(mconfig); play_next_file: m_config_push(mconfig); m_entry_set_options(mconfig,&filelist[curfile]);

5 5

CVS: main/libmpdemux muxer_rawvideo.c,1.3,1.4
by syncmail＠mplayerhq.hu 19 Oct '05

19 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv4577/libmpdemux Modified Files: muxer_rawvideo.c Log Message: processing audio is sometimes essential for a/v sync, so 1000l to whoever made rawvideo muxer disable audio!! with this patch, audio is processed but simply thrown away by the muxer. various 'error' conditions in rawvideo muxer are removed to make it work. feel free to re-add them if they can be done without breaking anything, but do not use printf !!!! btw old behavior can be obtained by manually specifying -nosound. Index: muxer_rawvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_rawvideo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- muxer_rawvideo.c 21 Feb 2005 21:45:49 -0000 1.3 +++ muxer_rawvideo.c 19 Oct 2005 05:44:27 -0000 1.4 @@ -21,14 +21,6 @@ static muxer_stream_t* rawvideofile_new_stream(muxer_t *muxer,int type){ muxer_stream_t* s; if (!muxer) return NULL; - if (type == MUXER_TYPE_AUDIO) { - printf("Rawvideo muxer does not support audio !\n"); - return NULL; - } - if(muxer->avih.dwStreams>=1){ - printf("Too many streams! Rawvideo muxer supports only one video stream !\n"); - return NULL; - } s=malloc(sizeof(muxer_stream_t)); memset(s,0,sizeof(muxer_stream_t)); if(!s) return NULL; // no mem!? @@ -44,9 +36,6 @@ s->h.fccType=streamtypeVIDEO; if(!muxer->def_v) muxer->def_v=s; break; - default: - printf("WarninG! unknown stream type: %d\n",type); - return NULL; } muxer->avih.dwStreams++; return s; @@ -65,6 +54,7 @@ muxer_t *muxer=s->muxer; // write out the chunk: + if (s->type == MUXER_TYPE_VIDEO) write_rawvideo_chunk(muxer->file,len,s->buffer); /* unsigned char */ // alter counters:

1 0