Issue #80 - De-unify dom/media/flac

dom/media/flac/FlacDemuxer.cpp

@@ -33,14 +33,6 @@ namespace flac {
 // flac::FrameHeader - Holds the flac frame header and its parsing
 // state.
 
-#define FLAC_MAX_CHANNELS           8
-#define FLAC_MIN_BLOCKSIZE         16
-#define FLAC_MAX_BLOCKSIZE      65535
-#define FLAC_MIN_FRAME_SIZE        11
-#define FLAC_MAX_FRAME_HEADER_SIZE 16
-#define FLAC_MAX_FRAME_SIZE (FLAC_MAX_FRAME_HEADER_SIZE \
-                             +FLAC_MAX_BLOCKSIZE*FLAC_MAX_CHANNELS*3)
-
 class FrameHeader {
 public:
   const AudioInfo& Info() const { return mInfo; }

dom/media/flac/FlacDemuxer.h

@@ -13,6 +13,15 @@
 namespace mozilla {
 
 namespace flac {
+
+#define FLAC_MAX_CHANNELS           8
+#define FLAC_MIN_BLOCKSIZE         16
+#define FLAC_MAX_BLOCKSIZE      65535
+#define FLAC_MIN_FRAME_SIZE        11
+#define FLAC_MAX_FRAME_HEADER_SIZE 16
+#define FLAC_MAX_FRAME_SIZE (FLAC_MAX_FRAME_HEADER_SIZE \
+                             +FLAC_MAX_BLOCKSIZE*FLAC_MAX_CHANNELS*3)
+
 class Frame;
 class FrameParser;
 }

dom/media/flac/FlacFrameParser.cpp

@@ -7,6 +7,7 @@
 #include "FlacFrameParser.h"
 #include "mp4_demuxer/ByteReader.h"
 #include "nsTArray.h"
+#include "FlacDemuxer.h"
 #include "OggCodecState.h"
 #include "OpusParser.h"
 #include "VideoUtils.h"

dom/media/flac/moz.build

@@ -10,7 +10,7 @@ EXPORTS += [
     'FlacFrameParser.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'FlacDecoder.cpp',
     'FlacDemuxer.cpp',
     'FlacFrameParser.cpp',