frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.1.7

Browse Source 
VDR developer version 2.1.7 is now available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.7.tar.bz2

A 'diff' against the previous version is available at

       ftp://ftp.tvdr.de/vdr/Developer/vdr-2.1.6-2.1.7.diff

MD5 checksums:

1c954bad31ce74cd1cbd7987e62d2a98  vdr-2.1.7.tar.bz2
88a90327a75833b7723942d3bd25f954  vdr-2.1.6-2.1.7.diff

WARNING:
========

This is a *developer* version. Even though *I* use it in my productive
environment, I strongly recommend that you only use it under controlled
conditions and for testing and debugging.

From the HISTORY file:
- No longer logging an error message in DirSizeMB() if the given directory doesn't
  exist. This avoids lots of log entries in case several VDRs use the same video
  directory and one of them has already physically removed a recording directory,
  while the others still have it in their list of deleted recordings.
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- A cCamSlot that has WantsTsData set to true in its constructor now also gets
  the CAT and EMM PIDs data.
- Fixed a possible division by zero in frame rate detection.
- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
  to Lars Hanisch). See vdr.1 and vdr.5 for details.
- Fixed a possible crash in the LCARS skin (thanks to Thomas Reufer).
- Updated the dvbhddevice plugin source.
- Fixed a bug in the Makefile when installing plugins with LCLBLD=1 (thanks to
  Stefan Huelswitt).
- The pid of the PMT in which the CA descriptors of a given channel are broadcast
  is now stored together with the CA descriptors and can be retrieved by calling
  GetPmtPid() (this information is only required to receive encrypted channels
  with the OctopusNet receiver via the 'satip' plugin).
- Channels that are not listed in the SDT are now only marked as OBSOLETE if
  "Setup/DVB/Update channels" is set to a value other than "no" or "PIDs only".
- Fixed multiple OBSOLETE marks in channels that are not listed in the SDT in case
  "Setup/Miscellaneous/Show channel names with source" is set to "yes".
- The new function cOsd::DrawScaledBitmap() is now used for drawing subtitles.
  This function can be reimplemented by high level OSDs which may be able to do
  the scaling in hardware or otherwise more efficiently (thanks to Thomas Reufer).
- Fixed detaching receivers from devices in case a CAM needs to receive the TS
  (reported by Dietmar Spingler).
- Fixed resetting the receiver for EMM pids for CAMs that need to receive the TS
  (reported by Dietmar Spingler).
- Fixed (well, actually worked around) a problem with subtitles not being displayed
  because the broadcaster doesn't set the data's version numbers as required by the
  DVB standard (thanks to Rolf Ahrenberg).
- Fixed support for systemd (thanks to Christopher Reimer).
- Added a missing backslash to the help text of the SVDRP command MOVR (thanks to
  Lars Hanisch).
- Added subsystem id support for DVB devices connected via USB (thanks to Jose
  Alberto Reguero).
- Added the functions IndexOf(), InsertUnique(), AppendUnique() and RemoveElement()
  to the cVector class (thanks to Stefan Schallenberg).
- Fixed a possible out-of-bounds access in cVector::Remove().
- Added functions to set and retrieve the priority of a cReceiver (suggested by
  Frank Schmirler).
- Added the new parameters "Setup/Miscellaneous/Volume steps" and
  ".../Volume linearize" (thanks to Claus Muus). See the MANUAL for details.
- Fixed jumping to an absolute position via the Red key in case replay was paused
  (reported by Dieter Ferdinand).
- Changed the German weekday names from "MonDieMitDonFreSamSon" to
  "Mo.Di.Mi.Do.Fr.Sa.So." (thanks to Stefan Blochberger).
- Now handling CAT sections that consist of more than one TS packet.
- Added handling for DTS audio tracks to cPatPmtParser::ParsePmt() (thanks to
  Thomas Reufer).
- Added support for PGS subtitles (thanks to Thomas Reufer).
- Use of the function cOsd::GetBitmap() outside of derived classes is now deprecated,
  and it may be made 'protected' in a future version, since it doesn't work with
  TrueColor OSDs. Plugin authors may want to modify their code so that it
  works without this function.
- Modified the descriptions of several threads, so that the important information
  (like device or frontend numbers) is within the first 15 characters of the
  string, because only these are displayed in thread listings. Plugin authors may
  want to do the same.
- Added the channel name to log messages that reference a channel (suggested by
  Dietmar Spingler).
- Modified the CAM API so that it is possible to implement CAMs that can be freely
  assigned to any devices (thanks to Jasmin Jessich).
- Plugins can now implement the function SetMenuSortMode() in their skin objects
  derived from cSkinDisplayMenu, to get informed about the currently used sort
  mode, if applicable (suggested by Martin Schirrmacher).
- Added cOsdProvider::OsdSizeChanged(), which plugins that implement an output device
  can call to signal a change in the OSD that requires a redraw of the currently
  displayed object (thanks to Thomas Reufer).
- Added a comment to cRecorder::Activate() about the need to call Detach() in the
  destructor (suggested by Eike Sauer).
- Now returning from removing deleted recordings after at most 10 seconds, or if the
  user presses a remote control key, to keep the system from getting unresponsive
  when removing a huge number of files (reported by Dieter Ferdinand).
- Fixed generating the index file of an existing recording in case at the of a TS file
  there is less data in the buffer than needed by the frame detector. In such a case
  it was possible that frames were missed, and there was most likely a distortion
  when replaying that part of a recording. This is mostly a problem for recordings that
  consist of more than one *.ts file. Single file recordings could only lose some
  frames at their very end, which probably doesn't matter. At any rate, if you have
  generated an index file with VDR version 2.0.6, 2.1.5 or 2.1.6, you may want to
  do so again with this version to make sure the index is OK.
- Added the new command line option --updindex, which can be used to update an
  incomplete index of a recording (based on a patch from Helmut Auer).
This commit is contained in:
Klaus Schmidinger
2015-01-18 11:38:00 +01:00
committed by Dieter Hametner
parent 3e4e4454fc
commit 2db7397542
82 changed files with 1615 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
PLUGINS/src/dvbhddevice/dvbhdffdevice.c
View File

@@ -108,17 +108,12 @@ cDvbHdFfDevice::~cDvbHdFfDevice()
void cDvbHdFfDevice::MakePrimaryDevice(bool On)
{
if (On) {
new cHdffOsdProvider(mHdffCmdIf);
//TODO the same code is also used in cHdffSetupPage::Store() and cHdffMenu::SetVideoConversion() - combine?
HdffVideoFormat_t videoFormat;
videoFormat.AutomaticEnabled = true;
videoFormat.AfdEnabled = false;
videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
}
cDvbDevice::MakePrimaryDevice(On);
if (On) {
new cHdffOsdProvider(mHdffCmdIf);
gHdffSetup.SetVideoFormat(mHdffCmdIf);
}
cDvbDevice::MakePrimaryDevice(On);
}
bool cDvbHdFfDevice::HasDecoder(void) const
@@ -243,6 +238,26 @@ uchar *cDvbHdFfDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, i
return result;
}
void cDvbHdFfDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat)
{
if (gHdffSetup.TvFormat == HDFF_TV_FORMAT_4_BY_3)
{
switch (VideoDisplayFormat)
{
case vdfPanAndScan:
case vdfCenterCutOut:
gHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_CENTRE_CUT_OUT;
break;
case vdfLetterBox:
gHdffSetup.VideoConversion = HDFF_VIDEO_CONVERSION_LETTERBOX_16_BY_9;
break;
}
gHdffSetup.SetVideoFormat(mHdffCmdIf);
}
cDevice::SetVideoDisplayFormat(VideoDisplayFormat);
}
void cDvbHdFfDevice::GetVideoSize(int &Width, int &Height, double &VideoAspect)
{
if (fd_video >= 0) {
@@ -795,6 +810,11 @@ int cDvbHdFfDevice::PlayVideo(const uchar *Data, int Length)
mHdffCmdIf->CmdAvEnableSync(0, true);
isPlayingVideo = true;
}
// ignore padding PES packets
if (Data[3] == 0xBE)
return Length;
//TODO: support greater Length
uint8_t tsBuffer[188 * 16];
uint32_t tsLength;

1
PLUGINS/src/dvbhddevice/dvbhdffdevice.h
View File

@@ -51,6 +51,7 @@ public:
// Video format facilities
public:
virtual void SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat);
virtual void GetVideoSize(int &Width, int &Height, double &VideoAspect);
virtual void GetOsdSize(int &Width, int &Height, double &PixelAspect);

80
PLUGINS/src/dvbhddevice/hdffosd.c
View File

@@ -663,14 +663,23 @@ void cHdffOsdRaw::Flush(void)
{
if (!Active() || (mDisplay == HDFF_INVALID_HANDLE))
return;
//struct timeval start;
//struct timeval end;
//struct timezone timeZone;
//gettimeofday(&start, &timeZone);
#ifdef MEASURE_OSD_TIME
struct timeval start;
struct timeval end;
struct timezone timeZone;
gettimeofday(&start, &timeZone);
#endif
bool render = false;
if (IsTrueColor())
{
uint8_t * buffer = 0;
if (gHdffSetup.TrueColorFormat != 0)
{
buffer = new uint8_t[MAX_BITMAP_SIZE];
if (!buffer)
return;
}
LOCK_PIXMAPS;
while (cPixmapMemory *pm = RenderPixmaps())
{
@@ -682,17 +691,56 @@ void cHdffOsdRaw::Flush(void)
Chunk = h;
for (int y = 0; y < h; y += Chunk)
{
int hc = Chunk;
if (y + hc > h)
hc = h - y;
mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
pm->Data() + y * d, w, hc, hc * d,
HDFF_COLOR_TYPE_ARGB8888, HDFF_INVALID_HANDLE);
int hc = Chunk;
if (y + hc > h)
hc = h - y;
if (gHdffSetup.TrueColorFormat == 0) // ARGB8888 (32 bit)
{
mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
pm->Data() + y * d, w, hc, hc * d,
HDFF_COLOR_TYPE_ARGB8888, HDFF_INVALID_HANDLE);
}
else if (gHdffSetup.TrueColorFormat == 1) // ARGB8565 (24 bit)
{
const tColor * pixmapData = (const tColor *) (pm->Data() + y * d);
uint8_t * bitmapData = buffer;
for (int i = 0; i < hc * w; i++)
{
bitmapData[2] = (pixmapData[i] & 0xFF000000) >> 24;
bitmapData[1] = ((pixmapData[i] & 0x00F80000) >> 16)
| ((pixmapData[i] & 0x0000E000) >> 13);
bitmapData[0] = ((pixmapData[i] & 0x00001C00) >> 5)
| ((pixmapData[i] & 0x000000F8) >> 3);
bitmapData += 3;
}
mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
buffer, w, hc, hc * w * 3,
HDFF_COLOR_TYPE_ARGB8565, HDFF_INVALID_HANDLE);
}
else if (gHdffSetup.TrueColorFormat == 2) // ARGB4444 (16 bit)
{
const tColor * pixmapData = (const tColor *) (pm->Data() + y * d);
uint16_t * bitmapData = (uint16_t *) buffer;
for (int i = 0; i < hc * w; i++)
{
bitmapData[i] = ((pixmapData[i] & 0xF0000000) >> 16)
| ((pixmapData[i] & 0x00F00000) >> 12)
| ((pixmapData[i] & 0x0000F000) >> 8)
| ((pixmapData[i] & 0x000000F0) >> 4);
}
mHdffCmdIf->CmdOsdDrawBitmap(mDisplay,
Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y() + y,
buffer, w, hc, hc * w * 2,
HDFF_COLOR_TYPE_ARGB4444, HDFF_INVALID_HANDLE);
}
}
delete pm;
render = true;
}
if (buffer)
delete[] buffer;
}
else
{
@@ -755,10 +803,12 @@ void cHdffOsdRaw::Flush(void)
if (render)
{
mHdffCmdIf->CmdOsdRenderDisplay(mDisplay);
//gettimeofday(&end, &timeZone);
//int timeNeeded = end.tv_usec - start.tv_usec;
//timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
//printf("time = %d\n", timeNeeded);
#ifdef MEASURE_OSD_TIME
gettimeofday(&end, &timeZone);
int timeNeeded = end.tv_usec - start.tv_usec;
timeNeeded += (end.tv_sec - start.tv_sec) * 1000000;
printf("time = %d\n", timeNeeded);
#endif
}
refresh = false;
}

