Move AC3 header parsing code together with the rest of the AC3 parsing code.

Originally committed as revision 8739 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/Makefile

@@ -277,7 +277,7 @@ endif
 
 
 OBJS-$(CONFIG_AAC_PARSER)              += parser.o
-OBJS-$(CONFIG_AC3_PARSER)              += parser.o ac3.o
+OBJS-$(CONFIG_AC3_PARSER)              += parser.o
 OBJS-$(CONFIG_CAVSVIDEO_PARSER)        += cavs.o parser.o
 OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsubdec.o
 OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsubdec.o

libavcodec/ac3.c

@@ -235,53 +235,3 @@ void ac3_common_init(void)
     }
     bndtab[50] = l;
 }
-
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
-{
-    GetBitContext gbc;
-
-    memset(hdr, 0, sizeof(*hdr));
-
-    init_get_bits(&gbc, buf, 54);
-
-    hdr->sync_word = get_bits(&gbc, 16);
-    if(hdr->sync_word != 0x0B77)
-        return -1;
-
-    /* read ahead to bsid to make sure this is AC-3, not E-AC-3 */
-    hdr->bsid = show_bits_long(&gbc, 29) & 0x1F;
-    if(hdr->bsid > 10)
-        return -2;
-
-    hdr->crc1 = get_bits(&gbc, 16);
-    hdr->fscod = get_bits(&gbc, 2);
-    if(hdr->fscod == 3)
-        return -3;
-
-    hdr->frmsizecod = get_bits(&gbc, 6);
-    if(hdr->frmsizecod > 37)
-        return -4;
-
-    skip_bits(&gbc, 5); // skip bsid, already got it
-
-    hdr->bsmod = get_bits(&gbc, 3);
-    hdr->acmod = get_bits(&gbc, 3);
-    if((hdr->acmod & 1) && hdr->acmod != 1) {
-        hdr->cmixlev = get_bits(&gbc, 2);
-    }
-    if(hdr->acmod & 4) {
-        hdr->surmixlev = get_bits(&gbc, 2);
-    }
-    if(hdr->acmod == 2) {
-        hdr->dsurmod = get_bits(&gbc, 2);
-    }
-    hdr->lfeon = get_bits1(&gbc);
-
-    hdr->halfratecod = FFMAX(hdr->bsid, 8) - 8;
-    hdr->sample_rate = ff_ac3_freqs[hdr->fscod] >> hdr->halfratecod;
-    hdr->bit_rate = (ff_ac3_bitratetab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod;
-    hdr->channels = ff_ac3_channels[hdr->acmod] + hdr->lfeon;
-    hdr->frame_size = ff_ac3_frame_sizes[hdr->frmsizecod][hdr->fscod] * 2;
-
-    return 0;
-}

libavcodec/ac3.h

@@ -77,18 +77,6 @@ typedef struct {
     /** @} */
 } AC3HeaderInfo;
 
-/**
- * Parses AC-3 frame header.
- * Parses the header up to the lfeon element, which is the first 52 or 54 bits
- * depending on the audio coding mode.
- * @param buf[in] Array containing the first 7 bytes of the frame.
- * @param hdr[out] Pointer to struct where header info is written.
- * @return Returns 0 on success, -1 if there is a sync word mismatch,
- * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
- * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
- */
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
-
 extern const uint16_t ff_ac3_frame_sizes[38][3];
 extern const uint8_t ff_ac3_channels[8];
 extern const uint16_t ff_ac3_freqs[3];

libavcodec/parser.c

@@ -22,7 +22,6 @@
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "mpegaudio.h"
-#include "ac3.h"
 #include "parser.h"
 
 AVCodecParser *av_first_parser = NULL;
@@ -605,6 +604,56 @@ static const int aac_channels[8] = {
 #endif
 
 #ifdef CONFIG_AC3_PARSER
+int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
+{
+    GetBitContext gbc;
+
+    memset(hdr, 0, sizeof(*hdr));
+
+    init_get_bits(&gbc, buf, 54);
+
+    hdr->sync_word = get_bits(&gbc, 16);
+    if(hdr->sync_word != 0x0B77)
+        return -1;
+
+    /* read ahead to bsid to make sure this is AC-3, not E-AC-3 */
+    hdr->bsid = show_bits_long(&gbc, 29) & 0x1F;
+    if(hdr->bsid > 10)
+        return -2;
+
+    hdr->crc1 = get_bits(&gbc, 16);
+    hdr->fscod = get_bits(&gbc, 2);
+    if(hdr->fscod == 3)
+        return -3;
+
+    hdr->frmsizecod = get_bits(&gbc, 6);
+    if(hdr->frmsizecod > 37)
+        return -4;
+
+    skip_bits(&gbc, 5); // skip bsid, already got it
+
+    hdr->bsmod = get_bits(&gbc, 3);
+    hdr->acmod = get_bits(&gbc, 3);
+    if((hdr->acmod & 1) && hdr->acmod != 1) {
+        hdr->cmixlev = get_bits(&gbc, 2);
+    }
+    if(hdr->acmod & 4) {
+        hdr->surmixlev = get_bits(&gbc, 2);
+    }
+    if(hdr->acmod == 2) {
+        hdr->dsurmod = get_bits(&gbc, 2);
+    }
+    hdr->lfeon = get_bits1(&gbc);
+
+    hdr->halfratecod = FFMAX(hdr->bsid, 8) - 8;
+    hdr->sample_rate = ff_ac3_freqs[hdr->fscod] >> hdr->halfratecod;
+    hdr->bit_rate = (ff_ac3_bitratetab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod;
+    hdr->channels = ff_ac3_channels[hdr->acmod] + hdr->lfeon;
+    hdr->frame_size = ff_ac3_frame_sizes[hdr->frmsizecod][hdr->fscod] * 2;
+
+    return 0;
+}
+
 static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
                     int *bit_rate, int *samples)
 {

libavcodec/parser.h

@@ -23,6 +23,8 @@
 #ifndef FFMPEG_PARSER_H
 #define FFMPEG_PARSER_H
 
+#include "ac3.h"
+
 typedef struct ParseContext{
     uint8_t *buffer;
     int index;
@@ -60,4 +62,16 @@ void ff_parse1_close(AVCodecParserContext *s);
 /* h263dec.c */
 int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
+/**
+ * Parses AC-3 frame header.
+ * Parses the header up to the lfeon element, which is the first 52 or 54 bits
+ * depending on the audio coding mode.
+ * @param buf[in] Array containing the first 7 bytes of the frame.
+ * @param hdr[out] Pointer to struct where header info is written.
+ * @return Returns 0 on success, -1 if there is a sync word mismatch,
+ * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
+ * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
+ */
+int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
+
 #endif /* !FFMPEG_PARSER_H */

libavformat/raw.c

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "ac3.h"
+#include "parser.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */