[PATCH] Re: [MPlayer-dev-eng] MSGTR messages for vid/aid in non-verbose output?

[Andrew Savchenko]

Hi,

On 12 Dec 2006 03:16 mail at kraymer.de wrote:
> > On 4 Dec 2006 11:54, Diego Biurrun wrote:
[...]
> > 2nd) Change behavior of dvd stream demuxer, this requieres
> > changes  in help_mp* files since number of mp_msg arguments
> > was changed. Thus I separate this patch. Also it figured out
> > that I have no plain dvds (all was converted to mpeg4/x264) so
> > I can't test dvd stream demuxer output behavior. Should work
> > fine, but please, test with some dvds.
>
> I noticed a problem with that. Detection and displaying language
> tracks gets mixed up, for my test dvd it was:
> Audio-Stream: 0 Format: ac3 (5.1) Sprache: en.
> Audio-Stream: 1 Format: dts (5.1) Sprache: en.
> Anzahl der Audiokanäle auf der Disc: 2.
> [..]
> [demux] Video stream detected, -vid 0
> [demux] Audio stream detected, -aid 137
> [demux] Audio stream detected, -aid 128
>
> (it's part German but you'll get the meaning)
> Problem is, audio stream 0 does not match -aid 137. mplayer -aid
> 128 plays the ac3 stream, which is correct, according to demuxer
> init and lsdvd: Title: 01, blabla
>         Audio: 1, Language: en - English, Format: ac3, ...
> Stream id: 0x80 Audio: 2, Language: en - English, Format: dts,
> ... Stream id: 0x89
>
> I didn't dig the source so I don't know if only the order is
> wrong or if the issue goes deeper. Maybe it's something you
> changed? Hope that helps,

It is not my change in the code. DVD stream demuxer process streams 
in different order than demux_ps demuxer. It depends on default 
track id (it processed firstly in the demux_ps), and perhaps other 
factors are involved. 

In any case it seems DVD streams need special handling, as their 
tracks are demuxed on their own at stream/stream_dvd.c. So I add 
this and only this special casing into demuxer.c. dvdnav doesn't 
need such handling, because it doesn't provide its own non-verbose 
track information.

Please review attached patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20070211/06c5b34e/attachment.pgp>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: demuxer2.patch
Type: text/x-diff
Size: 9408 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20070211/06c5b34e/attachment.patch>