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

CVS: main/libmpdemux demux_bmp.c,1.2,1.3 demux_rawdv.c,1.6,1.7 demux_roq.c,1.7,1.8
by Arpi of Ize 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv10080 Modified Files: demux_bmp.c demux_rawdv.c demux_roq.c Log Message: removed nonsense stream_reset/seek in check_file() Index: demux_bmp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_bmp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- demux_bmp.c 24 Apr 2002 15:36:06 -0000 1.2 +++ demux_bmp.c 30 Apr 2003 20:24:09 -0000 1.3 @@ -23,9 +23,6 @@ // Check if a file is a BMP file depending on whether starts with 'BM' int bmp_check_file(demuxer_t *demuxer) { - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - if (stream_read_word(demuxer->stream) == (('B' << 8) | 'M')) return 1; else Index: demux_rawdv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawdv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demux_rawdv.c 21 Mar 2003 16:13:16 -0000 1.6 +++ demux_rawdv.c 30 Apr 2003 20:24:09 -0000 1.7 @@ -68,8 +68,6 @@ mp_msg(MSGT_DEMUX,MSGL_V,"Checking for DV\n"); - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); bytes_read=stream_read(demuxer->stream,tmp_buffer,DV_PAL_FRAME_SIZE); if ((bytes_read!=DV_PAL_FRAME_SIZE) && (bytes_read!=DV_NTSC_FRAME_SIZE)) return 0; Index: demux_roq.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_roq.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- demux_roq.c 24 Apr 2002 15:36:07 -0000 1.7 +++ demux_roq.c 30 Apr 2003 20:24:09 -0000 1.8 @@ -50,9 +50,6 @@ // 84 10 FF FF FF FF xx xx int roq_check_file(demuxer_t *demuxer) { - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - if ((stream_read_dword(demuxer->stream) == 0x8410FFFF) && ((stream_read_dword(demuxer->stream) & 0xFFFF0000) == 0xFFFF0000)) return 1;

1 0

CVS: main/libmpdemux demux_mkv.cpp,1.3,1.4
by Moritz Bunkus CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv5916 Modified Files: demux_mkv.cpp Log Message: Implemented some default values. The corresponding Kax elements are not stored if they are set to their default value. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- demux_mkv.cpp 30 Apr 2003 19:35:28 -0000 1.3 +++ demux_mkv.cpp 30 Apr 2003 20:20:51 -0000 1.4 @@ -277,6 +277,11 @@ return NULL; d->tracks[d->num_tracks] = t; d->num_tracks++; + + // Set default values. + t->default_track = 1; + t->a_sfreq = 8000.0; + t->a_channels = 1; } return t; @@ -962,6 +967,9 @@ 0xFFFFFFFFL, true, 1); } + if (mkv_d->tc_scale == 0) + mkv_d->tc_scale = MKVD_TIMECODESCALE; + } else if (EbmlId(*l1) == KaxTracks::ClassInfos.GlobalId) { // Yep, we've found our KaxTracks element. Now find all tracks // contained in this segment. @@ -1339,9 +1347,6 @@ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] caught exception\n"); return 0; } - - if (mkv_d->tc_scale == 0) - mkv_d->tc_scale = MKVD_TIMECODESCALE; if (!check_track_information(mkv_d)) { free_mkv_demuxer(mkv_d);

1 0

CVS: main/libmpdemux demux_realaud.c,1.1,1.2
by Roberto Togni CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv1356 Modified Files: demux_realaud.c Log Message: Remove broker reset/seek and fix ;; Index: demux_realaud.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_realaud.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- demux_realaud.c 30 Apr 2003 19:54:54 -0000 1.1 +++ demux_realaud.c 30 Apr 2003 20:17:35 -0000 1.2 @@ -44,9 +44,6 @@ { unsigned int chunk_id; - stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); - chunk_id = stream_read_dword_le(demuxer->stream); if (chunk_id == FOURCC_DOTRA) return 1; @@ -92,7 +89,7 @@ ptr += 2; } } - dp->pts = demuxer->filepos / ra_priv->data_size;; + dp->pts = demuxer->filepos / ra_priv->data_size; dp->pos = demuxer->filepos; dp->flags = 0; ds_add_packet(ds, dp);

