sync with upstream

3 files changed, 49 insertions, 15 deletions

diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
index a32f4fe..c77d000 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
@@ -55,6 +55,9 @@ struct DemuxCryptoSession
 
   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
@@ -82,4 +85,7 @@ struct DemuxCryptoInfo
 
   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/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
index 77d796e..2d85ed9 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
@@ -20,6 +20,7 @@
  *
  */
 
+#include "TimingConstants.h"
 #include <cstdint>
 #include <memory>
 
@@ -32,24 +33,20 @@ typedef struct DemuxPacket
 {
   DemuxPacket() = default;
 
-  DemuxPacket(unsigned char *pData, int const iSize, double const pts, double const dts)
-    : pData(pData)
-    , iSize(iSize)
-    , pts(pts)
-    , dts(dts)
-  {};
-
-  unsigned char *pData;   // data
-  int iSize;     // data size
-  int iStreamId; // integer representing the stream index
+  uint8_t *pData = nullptr;
+  int iSize = 0;
+  int iStreamId = -1;
   int64_t demuxerId; // id of the demuxer that created the packet
-  int iGroupId;  // the group this data belongs to, used to group data from different streams together
+  int iGroupId = -1; // the group this data belongs to, used to group data from different streams together
 
-  double pts; // pts in DVD_TIME_BASE
-  double dts; // dts in DVD_TIME_BASE
-  double duration; // duration in DVD_TIME_BASE if available
+  void *pSideData = nullptr;
+  int iSideDataElems = 0;
 
-  int dispTime;
+  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