Version 1.1.9vdr-1.1.9

- Fixed the 'newplugin' script to make it name the target for creating the
  distribution package 'dist', as stated in the PLUGINS.html documentation.
  If you have already created a plugin source directory and Makefile you may
  want to check it and replace the 'package' target with 'dist' if necessary.
- Changed device handling for being able to do simultaneous recording and
  replay on the same device (Time Shifting). In order for this to work you need
  to use a driver with a firmware version that has this feature implemented.
- cDevice::ProvidesCa() is no longer virtual. The new function
  cDevice::ProvidesChannel() is now used to determine whether a device can
  receive a given channel, and by default this function returns false. So a
  device that is a pure replaying device doesn't need to do anything here.
- Increased the recorder buffer size to 5MB in order to be able to better handle
  multiple recordings.
- Implemented cTSBuffer for better handling TS packet buffering in derived
  cDevice classes.
- Changed the interface if cDevice::GetTSPacket() to avoid unnecessary copying
  of data.
- Removed cDevice::Channel(), since this makes no more sense with devices
  receiving multiple channels.
- Switching through channels with the 'Up' and 'Down' keys now skips channels
  that are currently not available (for instance because all devices are
  recording and these channels are on different transponders).
- Implemented an SPU decoder (thanks to Andreas Schultz).
- Fixed a crash when entering an integer value outside the limits (thanks to
  Stefan Huelswitt for reporting this one).
- Added play mode pmAudioOnlyBlack (thanks to Stefan Huelswitt).

1 files changed, 204 insertions, 0 deletions

diff --git a/dvbspu.h b/dvbspu.h
new file mode 100644
index 0000000..5ac2d0a
--- /dev/null
+++ b/dvbspu.h
@@ -0,0 +1,204 @@
+/*
+ * SPU decoder for DVB devices
+ *
+ * Copyright (C) 2001.2002 Andreas Schultz <aschultz@warp10.net>
+ *
+ * This code is distributed under the terms and conditions of the
+ * GNU GENERAL PUBLIC LICENSE. See the file COPYING for details.
+ *
+ * parts of this file are derived from the OMS program.
+ *
+ * $Id: dvbspu.h 1.1 2002/09/08 14:17:38 kls Exp $
+ */
+
+#ifndef __DVBSPU_H
+#define __DVBSPU_H
+
+#include <inttypes.h>
+
+#include "osdbase.h"
+#include "spu.h"
+
+typedef struct sDvbSpuPalDescr {
+    uint8_t index;
+    uint8_t trans;
+
+    bool operator != (const sDvbSpuPalDescr pd) const {
+        return index != pd.index && trans != pd.trans;
+    };
+} aDvbSpuPalDescr[4];
+
+typedef struct sDvbSpuRect {
+    int x1, y1;
+    int x2, y2;
+
+    int width() {
+        return x2 - x1 + 1;
+    };
+    int height() {
+        return y2 - y1 + 1;
+    };
+
+    bool operator != (const sDvbSpuRect r) const {
+        return r.x1 != x1 || r.y1 != y1 || r.x2 != x2 || r.y2 != y2;
+    };
+}
+
+sDvbSpuRect;
+
+// --- cDvbSpuPalette----------------------------------
+
+class cDvbSpuPalette {
+  private:
+    uint32_t palette[16];
+
+  private:
+    uint32_t yuv2rgb(uint32_t yuv_color);
+
+  public:
+    void setPalette(const uint32_t * pal);
+    uint32_t getColor(uint8_t idx, uint8_t trans) const;
+};
+
+// --- cDvbSpuBitmap----------------------------------
+
+class cDvbSpuBitmap {
+
+  public:
+  private:
+    sDvbSpuRect bmpsize;
+    sDvbSpuRect minsize[4];
+    uint8_t *bmp;
+
+  private:
+    void putPixel(int xp, int yp, int len, uint8_t colorid);
+    void putFieldData(int field, uint8_t * data, uint8_t * endp);
+
+  public:
+     cDvbSpuBitmap(sDvbSpuRect size,
+                   uint8_t * fodd, uint8_t * eodd,
+                   uint8_t * feven, uint8_t * eeven);
+    ~cDvbSpuBitmap();
+
+    bool getMinSize(const aDvbSpuPalDescr paldescr,
+                    sDvbSpuRect & size) const;
+    cBitmap *getBitmap(const aDvbSpuPalDescr paldescr,
+                       const cDvbSpuPalette & pal,
+                       sDvbSpuRect & size) const;
+};
+
+// --- cDvbSpuDecoder------------------------------------
+
+class cDvbSpuDecoder:public cSpuDecoder {
+  private:
+    cOsdBase * osd;
+
+    // processing state
+    uint8_t *spu;
+    bool clean;
+    bool ready;
+
+    enum spFlag { spNONE, spHIDE, spSHOW, spMENU };
+    spFlag state;
+
+     cSpuDecoder::eScaleMode scaleMode;
+
+    //highligh area
+    bool highlight;
+    sDvbSpuRect hlpsize;
+    aDvbSpuPalDescr hlpDescr;
+
+    //palette
+    cDvbSpuPalette palette;
+
+    // spu info's
+    sDvbSpuRect size;
+    aDvbSpuPalDescr palDescr;
+
+    uint16_t DCSQ_offset;
+    uint16_t prev_DCSQ_offset;
+
+    cDvbSpuBitmap *spubmp;
+  private:
+    int cmdOffs(void) {
+        return ((spu[2] << 8) | spu[3]);
+    };
+    int spuSize(void) {
+        return ((spu[0] << 8) | spu[1]);
+    };
+
+    int ScaleYcoord(int value);
+    int ScaleYres(int value);
+    void DrawBmp(sDvbSpuRect & size, cBitmap * bmp);
+
+    void Draw();
+    void Hide();
+
+  public:
+    cDvbSpuDecoder();
+    ~cDvbSpuDecoder();
+
+    int setTime(uint32_t pts);
+
+    void setScaleMode(cSpuDecoder::eScaleMode ScaleMode);
+    void setPalette(uint32_t * pal);
+    void setHighlight(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey,
+                      uint32_t palette);
+    void clearHighlight(void);
+    void Empty(void);
+    void processSPU(uint32_t pts, uint8_t * buf);
+};
+
+// --- cDvbSpuPalette -------------------------------------------
+
+inline uint32_t cDvbSpuPalette::yuv2rgb(uint32_t yuv_color)
+{
+    int Y, Cb, Cr;
+    int Ey, Epb, Epr;
+    int Eg, Eb, Er;
+    uint32_t result;
+
+    Y = (yuv_color >> 16) & 0xff;
+    Cb = (yuv_color) & 0xff;
+    Cr = (yuv_color >> 8) & 0xff;
+
+    Ey = (Y - 16);
+    Epb = (Cb - 128);
+    Epr = (Cr - 128);
+    /* ITU-R 709
+       Eg = (298*Ey - 55*Epb - 137*Epr)/256;
+       Eb = (298*Ey + 543*Epb)/256;
+       Er = (298*Ey + 460*Epr)/256;
+     */
+    /* FCC ~= mediaLib */
+    Eg = (298 * Ey - 100 * Epb - 208 * Epr) / 256;
+    Eb = (298 * Ey + 516 * Epb) / 256;
+    Er = (298 * Ey + 408 * Epr) / 256;
+
+    if (Eg > 255)
+        Eg = 255;
+    if (Eg < 0)
+        Eg = 0;
+
+    if (Eb > 255)
+        Eb = 255;
+    if (Eb < 0)
+        Eb = 0;
+
+    if (Er > 255)
+        Er = 255;
+    if (Er < 0)
+        Er = 0;
+
+    result = (Eb << 16) | (Eg << 8) | Er;
+
+    return result;
+}
+
+inline uint32_t cDvbSpuPalette::getColor(uint8_t idx, uint8_t trans) const
+{
+    uint8_t t = trans == 0x0f ? 0xff : trans << 4;
+    return palette[idx] | (t << 24);
+}
+
+#endif                          // __DVBSPU_H