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

change name from stream type to frame type in AC3 code 

Originally committed as revision 12623 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Bartlomiej Wolowiec 2008-03-28 20:42:55 +00:00
parent be1e2a2bfa
commit 79b25a27b8
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/ac3.h
View File

@ -84,7 +84,7 @@ typedef struct {
uint8_t bitstream_id; uint8_t bitstream_id;
uint8_t channel_mode; uint8_t channel_mode;
uint8_t lfe_on; uint8_t lfe_on;
uint8_t stream_type; uint8_t frame_type;
/** @} */ /** @} */
/** @defgroup derived Derived values /** @defgroup derived Derived values
@ -99,11 +99,11 @@ typedef struct {
} AC3HeaderInfo; } AC3HeaderInfo;
typedef enum { typedef enum {
EAC3_STREAM_TYPE_INDEPENDENT = 0, EAC3_FRAME_TYPE_INDEPENDENT = 0,
EAC3_STREAM_TYPE_DEPENDENT, EAC3_FRAME_TYPE_DEPENDENT,
EAC3_STREAM_TYPE_AC3_CONVERT, EAC3_FRAME_TYPE_AC3_CONVERT,
EAC3_STREAM_TYPE_RESERVED EAC3_FRAME_TYPE_RESERVED
} EAC3StreamType; } EAC3FrameType;
void ac3_common_init(void); void ac3_common_init(void);

16
libavcodec/ac3_parser.c
View File

@ -84,13 +84,13 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift; hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift;
hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; 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_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2;
hdr->stream_type = EAC3_STREAM_TYPE_INDEPENDENT; hdr->frame_type = EAC3_FRAME_TYPE_INDEPENDENT;
} else { } else {
/* Enhanced AC-3 */ /* Enhanced AC-3 */
hdr->crc1 = 0; hdr->crc1 = 0;
hdr->stream_type = get_bits(&gbc, 2); hdr->frame_type = get_bits(&gbc, 2);
if(hdr->stream_type == EAC3_STREAM_TYPE_RESERVED) if(hdr->frame_type == EAC3_FRAME_TYPE_RESERVED)
return AC3_PARSE_ERROR_STREAM_TYPE; return AC3_PARSE_ERROR_FRAME_TYPE;
skip_bits(&gbc, 3); // skip substream id skip_bits(&gbc, 3); // skip substream id
@ -138,14 +138,14 @@ static int ac3_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag)
hdr_info->channels = hdr.channels; hdr_info->channels = hdr.channels;
hdr_info->samples = AC3_FRAME_SIZE; hdr_info->samples = AC3_FRAME_SIZE;
switch(hdr.stream_type){ switch(hdr.frame_type){
case EAC3_STREAM_TYPE_INDEPENDENT: case EAC3_FRAME_TYPE_INDEPENDENT:
*flag = FRAME_START; *flag = FRAME_START;
break; break;
case EAC3_STREAM_TYPE_DEPENDENT: case EAC3_FRAME_TYPE_DEPENDENT:
*flag = FRAME_CONTINUATION; *flag = FRAME_CONTINUATION;
break; break;
case EAC3_STREAM_TYPE_AC3_CONVERT: case EAC3_FRAME_TYPE_AC3_CONVERT:
*flag = FRAME_COMPLETE; *flag = FRAME_COMPLETE;
break; break;
} }

2
libavcodec/ac3_parser.h
View File

@ -30,7 +30,7 @@ typedef enum {
AC3_PARSE_ERROR_BSID = -2, AC3_PARSE_ERROR_BSID = -2,
AC3_PARSE_ERROR_SAMPLE_RATE = -3, AC3_PARSE_ERROR_SAMPLE_RATE = -3,
AC3_PARSE_ERROR_FRAME_SIZE = -4, AC3_PARSE_ERROR_FRAME_SIZE = -4,
AC3_PARSE_ERROR_STREAM_TYPE = -5, AC3_PARSE_ERROR_FRAME_TYPE = -5,
} AC3ParseError; } AC3ParseError;
/** /**

4
libavcodec/ac3dec.c
View File

@ -1169,8 +1169,8 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
case AC3_PARSE_ERROR_FRAME_SIZE: case AC3_PARSE_ERROR_FRAME_SIZE:
av_log(avctx, AV_LOG_ERROR, "invalid frame size\n"); av_log(avctx, AV_LOG_ERROR, "invalid frame size\n");
break; break;
case AC3_PARSE_ERROR_STREAM_TYPE: case AC3_PARSE_ERROR_FRAME_TYPE:
av_log(avctx, AV_LOG_ERROR, "invalid stream type\n"); av_log(avctx, AV_LOG_ERROR, "invalid frame type\n");
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "invalid header\n"); av_log(avctx, AV_LOG_ERROR, "invalid header\n");