diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2008-06-07 22:29:11 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2008-06-07 22:29:11 +0000 |
| commit | 3596aa6fe61177f7bdc0381defa8f9e6ce85d85b (patch) | |
| tree | 7ac36f93876ee6bde25ef114e82564a06e931bbf /libavcodec | |
| parent | 6730e9f300927c37d2016093684222fef63bb740 (diff) | |
| download | ffmpeg-3596aa6fe61177f7bdc0381defa8f9e6ce85d85b.tar.gz | |
get substreamid from ac3 parser
Originally committed as revision 13689 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3.h | 1 | ||||
| -rw-r--r-- | libavcodec/ac3_parser.c | 3 | ||||
| -rw-r--r-- | libavcodec/ac3dec.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index a7c48ebc23..abe40a5617 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -85,6 +85,7 @@ typedef struct { 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 --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 667c6d3821..7e6bea14c9 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -99,6 +99,7 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) 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 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) 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 --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index ad5e0831f0..94c98ac102 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -134,6 +134,7 @@ typedef struct { 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 @@ static int ac3_parse_header(AC3DecodeContext *s) 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; |