using stream type in eac3 parser
authorBartlomiej Wolowiec <bartek.wolowiec@gmail.com>
Mon, 24 Mar 2008 21:25:49 +0000 (21:25 +0000)
committerBartlomiej Wolowiec <bartek.wolowiec@gmail.com>
Mon, 24 Mar 2008 21:25:49 +0000 (21:25 +0000)
Originally committed as revision 12570 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/aac_ac3_parser.h
libavcodec/aac_parser.c
libavcodec/ac3.h
libavcodec/ac3_parser.c
libavcodec/ac3_parser.h
libavcodec/ac3dec.c

index f93f8a81e96a032304ddcef972b888a152f082a3..49982500cc7fb4b655d1600f8735a7fb18344bc0 100644 (file)
@@ -37,6 +37,7 @@ typedef struct AACAC3ParseContext {
     int sample_rate;
     int bit_rate;
     int samples;
+    uint8_t stream_type;
 } AACAC3ParseContext;
 
 int ff_aac_ac3_parse(AVCodecParserContext *s1,
index 37f014c571ce468817c5ebbb37094b5ba261bc46..4e8ddc1dfbb5219e6f708cc65f604dc6b5b908b8 100644 (file)
@@ -83,6 +83,7 @@ static int aac_sync(AACAC3ParseContext *hdr_info)
 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 b5fa789c498e663483108afa2436f890b9ef163b..7c2e3d9cbbdec4cd4aca2290466bc4a3e9616821 100644 (file)
@@ -84,6 +84,7 @@ typedef struct {
     uint8_t bitstream_id;
     uint8_t channel_mode;
     uint8_t lfe_on;
+    uint8_t stream_type;
     /** @} */
 
     /** @defgroup derived Derived values
@@ -97,6 +98,12 @@ typedef struct {
     /** @} */
 } 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);
 
index 0a8c804e0ad9264fc901d25d49d2310e5389da62..393133efe7903ef3bf3515563f77c1c240bdf7d7 100644 (file)
@@ -84,10 +84,14 @@ 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->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 ffac6190f85cb21efd06832024c9fd18ff88eb0c..f82be029fbb29a6075a4447beccc5db88f1c98d0 100644 (file)
@@ -30,6 +30,7 @@ typedef enum {
     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 75208de33d4669b22b9f1d7cb789fde266a33782..79a8606dba4e8756e0de44206d73ab8f27bcfc94 100644 (file)
@@ -1151,6 +1151,9 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
             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;