sync with upstream

3 files changed, 174 insertions, 0 deletions

diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
new file mode 100644
index 0000000..c77d000
--- /dev/null
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
@@ -0,0 +1,91 @@
+/*
+*      Copyright (C) 2005-2016 Team XBMC
+*      http://xbmc.org
+*
+*  This Program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  This Program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with XBMC; see the file COPYING.  If not, see
+*  <http://www.gnu.org/licenses/>.
+*
+*/
+
+#pragma once
+
+#include <inttypes.h>
+#include <string.h>
+
+//CryptoSession is usually obtained once per stream, but could change if an key expires
+
+enum CryptoSessionSystem :uint8_t
+{
+  CRYPTO_SESSION_SYSTEM_NONE,
+  CRYPTO_SESSION_SYSTEM_WIDEVINE,
+  CRYPTO_SESSION_SYSTEM_PLAYREADY
+};
+
+struct DemuxCryptoSession
+{
+  DemuxCryptoSession(const CryptoSessionSystem sys, const uint16_t sSize, const char *sData, const uint8_t flags)
+    : sessionId(new char[sSize])
+    , sessionIdSize(sSize)
+    , keySystem(sys)
+    , flags(flags)
+  {
+    memcpy(sessionId, sData, sSize);
+  };
+
+  ~DemuxCryptoSession()
+  {
+    delete[] sessionId;
+  }
+
+  // encryped stream infos
+  char * sessionId;
+  uint16_t sessionIdSize;
+  CryptoSessionSystem keySystem;
+
+  static const uint8_t FLAG_SECURE_DECODER = 1;
+  uint8_t flags;
+private:
+  DemuxCryptoSession(const DemuxCryptoSession&) = delete;
+  DemuxCryptoSession& operator=(const DemuxCryptoSession&) = delete;
+};
+
+//CryptoInfo stores the information to decrypt a sample
+
+struct DemuxCryptoInfo
+{
+  explicit DemuxCryptoInfo(const unsigned int numSubs)
+    : numSubSamples(numSubs)
+    , flags(0)
+    , clearBytes(new uint16_t[numSubs])
+    , cipherBytes(new uint32_t[numSubs])
+  {};
+
+  ~DemuxCryptoInfo()
+  {
+    delete[] clearBytes;
+    delete[] cipherBytes;
+  }
+
+  uint16_t numSubSamples; //number of subsamples
+  uint16_t flags; //flags for later use
+
+  uint16_t *clearBytes; // numSubSamples uint16_t's wich define the size of clear size of a subsample
+  uint32_t *cipherBytes; // numSubSamples uint32_t's wich define the size of cipher size of a subsample
+
+  uint8_t iv[16]; // initialization vector
+  uint8_t kid[16]; // key id
+private:
+  DemuxCryptoInfo(const DemuxCryptoInfo&) = delete;
+  DemuxCryptoInfo& operator=(const DemuxCryptoInfo&) = delete;
+};
diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
new file mode 100644
index 0000000..2d85ed9
--- /dev/null
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
@@ -0,0 +1,52 @@
+#pragma once
+
+/*
+ *      Copyright (C) 2012-2013 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "TimingConstants.h"
+#include <cstdint>
+#include <memory>
+
+#define DMX_SPECIALID_STREAMINFO    -10
+#define DMX_SPECIALID_STREAMCHANGE  -11
+
+struct DemuxCryptoInfo;
+
+typedef struct DemuxPacket
+{
+  DemuxPacket() = default;
+
+  uint8_t *pData = nullptr;
+  int iSize = 0;
+  int iStreamId = -1;
+  int64_t demuxerId; // id of the demuxer that created the packet
+  int iGroupId = -1; // the group this data belongs to, used to group data from different streams together
+
+  void *pSideData = nullptr;
+  int iSideDataElems = 0;
+
+  double pts = DVD_NOPTS_VALUE;
+  double dts = DVD_NOPTS_VALUE;
+  double duration = 0; // duration in DVD_TIME_BASE if available
+  int dispTime = 0;
+  bool recoveryPoint = false;
+
+  std::shared_ptr<DemuxCryptoInfo> cryptoInfo;
+} DemuxPacket;
diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h b/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h
new file mode 100644
index 0000000..b70128e
--- /dev/null
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h
@@ -0,0 +1,31 @@
+#pragma once
+
+/*
+*      Copyright (C) 2017 Team XBMC
+*      http://xbmc.org
+*
+*  This Program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  This Program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with XBMC; see the file COPYING.  If not, see
+*  <http://www.gnu.org/licenses/>.
+*
+*/
+
+#define DVD_TIME_BASE 1000000
+#define DVD_NOPTS_VALUE 0xFFF0000000000000
+
+#define DVD_TIME_TO_MSEC(x) ((int)((double)(x) * 1000 / DVD_TIME_BASE))
+#define DVD_SEC_TO_TIME(x)  ((double)(x) * DVD_TIME_BASE)
+#define DVD_MSEC_TO_TIME(x) ((double)(x) * DVD_TIME_BASE / 1000)
+
+#define DVD_PLAYSPEED_PAUSE       0       // frame stepping
+#define DVD_PLAYSPEED_NORMAL      1000