← Back to branch summary

~ubuntu-branches/ubuntu/lucid/dvd95/lucid

« back to all changes in this revision

Viewing changes to src/dvdtools.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-02-14 20:45:14 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100214204514-k1l8jra595vc57xd
Tags: 1.6p0-0ubuntu1
* New upstream release.
* Switch to debhelper 7.
* Use quilt as patch system:
  - Drop dpatch support.
  - Convert all patches to quilt format.
  - Update debian/README.source.
* Refresh patches.
* Drop 04_dvdinfo.c.patch, applied by upstream.
* Update debian/copyright.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dvdtools.c
323
323
{
324
324
        vtsi_mat_t *vtsi_mat;
325
325
        audio_attr_t *audio_attr;
 
326
        Piste_t * piste = GetPiste( noPisteVideo );
 
327
        pgc_t * pgc;
 
328
        int streamId;
326
329
 
327
330
        vtsi_mat = Ifo[Ifo_zero->tt_srpt->title[noPisteVideo].title_set_nr]->vtsi_mat;
328
331
 
329
332
        audio_attr = &vtsi_mat->vts_audio_attr[noPisteAudio];
330
 
//!!    if( (audio_attr->channels + 1) == 6 )   return( "dts" );
 
333
/* StreamId is given in audio_control array of first PGC */
 
334
        pgc = piste->pgcs[0];
 
335
        streamId = pgc->audio_control[noPisteAudio];
 
336
        streamId = (streamId >> 8) & 0x07;
 
337
 
331
338
        switch( audio_attr->audio_format ) {
332
339
                case 0 : /* AC3 */
333
 
                        return( 0x80 + noPisteAudio );
 
340
                        return( 0x80 + streamId );
334
341
                case 2 : /* Mpeg-1 */
335
342
                case 3 : /* Mpeg-2 */
336
 
                        return( 0xC0 + noPisteAudio );
 
343
//                      return( 0xC0 + streamId );
 
344
                        return( 0x00 + streamId ); /* from man mencoder/-aid */
337
345
                case 4: /* LPCM */
338
 
                        return( 0xA0 + noPisteAudio );
 
346
                        return( 0xA0 + streamId );
339
347
                case 6: /* DTS */
340
 
                        return( 0x88 + noPisteAudio );
 
348
                        return( 0x88 + streamId );
341
349
                default :
342
 
                        return( 0x80 + noPisteAudio );
 
350
                        return( 0x80 + streamId );
343
351
        }
344
352
}
345
353