[libdvdcss-devel] [PATCH] more aggressive dvdcss_test

[Reimar Döffinger]

On Sat, Sep 25, 2010 at 04:46:49PM +0200, Reimar Döffinger wrote:
> -         * Apparently, on unencrypted DVDs _dvdcss_disckey() always fails, so
> -         * we can check this as a workaround. */
> -        i_ret = 0;
> -        i_copyright = 1;
> -        if( _dvdcss_disckey( dvdcss ) < 0 )
> -        {
> -            i_copyright = 0;
> -        }
> -    }
> -#endif
> -
> -    if( i_ret < 0 )
> -    {
> +         * On unencrypted DVDs _dvdcss_disckey() always fails, however
> +         * it will always fail if ioctls do not work at all so we cannot
> +         * use that either.
> +         * We just assume the disc will be scrambled, the per-title checks
> +         * should still handle this fine. */
> @@ -138,8 +123,8 @@
>  
>      if( i_ret < 0 )
>      {
> -        print_error( dvdcss, "css error: could not get RPC status" );
> -        return -2;
> +        print_error( dvdcss, "css error: could not get RPC status, region-free drive?" );
> +        return;

Note that the core of this is that for some non-RPC-2, region-free
drives the RPC status fails, so disabling ioctls due to that is
just wrong.
At the same time, _dvdcss_disckey will fail if ioctls do not work,
so it makes no sense to decide a disk is unscrabled just because it
fails!