1 0

CVS: main/libmpdemux demux_real.c,1.42,1.43
by Roberto Togni CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv2073 Modified Files: demux_real.c Log Message: Support codecs 14_4 and 28_8 Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- demux_real.c 10 Mar 2003 00:10:05 -0000 1.42 +++ demux_real.c 30 Apr 2003 19:48:38 -0000 1.43 @@ -961,6 +961,8 @@ mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET -> AC3\n"); sh->format = 0x2000; break; + case MKTAG('1', '4', '_', '4'): + case MKTAG('2', '8', '_', '8'): case MKTAG('s', 'i', 'p', 'r'): #if 0 sh->format = 0x130;

1 0

CVS: main/etc codecs.conf,1.273,1.274
by Roberto Togni CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv758 Modified Files: codecs.conf Log Message: Adding Real audio codecs 14_4 and 28_8 Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- codecs.conf 15 Apr 2003 20:40:11 -0000 1.273 +++ codecs.conf 30 Apr 2003 19:47:17 -0000 1.274 @@ -1496,6 +1496,20 @@ driver qtaudio dll "QuickTime.qts" +audiocodec ra144 + info "RealAudio 1.0" + status working + format 0x345F3431 ; "14_4" + driver realaud + dll "14_4.so.6.0" + +audiocodec ra288 + info "RealAudio 2.0" + status working + format 0x385F3832 ; "28_8" + driver realaud + dll "28_8.so.6.0" + audiocodec racook info "RealAudio COOK" status working

1 0

CVS: main/libmpcodecs ad_realaud.c,1.21,1.22
by Roberto Togni CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv31585 Modified Files: ad_realaud.c Log Message: Support for codec 14_4 and 28_8 Index: ad_realaud.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_realaud.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ad_realaud.c 9 Mar 2003 17:17:39 -0000 1.21 +++ ad_realaud.c 30 Apr 2003 19:45:34 -0000 1.22 @@ -136,7 +136,7 @@ raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath"); raSetPwd = dlsym(handle, "RASetPwd"); // optional, used by SIPR - if (raCloseCodec && raDecode && raFlush && raFreeDecoder && + if (raCloseCodec && raDecode && /*raFlush && */raFreeDecoder && raGetFlavorProperty && (raOpenCodec||raOpenCodec2) && raSetFlavor && /*raSetDLLAccessPath &&*/ raInitDecoder) { @@ -398,12 +398,26 @@ int sps=((short*)(sh->wf+1))[0]; int w=sh->wf->nBlockAlign; // 5 int h=((short*)(sh->wf+1))[1]; + int cfs=((short*)(sh->wf+1))[3]; // printf("bs=%d sps=%d w=%d h=%d \n",sh->wf->nBlockAlign,sps,w,h); #if 1 if(sh->a_in_buffer_len<=0){ // fill the buffer! + if (sh->format == mmioFOURCC('1','4','_','4')) { + demux_read_data(sh->ds, sh->a_in_buffer, sh->wf->nBlockAlign); + sh->a_in_buffer_size= + sh->a_in_buffer_len=sh->wf->nBlockAlign; + } else + if (sh->format == mmioFOURCC('2','8','_','8')) { + int i,j; + for (j = 0; j < h; j++) + for (i = 0; i < h/2; i++) + demux_read_data(sh->ds, sh->a_in_buffer+i*2*w+j*cfs, cfs); + sh->a_in_buffer_size= + sh->a_in_buffer_len=sh->wf->nBlockAlign*h; + } else if(!sps){ // 'sipr' way int j,n;

1 0

