# HG changeset patch
# User jbr
# Date 1212877751 0
# Node ID 4156c54aedba8571d2b11da87817f71df929c62f
# Parent  77f607fb4e8b9162376f4e0174e1c3cf6cfc290a
get substreamid from ac3 parser

diff -r 77f607fb4e8b -r 4156c54aedba ac3.h
--- a/ac3.h	Sat Jun 07 22:29:03 2008 +0000
+++ b/ac3.h	Sat Jun 07 22:29:11 2008 +0000
@@ -85,6 +85,7 @@
     uint8_t channel_mode;
     uint8_t lfe_on;
     uint8_t frame_type;
+    int substreamid;                        ///< substream identification
     int center_mix_level;                   ///< Center mix level index
     int surround_mix_level;                 ///< Surround mix level index
     uint16_t channel_map;
diff -r 77f607fb4e8b -r 4156c54aedba ac3_parser.c
--- a/ac3_parser.c	Sat Jun 07 22:29:03 2008 +0000
+++ b/ac3_parser.c	Sat Jun 07 22:29:11 2008 +0000
@@ -99,6 +99,7 @@
         hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on;
         hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2;
         hdr->frame_type = EAC3_FRAME_TYPE_AC3_CONVERT; //EAC3_FRAME_TYPE_INDEPENDENT;
+        hdr->substreamid = 0;
     } else {
         /* Enhanced AC-3 */
         hdr->crc1 = 0;
@@ -106,7 +107,7 @@
         if(hdr->frame_type == EAC3_FRAME_TYPE_RESERVED)
             return AC3_PARSE_ERROR_FRAME_TYPE;
 
-        skip_bits(gbc, 3); // skip substream id
+        hdr->substreamid = get_bits(gbc, 3);
 
         hdr->frame_size = (get_bits(gbc, 11) + 1) << 1;
         if(hdr->frame_size < AC3_HEADER_SIZE)
diff -r 77f607fb4e8b -r 4156c54aedba ac3dec.c
--- a/ac3dec.c	Sat Jun 07 22:29:03 2008 +0000
+++ b/ac3dec.c	Sat Jun 07 22:29:11 2008 +0000
@@ -134,6 +134,7 @@
 
     int sample_rate;                        ///< sample frequency, in Hz
     int bit_rate;                           ///< stream bit rate, in bits-per-second
+    int substreamid;                        ///< substream identification
     int frame_size;                         ///< current frame size, in bytes
 
     int channels;                           ///< number of total channels
@@ -326,6 +327,7 @@
     s->center_mix_level             = hdr.center_mix_level;
     s->surround_mix_level           = hdr.surround_mix_level;
     s->num_blocks                   = hdr.num_blocks;
+    s->substreamid                  = hdr.substreamid;
 
     if(s->lfe_on) {
         s->start_freq[s->lfe_ch] = 0;