From 0f7b0f690028ba7e2f327377124ad7f6f8bfea3b Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 18 Apr 2020 02:08:39 -0400
Subject: Issue #80 - De-unify dom/media/flac

---
 dom/media/flac/FlacDemuxer.cpp     | 8 --------
 dom/media/flac/FlacDemuxer.h       | 9 +++++++++
 dom/media/flac/FlacFrameParser.cpp | 1 +
 dom/media/flac/moz.build           | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dom/media/flac/FlacDemuxer.cpp b/dom/media/flac/FlacDemuxer.cpp
index 7a98edbee..6df09cc25 100644
--- a/dom/media/flac/FlacDemuxer.cpp
+++ b/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; }
diff --git a/dom/media/flac/FlacDemuxer.h b/dom/media/flac/FlacDemuxer.h
index fd0e35c94..248ae861f 100644
--- a/dom/media/flac/FlacDemuxer.h
+++ b/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;
 }
diff --git a/dom/media/flac/FlacFrameParser.cpp b/dom/media/flac/FlacFrameParser.cpp
index f2d6c1367..c31161cbc 100644
--- a/dom/media/flac/FlacFrameParser.cpp
+++ b/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"
diff --git a/dom/media/flac/moz.build b/dom/media/flac/moz.build
index 6933ded1f..86427e0dd 100644
--- a/dom/media/flac/moz.build
+++ b/dom/media/flac/moz.build
@@ -10,7 +10,7 @@ EXPORTS += [
     'FlacFrameParser.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'FlacDecoder.cpp',
     'FlacDemuxer.cpp',
     'FlacFrameParser.cpp',
-- 
cgit v1.2.3