January 2004 - MPlayer-G2-dev - lists.mplayerhq.hu

MID/VP
by Alex Beregszaszi 01 Feb '04

01 Feb '04

Hi, what's the status of the above? -- Alex Beregszaszi <alex(a)fsn.hu> (MPlayer Core Developer -- http://www.mplayerhq.hu/)

2 1

Codec identifier (fourcc) handling proposal
by Alex Beregszaszi 01 Feb '04

01 Feb '04

Hi, There's a need for defining the way we're handling codec identifiers, in G1 this wasn't such a big issue, as MEncoder could only handle AVI well. 1, input layer - demuxer 2, core 3, output layer - muxer Imho in core we should deal with fourcc's (four character codes) only, both for audio and video. Maybe we should define better names for audio codecs. You know that AVI uses twocc for audio, but others (real, qt) uses fourcc for that too and nut is going to handle this situation well. The input layer should wrap the known identifiers to fourccs known by the core. The output layer should wrap the fourccs to the formats identifires. What do you think? -- Alex Beregszaszi <alex(a)fsn.hu> (MPlayer Core Developer -- http://www.mplayerhq.hu/)

3 2

G2 in CVS
by Alex Beregszaszi 31 Jan '04

31 Jan '04

Hi, just imported -preview42 into cvs tree called 'g2', check it out! Note: 1, it includes libavcodec (will soon change to g1 behaviour) 2, probably if g2 api-s stabilizes, we'll create a new cvs tree -- Alex Beregszaszi <alex(a)fsn.hu> (MPlayer Core Developer -- http://www.mplayerhq.hu/)

2 4

CVS: g2/demux demux_nut.c,1.1.1.1,1.2
by syncmail＠mplayerhq.hu 31 Jan '04

31 Jan '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/g2/demux In directory mail:/var2/tmp/cvs-serv19875 Modified Files: demux_nut.c Log Message: support for timestamp shift Index: demux_nut.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_nut.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- demux_nut.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ demux_nut.c 31 Jan 2004 22:31:25 -0000 1.2 @@ -1,5 +1,5 @@ /* - * "NUT" Container Format demuxer (DRAFT-20031003) + * "NUT" Container Format demuxer (DRAFT-20031102) * Copyright (C) 2002 Alex Beregszaszi * * This library is free software; you can redistribute it and/or modify @@ -48,7 +48,8 @@ int last_frame_size; demux_stream_t* audio; demux_stream_t* video; - int msb_timestamp_shift; + int msb_timestamp_shift[256]; // FIXME!! + int64_t last_msb_timestamp[256]; // FIXME!! }; #define MAIN_STARTCODE (0xF9526A6200000000ULL + ('N'<<24) + ('U'<<16) + ('T'<<8) + 'M') @@ -115,7 +116,7 @@ data[i] = stream_read_char(s); stream_skip(s, len-i); - return 0; + return len; } static int get_packetheader(demuxer_t *demuxer) @@ -191,8 +192,7 @@ static int driver_fill(demuxer_t *demuxer, demux_stream_t* ds){ struct demuxer_priv_s *priv = demuxer->priv; int key_frame = 0, id, len, flags; - uint64_t ptype; - int64_t pts = 0; + uint64_t ptype, pts = 0; start: demuxer->filepos = stream_tell(demuxer->stream); @@ -209,7 +209,8 @@ get_packetheader(demuxer); do { char data[32]; - int hdr = 0; + int hdr = 0, len; + i = get_v(demuxer->stream); switch(i) { @@ -220,11 +221,12 @@ case 9: hdr = DEMUX_META_STRING_SOFTWARE; break; default: } - get_b(demuxer->stream, &data, 32); + len = get_b(demuxer->stream, &data, 32); + data[len-1] = 0; if (hdr) demux_metadata_add(&demuxer->meta, hdr, data, -1, 1); } while ((i != 0) && !stream_eof(demuxer->stream)); - stream_skip(demuxer->stream, 4); + stream_skip(demuxer->stream, 4); /* checksum */ goto start; } if ((ptype != KEYFRAME_STARTCODE) && (ptype != 0)) @@ -248,11 +250,18 @@ get_packetheader(demuxer); id = get_v(demuxer->stream); if ((flags & 0x8) >> 3) /* msb timestamp */ - pts = get_v(demuxer->stream) << priv->msb_timestamp_shift; - pts |= get_s(demuxer->stream); + priv->last_msb_timestamp[id] = get_v(demuxer->stream) << priv->msb_timestamp_shift[id]; +#ifdef DEBUG + printf("timestamp last msb: %llx shift: %d\n", + priv->last_msb_timestamp[id], priv->msb_timestamp_shift[id]); +#endif +// pts = priv->last_msb_timestamp[id] + get_v(demuxer->stream); + pts = get_v(demuxer->stream); +// printf("pts: %x\n", pts); + pts += priv->last_msb_timestamp[id]; len = priv->curr_frame_size - (stream_tell(demuxer->stream) - priv->curr_frame_start); #ifdef DEBUG - printf("%srame flags: %d, id: %d, len: %d, pts: %lld\n", + printf("%srame flags: %d, id: %d, len: %d, pts: %x\n", (key_frame) ? "Keyf" : "F", flags, id, len, pts); #endif @@ -264,7 +273,9 @@ else if (len && !stream_eof(demuxer->stream)) { if (ds && !ds->ignore) - ds_read_packet(ds, demuxer->stream, len, pts, demuxer->filepos, key_frame?1:0); + { + ds_read_packet(ds, demuxer->stream, len, (int)pts, demuxer->filepos, (key_frame?1:0)); + } else stream_skip(demuxer->stream, len); } @@ -284,7 +295,7 @@ if (search_packet(demuxer->stream, 8192, MAIN_STARTCODE) < 0) { - printf("Couldn't find main header!\n"); +// printf("Couldn't find main header!\n"); return 0; } @@ -325,7 +336,7 @@ rate = get_v(demuxer->stream); rate_base = get_v(demuxer->stream); printf("rate: (m) %d, base: (d) %d\n", rate, rate_base); - demuxer->priv->msb_timestamp_shift = get_v(demuxer->stream); + demuxer->priv->msb_timestamp_shift[id] = get_v(demuxer->stream); get_v(demuxer->stream); /* shuffle type */ stream_skip(demuxer->stream, 1); /* flags */

1 0

CVS: g2/demux demux_avi.c,1.1.1.1,1.2
by syncmail＠mplayerhq.hu 31 Jan '04

31 Jan '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/g2/demux In directory mail:/var2/tmp/cvs-serv27442 Modified Files: demux_avi.c Log Message: support for obscure on2 avi Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_avi.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- demux_avi.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ demux_avi.c 31 Jan 2004 22:29:18 -0000 1.2 @@ -178,17 +178,23 @@ demux_stream_t* ds=NULL; int stream_id=0; int id; + int on2_hack = 0; if(level!=DEMUX_CHECK_LEVEL_FORCE && level!=DEMUX_CHECK_LEVEL_SHORT) return -1; // given detection level not supported //---- check RIFF header: id=stream_read_dword_le(demuxer->stream); // "RIFF" - if(id!=FOURCC_RIFF) return 0; // not a RIFF file + if(id==mmioFOURCC('O','N','2',' ')) on2_hack = 1; + else if(id!=FOURCC_RIFF) return 0; // not a RIFF file stream_read_dword_le(demuxer->stream); // ignore filesize id=stream_read_dword_le(demuxer->stream); // "AVI " - if(id!=formtypeAVI) return 0; // not an AVI file + if(on2_hack && id!=mmioFOURCC('O','N','2','f')) return 0; + else if(!on2_hack && id!=formtypeAVI) return 0; // not an AVI file + + if (on2_hack) + mp_msg(MSGT_HEADER,MSGL_V,"Obscure ON2 AVI detected\n"); demuxer->priv=calloc(sizeof(struct demuxer_priv_s),1); @@ -304,6 +310,7 @@ // case mmioFOURCC('I','S','M','P'): hdr="Time Code";break; // case mmioFOURCC('I','D','I','T'): hdr="Digitization Time";break; + case mmioFOURCC('O','N','2','h'): case ckidAVIMAINHDR: // read 'avih' stream_read(demuxer->stream,(char*) &demuxer->priv->avih,MIN(size2,sizeof(demuxer->priv->avih))); le2me_MainAVIHeader(&demuxer->priv->avih); // swap to machine endian @@ -465,7 +472,7 @@ NULL, // url "avi", "RIFF AVI (Audio-Video Interleaved)", - "A'rpi", + "A'rpi, Alex", ext_list, driver_open };

1 0

CVS: g2/demux demux_ogg.c,1.1.1.1,1.2
by syncmail＠mplayerhq.hu 31 Jan '04

31 Jan '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/g2/demux In directory mail:/var2/tmp/cvs-serv28713 Modified Files: demux_ogg.c Log Message: flac support Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_ogg.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- demux_ogg.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ demux_ogg.c 31 Jan 2004 22:27:11 -0000 1.2 @@ -66,6 +66,7 @@ #define OGGS_FORMAT_THEORA 2 #define OGGS_FORMAT_DSHOW_OLD 3 #define OGGS_FORMAT_DSHOW_NEW 4 +#define OGGS_FORMAT_FLAC 5 // return value: 1 = packet should be queued 0 = packet should be dropped static int ogg_parse_header(demux_stream_t* ds, unsigned char* buffer, int len){ @@ -90,6 +91,14 @@ ds->format=mmioFOURCC('T','h','r','a'); return 0; } + /* first ogg packet contains ONLY the fLaC signature */ + if(len>=4 && !strncmp(&buffer[0],"fLaC", 4)){ + mp_msg(MSGT_DEMUX,MSGL_INFO,"demux_ogg: stream #%d: FLAC audio\n",ds->id); + ds->type=DEMUX_STREAM_TYPE_AUDIO; ds->priv->format=OGGS_FORMAT_FLAC; +// ds->format=0x43614c66; + ds->format=mmioFOURCC('f','L','a','C'); + return 1; + } if(len>=142 && !strncmp(&buffer[1],"Direct Show Samples embedded in Ogg",35)){ ds->priv->format=OGGS_FORMAT_DSHOW_OLD; switch(*((uint32_t*)(buffer+96))){ @@ -337,7 +346,7 @@ NULL, // url "ogg", "Xiph.org OGG Stream (OggS) format", - "A'rpi", + "A'rpi, Alex", ext_list, driver_open };

1 0

g2/confiG2ure target,1.1.1.1,1.2
by syncmail＠mplayerhq.hu 31 Jan '04

31 Jan '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/g2/confiG2ure In directory mail:/home/alex/a/g2/confiG2ure Modified Files: target Log Message: better parisc detection Index: target =================================================================== RCS file: /cvsroot/mplayer/g2/confiG2ure/target,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- target 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ target 31 Jan 2004 21:57:57 -0000 1.2 @@ -50,7 +50,7 @@ ppc) host_arch=ppc ;; alpha) host_arch=alpha ;; sparc*) host_arch=sparc ;; - 9000*) host_arch=hppa ;; + hppa*|9000*|parisc*) host_arch=hppa ;; arm*) host_arch=arm ;; s390) host_arch=s390 ;; s390x) host_arch=s390x ;;

1 0

g2/confiG2ure configure.log,1.1.1.1,NONE
by syncmail＠mplayerhq.hu 31 Jan '04

31 Jan '04

Update of /cvsroot/mplayer/g2/confiG2ure In directory mail:/home/alex/a/g2/confiG2ure Removed Files: configure.log Log Message: test syncmail-g2 CVS change done by Alex Beregszaszi --- configure.log DELETED ---

1 0

CVS: g2/DOCS README,1.1.1.1,1.2
by diego＠mplayerhq.hu 31 Jan '04

31 Jan '04

Update of /cvsroot/mplayer/g2/DOCS In directory mail:/var2/tmp/cvs-serv27225 Modified Files: README Log Message: grammar/spelling/wording Index: README =================================================================== RCS file: /cvsroot/mplayer/g2/DOCS/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- README 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ README 31 Jan 2004 20:53:34 -0000 1.2 @@ -8,28 +8,26 @@ It is designed to be reentrant, so adding thread-safety is easy (just a few locks around the demuxer layer entry calls). -NOTE: It's in early stage of development, don't compare to the 0.90 feature set. -The goal is not (yet) to create an all-in-one player, but a clean framework -for experimenting with new ideas and solutions for already known problems. +NOTE: It's in an early stage of development, don't compare it to the 0.90 +feature set. The goal is not (yet) to create a complete player, but a clean +framework for experimenting with new ideas and solutions for known problems. A long-term goal is creating a media processing library, to be usable as the backend of media/movie players, converters, editors, capture tools. Some of the major differences to 0.90: -- video codecs pull the data from the demuxer, instead of the old push-method. -- video filtering path is driven from the other end: vo, so filters can +- Video codecs pull the data from the demuxer, instead of the old push-method. +- The video filtering path is driven from the other end: vo, so filters can insert new frames without going up to the codecs. -- video codecs and filters may modify the timing info (PTS/duration) of frames +- Video codecs and filters may modify the timing info (PTS/duration) of frames. - libvo2 has been redesigned, now vo drivers do the minimal thing only: - controls the actual device and export its buffers to the vo core (vf_vo2.c) + control the actual device and export its buffers to the vo core (vf_vo2.c) All the rest (like draw_slice() implementation, OSD rendering, buffer - management is handled by the core, not the driver itself). -- audio and video codecs/filters/path has been separated -- the stream and demuxer code have been modularized, instead of switch-case mess -- demuxers now handle more than one audio and video stream at the same time, + management) is handled by the core, not the driver itself. +- Audio and video codecs/filters/path have been separated. +- Stream and demuxer code has been modularized, instead of switch-case mess. +- Demuxers now handle more than one audio and video stream at the same time, so runtime stream switching or playback/conversion of multiple audio/video tracks at the same time is now possible. -- stream-less demuxers are not hacks any longer, they are legal using the DUMMY +- Stream-less demuxers are not hacks any longer, they are legal using the DUMMY stream type, auto-created based on URL. - -

1 0

Data communication between demuxers and UIs
by Fre_ax 24 Jan '04

24 Jan '04

I decided to give a shot and try to implement dvb playlist for GUI to allow users remove/add/rename/group channels. I soon realized that this is impossible because its not easy to transmit data between libmpdemux/dvbin.c and GUI. Now, to solve this problem I was thinking if demuxers would be allowed to register virtual filesystems for UIs. "Services" would then register mount points like DVB, HTTP, FTP, CDDA, ... Demuxers would then look for possible files/streams to play and list them by the virtual filesystem. --Aapo Tahkola

7 28