comparison libmpdvdkit2/libdvdcss.c @ 8637:0211de3039eb

update libdvdcss in libmpdvdkit to latest version (1.2.4) patch by Andreas Hess <[e-mail]>

8636:db4a1b1254cb

	char* disc_id=NULL;
	/*char title_name[64];*/
	char sector[DVDCSS_BLOCK_SIZE];
	// 32768+40  -> disc title (32 uppercase chars)
	// 32768+813 -> disc manufacturing date + serial no (16 digit number)
	_dvdcss_seek( dvdcss, 32768/DVDCSS_BLOCK_SIZE);
	if(_dvdcss_read( dvdcss, sector, 1) == 1){
	    // check disc title first:
	    char* title_name=&sector[40];
	    int i=31;
	    while(i>=0 && title_name[i]<=32) i--;
	    title_name[i+1]=0;

        {
            return -1;
        }
    }

    return _dvdcss_seek( dvdcss, i_blocks );
}

/**
 * \brief Read from the disc and decrypt data if requested.
 *

                                          int i_blocks,
                                          int i_flags )
{
    int i_ret, i_index;

    i_ret = _dvdcss_read( dvdcss, p_buffer, i_blocks );

    if( i_ret <= 0
         || !dvdcss->b_scrambled
         || !(i_flags & DVDCSS_READ_DECRYPT) )
    {

    struct iovec *_p_iovec = (struct iovec *)p_iovec;
    int i_ret, i_index;
    void *iov_base;
    size_t iov_len;

    i_ret = _dvdcss_readv( dvdcss, _p_iovec, i_blocks );

    if( i_ret <= 0
         || !dvdcss->b_scrambled
         || !(i_flags & DVDCSS_READ_DECRYPT) )
    {

8637:0211de3039eb

	char* disc_id=NULL;
	/*char title_name[64];*/
	char sector[DVDCSS_BLOCK_SIZE];
	// 32768+40  -> disc title (32 uppercase chars)
	// 32768+813 -> disc manufacturing date + serial no (16 digit number)
	dvdcss->pf_seek( dvdcss, 32768/DVDCSS_BLOCK_SIZE);
	if(dvdcss->pf_read( dvdcss, sector, 1) == 1){
	    // check disc title first:
	    char* title_name=&sector[40];
	    int i=31;
	    while(i>=0 && title_name[i]<=32) i--;
	    title_name[i+1]=0;

        {
            return -1;
        }
    }

    return dvdcss->pf_seek( dvdcss, i_blocks );
}

/**
 * \brief Read from the disc and decrypt data if requested.
 *

                                          int i_blocks,
                                          int i_flags )
{
    int i_ret, i_index;

    i_ret = dvdcss->pf_read( dvdcss, p_buffer, i_blocks );

    if( i_ret <= 0
         || !dvdcss->b_scrambled
         || !(i_flags & DVDCSS_READ_DECRYPT) )
    {

    struct iovec *_p_iovec = (struct iovec *)p_iovec;
    int i_ret, i_index;
    void *iov_base;
    size_t iov_len;

    i_ret = dvdcss->pf_readv( dvdcss, _p_iovec, i_blocks );

    if( i_ret <= 0
         || !dvdcss->b_scrambled
         || !(i_flags & DVDCSS_READ_DECRYPT) )
    {