CVS: main/libmpdemux Makefile,1.61,1.62 demuxer.c,1.141,1.142 demuxer.h,1.59,1.60
by Roberto Togni CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv4295 Modified Files: Makefile demuxer.c demuxer.h Log Message: Add support for Realaudio files Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- Makefile 30 Apr 2003 11:39:32 -0000 1.61 +++ Makefile 30 Apr 2003 19:50:46 -0000 1.62 @@ -3,7 +3,7 @@ include ../config.mak -SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c demux_gif.c demux_ts.c +SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c ifeq ($(XMMS_PLUGINS),yes) SRCS += demux_xmms.c endif Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- demuxer.c 30 Apr 2003 11:39:32 -0000 1.141 +++ demuxer.c 30 Apr 2003 19:50:46 -0000 1.142 @@ -136,6 +136,7 @@ extern void demux_close_gif(demuxer_t* demuxer); extern void demux_close_ts(demuxer_t* demuxer); extern void demux_close_mkv(demuxer_t* demuxer); +extern void demux_close_ra(demuxer_t* demuxer); #ifdef USE_TV #include "tv.h" @@ -212,6 +213,8 @@ #endif case DEMUXER_TYPE_MPEG_TS: demux_close_ts(demuxer); break; + case DEMUXER_TYPE_REALAUDIO: + demux_close_ra(demuxer); break; } // free streams: @@ -291,6 +294,7 @@ int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds); int demux_gif_fill_buffer(demuxer_t *demux); int demux_ts_fill_buffer(demuxer_t *demux); +int demux_ra_fill_buffer(demuxer_t *demux); extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds); extern int demux_ogg_fill_buffer(demuxer_t *d); @@ -349,6 +353,7 @@ case DEMUXER_TYPE_GIF: return demux_gif_fill_buffer(demux); #endif case DEMUXER_TYPE_MPEG_TS: return demux_ts_fill_buffer(demux); + case DEMUXER_TYPE_REALAUDIO: return demux_ra_fill_buffer(demux); } return 0; } @@ -584,6 +589,8 @@ extern int demux_open_gif(demuxer_t* demuxer); extern int ts_check_file(demuxer_t * demuxer); extern int demux_open_mkv(demuxer_t *demuxer); +extern int ra_check_file(demuxer_t *demuxer); +extern int demux_open_ra(demuxer_t* demuxer); extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); @@ -723,6 +730,17 @@ } } #endif +//=============== Try to open as REALAUDIO file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REALAUDIO){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_REALAUDIO,audio_id,video_id,dvdsub_id); + if(ra_check_file(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"REALAUDIO"); + file_format=DEMUXER_TYPE_REALAUDIO; + } else { + free_demuxer(demuxer); + demuxer = NULL; + } +} //=============== Try based on filename EXTENSION: ================= // Ok. We're over the stable detectable fileformats, the next ones are a bit @@ -1202,6 +1220,10 @@ #endif case DEMUXER_TYPE_MPEG_TS: { demux_open_ts(demuxer); + break; + } + case DEMUXER_TYPE_REALAUDIO: { + if (!demux_open_ra(demuxer)) return NULL; break; } } // switch(file_format) Index: demuxer.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- demuxer.h 30 Apr 2003 11:39:32 -0000 1.59 +++ demuxer.h 30 Apr 2003 19:50:46 -0000 1.60 @@ -40,11 +40,12 @@ #define DEMUXER_TYPE_MPEG_TS 29 #define DEMUXER_TYPE_H264_ES 30 #define DEMUXER_TYPE_MATROSKA 31 +#define DEMUXER_TYPE_REALAUDIO 32 // This should always match the higest demuxer type number. // Unless you want to disallow users to force the demuxer to some types #define DEMUXER_TYPE_MIN 0 -#define DEMUXER_TYPE_MAX 31 +#define DEMUXER_TYPE_MAX 32 #define DEMUXER_TYPE_DEMUXERS (1<<16) // A virtual demuxer type for the network code

3 2

