summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-18 02:08:39 -0400
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-24 10:29:23 +0200
commite8aa76713a5ef2bc0821cf1f13425debaa42776f (patch)
tree182cc6eeb723bb81c00ec1dda25e2ac17d75ba37
parente6ffc4bdb76c40e3cc3df4759a9c860fe3c4c66b (diff)
downloadUXP-e8aa76713a5ef2bc0821cf1f13425debaa42776f.tar
UXP-e8aa76713a5ef2bc0821cf1f13425debaa42776f.tar.gz
UXP-e8aa76713a5ef2bc0821cf1f13425debaa42776f.tar.lz
UXP-e8aa76713a5ef2bc0821cf1f13425debaa42776f.tar.xz
UXP-e8aa76713a5ef2bc0821cf1f13425debaa42776f.zip
Issue #80 - De-unify dom/media/flac
-rw-r--r--dom/media/flac/FlacDemuxer.cpp8
-rw-r--r--dom/media/flac/FlacDemuxer.h9
-rw-r--r--dom/media/flac/FlacFrameParser.cpp1
-rw-r--r--dom/media/flac/moz.build2
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',