summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-08 21:10:31 -0500
committertrav90 <travawine@palemoon.org>2018-10-08 21:10:31 -0500
commit5a83ed9ebacfa2bd653953b359dd5456817b03c3 (patch)
tree986180ad48bd0490ef9c12e4c710469741ec1c87
parentae3cdb4be3cfe1faccf1d8a74928391570952609 (diff)
downloadUXP-5a83ed9ebacfa2bd653953b359dd5456817b03c3.tar
UXP-5a83ed9ebacfa2bd653953b359dd5456817b03c3.tar.gz
UXP-5a83ed9ebacfa2bd653953b359dd5456817b03c3.tar.lz
UXP-5a83ed9ebacfa2bd653953b359dd5456817b03c3.tar.xz
UXP-5a83ed9ebacfa2bd653953b359dd5456817b03c3.zip
[vpx] Store VPXDecoder codec as an enum
Use the enum we already have here instead of converting to an int when we pass it around, giving us better type checking.
-rw-r--r--dom/media/platforms/agnostic/VPXDecoder.cpp4
-rw-r--r--dom/media/platforms/agnostic/VPXDecoder.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/dom/media/platforms/agnostic/VPXDecoder.cpp b/dom/media/platforms/agnostic/VPXDecoder.cpp
index 77c81b51b..42bb86020 100644
--- a/dom/media/platforms/agnostic/VPXDecoder.cpp
+++ b/dom/media/platforms/agnostic/VPXDecoder.cpp
@@ -22,7 +22,7 @@ namespace mozilla {
using namespace gfx;
using namespace layers;
-static int MimeTypeToCodec(const nsACString& aMimeType)
+static VPXDecoder::Codec MimeTypeToCodec(const nsACString& aMimeType)
{
if (aMimeType.EqualsLiteral("video/webm; codecs=vp8")) {
return VPXDecoder::Codec::VP8;
@@ -31,7 +31,7 @@ static int MimeTypeToCodec(const nsACString& aMimeType)
} else if (aMimeType.EqualsLiteral("video/vp9")) {
return VPXDecoder::Codec::VP9;
}
- return -1;
+ return VPXDecoder::Codec::Unknown;
}
VPXDecoder::VPXDecoder(const CreateDecoderParams& aParams)
diff --git a/dom/media/platforms/agnostic/VPXDecoder.h b/dom/media/platforms/agnostic/VPXDecoder.h
index d420ec069..4d57ebf94 100644
--- a/dom/media/platforms/agnostic/VPXDecoder.h
+++ b/dom/media/platforms/agnostic/VPXDecoder.h
@@ -36,7 +36,8 @@ public:
enum Codec: uint8_t {
VP8 = 1 << 0,
- VP9 = 1 << 1
+ VP9 = 1 << 1,
+ Unknown = 1 << 7,
};
// Return true if aMimeType is a one of the strings used by our demuxers to
@@ -61,7 +62,7 @@ private:
const VideoInfo& mInfo;
- const int mCodec;
+ const Codec mCodec;
};
} // namespace mozilla