CVS: main/libmpdemux demux_realaud.c,NONE,1.1
by Roberto Togni CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv8421 Added Files: demux_realaud.c Log Message: Realaudio support --- NEW FILE --- /* Realaudio demuxer for MPlayer (c) 2003 Roberto Togni */ #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include "config.h" #include "mp_msg.h" #include "help_mp.h" #include "stream.h" #include "demuxer.h" #include "stheader.h" #include "bswap.h" #define FOURCC_DOTRA mmioFOURCC('.','r','a', 0xfd) #define FOURCC_144 mmioFOURCC('1','4','_','4') #define FOURCC_288 mmioFOURCC('2','8','_','8') #define FOURCC_DNET mmioFOURCC('d','n','e','t') #define FOURCC_LPCJ mmioFOURCC('l','p','c','J') typedef struct { unsigned short version; unsigned int dotranum; unsigned int data_size; unsigned short version2; unsigned int hdr_size; unsigned short codec_flavor; unsigned int coded_framesize; unsigned short sub_packet_h; unsigned short frame_size; unsigned short sub_packet_size; char genr[4]; } ra_priv_t; int ra_check_file(demuxer_t* demuxer) { unsigned int chunk_id; stream_reset(demuxer->stream); stream_seek(demuxer->stream, 0); chunk_id = stream_read_dword_le(demuxer->stream); if (chunk_id == FOURCC_DOTRA) return 1; else return 0; } void hexdump(char *, unsigned long); // return value: // 0 = EOF or no stream found // 1 = successfully read a packet int demux_ra_fill_buffer(demuxer_t *demuxer) { ra_priv_t *ra_priv = demuxer->priv; int len; int timestamp; int flags; demux_stream_t *ds = demuxer->audio; sh_audio_t *sh = ds->sh; WAVEFORMATEX *wf = sh->wf; demux_packet_t *dp; if (demuxer->stream->eof) return 0; len = wf->nBlockAlign; demuxer->filepos = stream_tell(demuxer->stream); dp = new_demux_packet(len); stream_read(demuxer->stream, dp->buffer, len); if (sh->format == 0x2000) { // if DNET, swap bytes, as DNET is byte-swapped AC3: char *ptr = dp->buffer; int i; for (i = 0; i < len; i += 2) { const char tmp = ptr[0]; ptr[0] = ptr[1]; ptr[1] = tmp; ptr += 2; } } dp->pts = demuxer->filepos / ra_priv->data_size;; dp->pos = demuxer->filepos; dp->flags = 0; ds_add_packet(ds, dp); return 1; } extern void print_wave_header(WAVEFORMATEX *h); void demux_open_ra(demuxer_t* demuxer) { ra_priv_t* ra_priv = demuxer->priv; sh_audio_t *sh; int i; char *buf; if ((ra_priv = (ra_priv_t *)malloc(sizeof(ra_priv_t))) == NULL) { mp_msg(MSGT_DEMUX, MSGL_ERR, "[RealAudio] Can't allocate memory for private data.\n"); return NULL; } memset(ra_priv, 0, sizeof(ra_priv_t)); demuxer->priv = ra_priv; sh = new_sh_audio(demuxer, 0); demuxer->audio->id = 0; sh->ds=demuxer->audio; demuxer->audio->sh = sh; ra_priv->version = stream_read_word(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V,"[RealAudio] File version: %d\n", ra_priv->version); if ((ra_priv->version < 3) || (ra_priv->version > 4)) { mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] ra version %d is not supported yet, please " "contact MPlayer developers\n", ra_priv->version); return NULL; } if (ra_priv->version == 3) { ra_priv->hdr_size = stream_read_word(demuxer->stream); stream_skip(demuxer->stream, 10); ra_priv->data_size = stream_read_dword(demuxer->stream); } else { stream_skip(demuxer->stream, 2); ra_priv->dotranum = stream_read_dword(demuxer->stream); ra_priv->data_size = stream_read_dword(demuxer->stream); ra_priv->version2 = stream_read_word(demuxer->stream); ra_priv->hdr_size = stream_read_dword(demuxer->stream); ra_priv->codec_flavor = stream_read_word(demuxer->stream); ra_priv->coded_framesize = stream_read_dword(demuxer->stream); stream_skip(demuxer->stream, 4); // data size? stream_skip(demuxer->stream, 8); ra_priv->sub_packet_h = stream_read_word(demuxer->stream); ra_priv->frame_size = stream_read_word(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V,"[RealAudio] Frame size: %d\n", ra_priv->frame_size); ra_priv->sub_packet_size = stream_read_word(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V,"[RealAudio] Sub packet size: %d\n", ra_priv->sub_packet_size); stream_skip(demuxer->stream, 2); sh->samplerate = stream_read_word(demuxer->stream); stream_skip(demuxer->stream, 2); sh->samplesize = stream_read_word(demuxer->stream); sh->channels = stream_read_word(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V,"[RealAudio] %d channel, %d bit, %dHz\n", sh->channels, sh->samplesize, sh->samplerate); i = stream_read_char(demuxer->stream); *((unsigned int *)(ra_priv->genr)) = stream_read_dword(demuxer->stream); if (i != 4) { mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] Genr size is not 4 (%d), please report to " "MPlayer developers\n", i); stream_skip(demuxer->stream, i - 4); } i = stream_read_char(demuxer->stream); sh->format = stream_read_dword_le(demuxer->stream); if (i != 4) { mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] FourCC size is not 4 (%d), please report to " "MPlayer developers\n", i); stream_skip(demuxer->stream, i - 4); } stream_skip(demuxer->stream, 3); } if ((i = stream_read_char(demuxer->stream)) != 0) { buf = malloc(i+1); stream_read(demuxer->stream, buf, i); buf[i] = 0; demux_info_add(demuxer, "Title", buf); free(buf); } if ((i = stream_read_char(demuxer->stream)) != 0) { buf = malloc(i+1); stream_read(demuxer->stream, buf, i); buf[i] = 0; demux_info_add(demuxer, "Author", buf); free(buf); } if ((i = stream_read_char(demuxer->stream)) != 0) { buf = malloc(i+1); stream_read(demuxer->stream, buf, i); buf[i] = 0; demux_info_add(demuxer, "Copyright", buf); free(buf); } if ((i = stream_read_char(demuxer->stream)) != 0) mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] Last header byte is not zero!\n"); if (ra_priv->version == 3) { stream_skip(demuxer->stream, 1); i = stream_read_char(demuxer->stream); sh->format = stream_read_dword_le(demuxer->stream); if (i != 4) { mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] FourCC size is not 4 (%d), please report to " "MPlayer developers\n", i); stream_skip(demuxer->stream, i - 4); } // stream_skip(demuxer->stream, 3); if (sh->format != FOURCC_LPCJ) { mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] Version 3 with FourCC %8x, please report to " "MPlayer developers\n", sh->format); } sh->channels = 1; sh->samplesize = 16; sh->samplerate = 8000; ra_priv->frame_size = 240; sh->format = FOURCC_144; } /* Fill WAVEFORMATEX */ sh->wf = malloc(sizeof(WAVEFORMATEX)); memset(sh->wf, 0, sizeof(WAVEFORMATEX)); sh->wf->nChannels = sh->channels; sh->wf->wBitsPerSample = sh->samplesize; sh->wf->nSamplesPerSec = sh->samplerate; sh->wf->nAvgBytesPerSec = sh->samplerate*sh->samplesize/8; sh->wf->nBlockAlign = ra_priv->frame_size; sh->wf->cbSize = 0; sh->wf->wFormatTag = sh->format; switch (sh->format) { case FOURCC_144: mp_msg(MSGT_DEMUX,MSGL_V,"Audio: 14_4\n"); sh->wf->cbSize = 10/*+codecdata_length*/; sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); ((short*)(sh->wf+1))[0]=0; ((short*)(sh->wf+1))[1]=240; ((short*)(sh->wf+1))[2]=0; ((short*)(sh->wf+1))[3]=0x14; ((short*)(sh->wf+1))[4]=0; break; case FOURCC_288: mp_msg(MSGT_DEMUX,MSGL_V,"Audio: 28_8\n"); sh->wf->cbSize = 8/*+codecdata_length*/; sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); ((short*)(sh->wf+1))[0]=0; ((short*)(sh->wf+1))[1]=ra_priv->sub_packet_h; ((short*)(sh->wf+1))[2]=ra_priv->codec_flavor; ((short*)(sh->wf+1))[3]=ra_priv->coded_framesize; ((short*)(sh->wf+1))[4]=0; break; case FOURCC_DNET: mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET -> AC3\n"); sh->format = 0x2000; break; default: mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%d)\n", sh->format); } print_wave_header(sh->wf); /* disable seeking */ demuxer->seekable = 0; if(!ds_fill_buffer(demuxer->audio)) mp_msg(MSGT_DEMUXER,MSGL_INFO,"[RealAudio] No data.\n"); } void demux_close_ra(demuxer_t *demuxer) { ra_priv_t* ra_priv = demuxer->priv; if (ra_priv) free(ra_priv); return; } #if 0 /* please upload RV10 samples WITH INDEX CHUNK */ int demux_seek_ra(demuxer_t *demuxer, float rel_seek_secs, int flags) { real_priv_t *priv = demuxer->priv; demux_stream_t *d_audio = demuxer->audio; sh_audio_t *sh_audio = d_audio->sh; int aid = d_audio->id; int next_offset = 0; int rel_seek_frames = 0; int streams = 0; return stream_seek(demuxer->stream, next_offset); } #endif