7
PLUGINS/src/dvbhddevice/menu.c
View File

@@ -56,12 +56,7 @@ eOSState cHdffMenu::ProcessKey(eKeys key)
void cHdffMenu::SetVideoConversion(void)
{
HdffVideoFormat_t videoFormat;
videoFormat.AutomaticEnabled = true;
videoFormat.AfdEnabled = false;
videoFormat.TvFormat = (HdffTvFormat_t) gHdffSetup.TvFormat;
videoFormat.VideoConversion = (HdffVideoConversion_t) gHdffSetup.VideoConversion;
mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
gHdffSetup.SetVideoFormat(mHdffCmdIf);
char str[128];
sprintf(str, "%s: %s", tr("Video Conversion"), gHdffSetup.GetVideoConversionString());

5
PLUGINS/src/dvbhddevice/po/de_DE.po
View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-08-23 12:10+0200\n"
"POT-Creation-Date: 2014-09-21 14:01+0200\n"
"PO-Revision-Date: 2011-04-25 21:44+0200\n"
"Last-Translator: Christoph Haubrich\n"
"Language-Team: <see README>\n"
@@ -121,5 +121,8 @@ msgstr "High Level OSD"
msgid "Allow True Color OSD"
msgstr "Erlaube True Color OSD"
msgid "True Color format"
msgstr "True Color Format"
msgid "Hide mainmenu entry"
msgstr "Hauptmenüeintrag verstecken"

5
PLUGINS/src/dvbhddevice/po/fi_FI.po
View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-08-23 12:10+0200\n"
"POT-Creation-Date: 2014-09-21 14:01+0200\n"
"PO-Revision-Date: 2011-04-25 21:44+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -121,5 +121,8 @@ msgstr "Käytä korkean tason kuvaruutunäyttöä"
msgid "Allow True Color OSD"
msgstr "Salli tosivärit kuvaruutunäytölle"
msgid "True Color format"
msgstr ""
msgid "Hide mainmenu entry"
msgstr "Piilota valinta päävalikosta"

5
PLUGINS/src/dvbhddevice/po/it_IT.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-dvbhddevice 0.0.4\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-08-23 12:10+0200\n"
"POT-Creation-Date: 2014-09-21 14:01+0200\n"
"PO-Revision-Date: 2013-09-19 00:00+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <see README>\n"
@@ -125,5 +125,8 @@ msgstr "OSD alto livello"
msgid "Allow True Color OSD"
msgstr "Permetti OSD True Color"
msgid "True Color format"
msgstr ""
msgid "Hide mainmenu entry"
msgstr "Nascondi voce menu principale"

29
PLUGINS/src/dvbhddevice/setup.c
View File

@@ -33,6 +33,7 @@ cHdffSetup::cHdffSetup(void)
RemoteAddress = -1;
HighLevelOsd = 1;
TrueColorOsd = 1;
TrueColorFormat = 0;
HideMainMenu = 0;
}
@@ -54,6 +55,7 @@ bool cHdffSetup::SetupParse(const char *Name, const char *Value)
else if (strcmp(Name, "RemoteAddress") == 0) RemoteAddress = atoi(Value);
else if (strcmp(Name, "HighLevelOsd") == 0) HighLevelOsd = atoi(Value);
else if (strcmp(Name, "TrueColorOsd") == 0) TrueColorOsd = atoi(Value);
else if (strcmp(Name, "TrueColorFormat") == 0) TrueColorFormat = atoi(Value);
else if (strcmp(Name, "HideMainMenu") == 0) HideMainMenu = atoi(Value);
else return false;
return true;
@@ -180,6 +182,16 @@ const char * cHdffSetup::GetVideoConversionString(void)
}
}
void cHdffSetup::SetVideoFormat(HDFF::cHdffCmdIf * HdffCmdIf)
{
HdffVideoFormat_t videoFormat;
videoFormat.AutomaticEnabled = true;
videoFormat.AfdEnabled = false;
videoFormat.TvFormat = (HdffTvFormat_t) TvFormat;
videoFormat.VideoConversion = (HdffVideoConversion_t) VideoConversion;
HdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
}
cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
{
@@ -190,6 +202,7 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
const int kAudioDownmixes = 5;
const int kOsdSizes = 5;
const int kRemoteProtocols = 3;
const int kTrueColorFormats = 3;
static const char * ResolutionItems[kResolutions] =
{
@@ -246,6 +259,13 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
"RC6",
};
static const char * TrueColorFormatItems[kTrueColorFormats] =
{
"ARGB8888",
"ARGB8565",
"ARGB4444",
};
mHdffCmdIf = pHdffCmdIf;
mNewHdffSetup = gHdffSetup;
@@ -265,6 +285,7 @@ cHdffSetupPage::cHdffSetupPage(HDFF::cHdffCmdIf * pHdffCmdIf)
Add(new cMenuEditIntItem(tr("Remote Control Address"), &mNewHdffSetup.RemoteAddress, -1, 31));
Add(new cMenuEditBoolItem(tr("High Level OSD"), &mNewHdffSetup.HighLevelOsd));
Add(new cMenuEditBoolItem(tr("Allow True Color OSD"), &mNewHdffSetup.TrueColorOsd));
Add(new cMenuEditStraItem(tr("True Color format"), &mNewHdffSetup.TrueColorFormat, kTrueColorFormats, TrueColorFormatItems));
Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &mNewHdffSetup.HideMainMenu));
mVideoConversion = 0;
@@ -395,6 +416,7 @@ void cHdffSetupPage::Store(void)
SetupStore("RemoteAddress", mNewHdffSetup.RemoteAddress);
SetupStore("HighLevelOsd", mNewHdffSetup.HighLevelOsd);
SetupStore("TrueColorOsd", mNewHdffSetup.TrueColorOsd);
SetupStore("TrueColorFormat", mNewHdffSetup.TrueColorFormat);
SetupStore("HideMainMenu", mNewHdffSetup.HideMainMenu);
if (mHdffCmdIf)
@@ -403,14 +425,9 @@ void cHdffSetupPage::Store(void)
{
mHdffCmdIf->CmdHdmiSetVideoMode(mNewHdffSetup.GetVideoMode());
}
HdffVideoFormat_t videoFormat;
HdffHdmiConfig_t hdmiConfig;
videoFormat.AutomaticEnabled = true;
videoFormat.AfdEnabled = false;
videoFormat.TvFormat = (HdffTvFormat_t) mNewHdffSetup.TvFormat;
videoFormat.VideoConversion = (HdffVideoConversion_t) mNewHdffSetup.VideoConversion;
mHdffCmdIf->CmdAvSetVideoFormat(0, &videoFormat);
mNewHdffSetup.SetVideoFormat(mHdffCmdIf);
mHdffCmdIf->CmdAvSetAudioDelay(mNewHdffSetup.AudioDelay);
mHdffCmdIf->CmdAvSetAudioDownmix((HdffAudioDownmixMode_t) mNewHdffSetup.AudioDownmix);

2
PLUGINS/src/dvbhddevice/setup.h
View File

@@ -18,6 +18,7 @@ struct cHdffSetup
HdffVideoMode_t GetVideoMode(void);
void SetNextVideoConversion(void);
const char * GetVideoConversionString(void);
void SetVideoFormat(HDFF::cHdffCmdIf * HdffCmdIf);
int Resolution;
int VideoModeAdaption;
@@ -36,6 +37,7 @@ struct cHdffSetup
int HighLevelOsd;
int TrueColorOsd;
int TrueColorFormat;
int HideMainMenu;
};