On niedziela, 23 marca 2008, Justin Ruggles wrote:
> Maybe you should also go ahead and add an enum for stream types to
> ac3.h. Besides that, patch looks fine to me.
ok, this is patch with added enum EAC3StreamType. I also wrote to Diego aboutÂ
access to the repository.
--
Bartlomiej Wolowiec
Index: libavcodec/ac3dec.c
===================================================================
--- libavcodec/ac3dec.c (revision 12566)
+++ libavcodec/ac3dec.c (working copy)
@@ -1151,6 +1151,9 @@
case AC3_PARSE_ERROR_FRAME_SIZE:
av_log(avctx, AV_LOG_ERROR, "invalid frame size\n");
break;
+ case AC3_PARSE_ERROR_STREAM_TYPE:
+ av_log(avctx, AV_LOG_ERROR, "invalid stream type\n");
+ break;
default:
av_log(avctx, AV_LOG_ERROR, "invalid header\n");
break;
Index: libavcodec/aac_ac3_parser.h
===================================================================
--- libavcodec/aac_ac3_parser.h (revision 12566)
+++ libavcodec/aac_ac3_parser.h (working copy)
@@ -37,6 +37,7 @@
int sample_rate;
int bit_rate;
int samples;
+ uint8_t stream_type;
} AACAC3ParseContext;
int ff_aac_ac3_parse(AVCodecParserContext *s1,
Index: libavcodec/aac_parser.c
===================================================================
--- libavcodec/aac_parser.c (revision 12566)
+++ libavcodec/aac_parser.c (working copy)
@@ -83,6 +83,7 @@
static av_cold int aac_parse_init(AVCodecParserContext *s1)
{
AACAC3ParseContext *s = s1->priv_data;
+ s->stream_type = 0;
s->inbuf_ptr = s->inbuf;
s->header_size = AAC_HEADER_SIZE;
s->sync = aac_sync;
Index: libavcodec/ac3_parser.c
===================================================================
--- libavcodec/ac3_parser.c (revision 12566)
+++ libavcodec/ac3_parser.c (working copy)
@@ -84,10 +84,14 @@
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->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2;
+ hdr->stream_type = 0;
} else {
/* Enhanced AC-3 */
hdr->crc1 = 0;
- skip_bits(&gbc, 2); // skip stream type
+ hdr->stream_type = get_bits(&gbc, 2);
+ if(hdr->stream_type == 3)
+ return AC3_PARSE_ERROR_STREAM_TYPE;
+
skip_bits(&gbc, 3); // skip substream id
hdr->frame_size = (get_bits(&gbc, 11) + 1) << 1;
Index: libavcodec/ac3_parser.h
===================================================================
--- libavcodec/ac3_parser.h (revision 12566)
+++ libavcodec/ac3_parser.h (working copy)
@@ -30,6 +30,7 @@
AC3_PARSE_ERROR_BSID = -2,
AC3_PARSE_ERROR_SAMPLE_RATE = -3,
AC3_PARSE_ERROR_FRAME_SIZE = -4,
+ AC3_PARSE_ERROR_STREAM_TYPE = -5,
} AC3ParseError;
/**
Index: libavcodec/ac3.h
===================================================================
--- libavcodec/ac3.h (revision 12566)
+++ libavcodec/ac3.h (working copy)
@@ -84,6 +84,7 @@
uint8_t bitstream_id;
uint8_t channel_mode;
uint8_t lfe_on;
+ uint8_t stream_type;
/** @} */
/** @defgroup derived Derived values
@@ -97,6 +98,12 @@
/** @} */
} AC3HeaderInfo;
+typedef enum {
+ EAC3_STREAM_TYPE_INDEPENDENT = 0,
+ EAC3_STREAM_TYPE_DEPENDENT,
+ EAC3_STREAM_TYPE_AC3_CONVERT,
+ EAC3_STREAM_TYPE_RESERVED
+} EAC3StreamType;
void ac3_common_init(void);
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