3 2

CVS: main/libmpdemux demux_mkv.cpp,1.1,1.2
by Moritz Bunkus CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv26498 Modified Files: demux_mkv.cpp Log Message: Loop counter was used inside for another loop as well. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- demux_mkv.cpp 30 Apr 2003 11:39:32 -0000 1.1 +++ demux_mkv.cpp 30 Apr 2003 18:35:16 -0000 1.2 @@ -295,15 +295,16 @@ } static int check_track_information(mkv_demuxer_t *d) { - int i; + int i, track_num; unsigned char *c; uint32_t u, offset, length; mkv_track_t *t; BITMAPINFOHEADER *bih; WAVEFORMATEX *wfe; - for (i = 0; i < d->num_tracks; i++) { - t = d->tracks[i]; + for (track_num = 0; track_num < d->num_tracks; track_num++) { + + t = d->tracks[track_num]; switch (t->type) { case 'v': // video track if (t->codec_id == NULL)

1 0

CVS: main/libmpcodecs vf_crop.c,1.15,1.16
by Richard Felker CVS 30 Apr '03

30 Apr '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv16324/libmpcodecs Modified Files: vf_crop.c Log Message: 100l in my 100l fix! :( it's finally right now (i hope!) Index: vf_crop.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_crop.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- vf_crop.c 28 Apr 2003 02:23:57 -0000 1.15 +++ vf_crop.c 30 Apr 2003 18:24:04 -0000 1.16 @@ -107,20 +107,30 @@ static void draw_slice(struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y){ unsigned char *src2[3]; - src2[0] = src[0] + vf->priv->crop_y*stride[0] + vf->priv->crop_x; + src2[0] = src[0]; if (vf->priv->dmpi->flags & MP_IMGFLAG_PLANAR) { - src2[1] = src[1] + (vf->priv->crop_y>>vf->priv->dmpi->chroma_y_shift)*stride[1] - + (vf->priv->crop_x>>vf->priv->dmpi->chroma_x_shift); - src2[2] = src[2] + (vf->priv->crop_y>>vf->priv->dmpi->chroma_y_shift)*stride[2] - + (vf->priv->crop_x>>vf->priv->dmpi->chroma_x_shift); + src2[1] = src[1]; + src2[2] = src[2]; } //mp_msg(MSGT_VFILTER, MSGL_V, "crop slice %d %d %d %d ->", w,h,x,y); if ((x -= vf->priv->crop_x) < 0) { - w += x; + x = -x; + src2[0] += x; + if (vf->priv->dmpi->flags & MP_IMGFLAG_PLANAR) { + src2[1] += x>>vf->priv->dmpi->chroma_x_shift; + src2[2] += x>>vf->priv->dmpi->chroma_x_shift; + } + w -= x; x = 0; } if ((y -= vf->priv->crop_y) < 0) { - h += y; + y = -y; + src2[0] += y*stride[0]; + if (vf->priv->dmpi->flags & MP_IMGFLAG_PLANAR) { + src2[1] += (y>>vf->priv->dmpi->chroma_y_shift)*stride[1]; + src2[2] += (y>>vf->priv->dmpi->chroma_y_shift)*stride[2]; + } + h -= y; y = 0; } if (x+w > vf->priv->crop_w) w = vf->priv->crop_w-x;

1 0