[MPlayer-dev-eng] branching off rc4

[Reimar Döffinger]

On Sun, Aug 01, 2010 at 11:09:51AM -0400, Reinhard Tartler wrote:
> On Sun, Aug 01, 2010 at 09:35:38 (EDT), Reimar Döffinger wrote:
> 
> > On Sun, Aug 01, 2010 at 08:37:24AM -0400, Reinhard Tartler wrote:
> >> On Sun, Aug 01, 2010 at 04:42:28 (EDT), Alexander Roalter wrote:
> >> 
> >> > On 07/31/2010 11:51 PM, Reinhard Tartler wrote:
> >> >> On Thu, Jul 29, 2010 at 12:25:43 (EDT), Reimar Döffinger wrote:
> >> >> 
> >> >>> On Thu, Jul 29, 2010 at 03:38:40PM +0200, Alexander Roalter wrote:
> >> >>>> I'm not sure it has to do with this special thread, but when I play a
> >> >>>> dumped DVD (vob), mplayer now automatically shows a subtitle.
> >> >>>> I have some vague memory that the default demuxer was changed lately (to
> >> >>>> lavf?) and while previously I had to specify -sid 0 to have subtitles
> >> >>>> and being able to switch them later with 'j', omitting -sid did disable
> >> >>>> subtitles, so pressing 'j' during the movie did nothing.
> >> >>>
> >> >>> The demuxer was not changed. The behaviour was changed since -nosub is
> >> >>> now available. If preferred, I have no objections to make this default
> >> >>> (and -sid -1 then enabling autoselection of first subtitle).
> >> >> 
> >> >> I think -nosub should be enabled by default to meet the principle of
> >> >> least surprise. All other media players, including commercial dvd
> >> >> players that i've seen don't display subtitles by default, and I think
> >> >> this is a good choice.
> >> >> 
> >> > I would concur only if it would still be possible to switch subtitles on
> >> > while playing. So the subtitles should be at the 'subtitle disabled'
> >> > stage (i.e. the one you reach after you toggle through all available
> >> > subtitles + 1), and can enable them with pressing 'j'.
> >> 
> >> I fully agree!
> >> 
> >> Anything else that should go into the rc4 branch before the release?
> >
> > Well, I think the dvdcss code is a completely broken mess currently.
> > It did not work at all with region-free DVDs (and I currently only
> > have a region-free one at hand), I fixed that.
> > However, I still think the no-ioctl fallback code also still is completely
> > non-working.
> 
> okay, please tell me when you consider it in an acceptable state, I'll
> then svn merge all 'missing' libdvdcss commits to the rc4 branch.

Well, with r31884 it is now working for me.
It seems the issue was that when the region-setting ioctl failed, the
field indicating whether the disc is encrypted or not was never
initialized.
I would welcome anyone proposing the change upstream, we really
shouldn't have it only locally, but I can't really be bothered :-)
If someone wants to do it, the full patch from
svn di -r31880:31884 libdvdcss/
without the intermediate steps makes most sense IMO, though the critical
part is that b_scrambled gets set correctly even when ioctl_ReportRPC
fails.