RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get substreamid from ac3 parser 

Originally committed as revision 13689 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-06-07 22:29:11 +00:00
parent 6730e9f300
commit 3596aa6fe6
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ac3.h
View File

@ -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;

3
libavcodec/ac3_parser.c
View File

@ -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)

2
libavcodec/ac3dec.c
View File

@ -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;