frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

- fixed output format of some debug messages (thanks to Rolf Ahrenberg)

Browse Source
This commit is contained in:
schmirl 2008-10-22 11:17:43 +00:00
parent 86c82c1381
commit 4a5af4f489
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -26,6 +26,7 @@ Rolf Ahrenberg
for making it possible to pass parameters to externremux.sh for making it possible to pass parameters to externremux.sh
for removing pre VDR 1.4 legacy code for removing pre VDR 1.4 legacy code
for adding gettext support for adding gettext support
for fixing output format of some debug messages
Rantanen Teemu Rantanen Teemu
for providing vdr-incompletesections.diff for providing vdr-incompletesections.diff

1
HISTORY
View File

@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History VDR Plugin 'streamdev' Revision History
--------------------------------------- ---------------------------------------
- fixed output format of some debug messages (thanks to Rolf Ahrenberg)
- added HTTP authentication - added HTTP authentication
- compatibility for VDR 1.7.1 (thanks to Udo Richter) - compatibility for VDR 1.7.1 (thanks to Udo Richter)
- added vdr-1.6.0-intcamdevices.patch (thanks to Anssi Hannula) - added vdr-1.6.0-intcamdevices.patch (thanks to Anssi Hannula)

18
server/livestreamer.c
View File

@ -77,7 +77,7 @@ public:
cStreamdevPatFilter::cStreamdevPatFilter(cStreamdevLiveStreamer *Streamer, const cChannel *Channel) cStreamdevPatFilter::cStreamdevPatFilter(cStreamdevLiveStreamer *Streamer, const cChannel *Channel)
{ {
Dprintf("cStreamdevPatFilter(\"%s\")", Channel->Name()); Dprintf("cStreamdevPatFilter(\"%s\")\n", Channel->Name());
assert(Streamer); assert(Streamer);
m_Channel = Channel; m_Channel = Channel;
m_Streamer = Streamer; m_Streamer = Streamer;
@ -136,7 +136,7 @@ int cStreamdevPatFilter::GetPid(SI::PMT::Stream& stream)
case 0x10: // ISO/IEC 14496-2 Visual (MPEG-4) case 0x10: // ISO/IEC 14496-2 Visual (MPEG-4)
case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
case 0x1b: // ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264) case 0x1b: // ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264)
Dprintf("cStreamdevPatFilter PMT scanner adding PID %d (%s)", Dprintf("cStreamdevPatFilter PMT scanner adding PID %d (%s)\n",
stream.getPid(), psStreamTypes[stream.getStreamType()]); stream.getPid(), psStreamTypes[stream.getStreamType()]);
return stream.getPid(); return stream.getPid();
case 0x05: // ISO/IEC 13818-1 private sections case 0x05: // ISO/IEC 13818-1 private sections
@ -144,19 +144,19 @@ int cStreamdevPatFilter::GetPid(SI::PMT::Stream& stream)
for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) { for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) {
switch (d->getDescriptorTag()) { switch (d->getDescriptorTag()) {
case SI::AC3DescriptorTag: case SI::AC3DescriptorTag:
Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s", Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s\n",
stream.getPid(), psStreamTypes[stream.getStreamType()], "AC3"); stream.getPid(), psStreamTypes[stream.getStreamType()], "AC3");
return stream.getPid(); return stream.getPid();
case SI::TeletextDescriptorTag: case SI::TeletextDescriptorTag:
Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s", Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s\n",
stream.getPid(), psStreamTypes[stream.getStreamType()], "Teletext"); stream.getPid(), psStreamTypes[stream.getStreamType()], "Teletext");
return stream.getPid(); return stream.getPid();
case SI::SubtitlingDescriptorTag: case SI::SubtitlingDescriptorTag:
Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s", Dprintf("cStreamdevPatFilter PMT scanner: adding PID %d (%s) %s\n",
stream.getPid(), psStreamTypes[stream.getStreamType()], "DVBSUB"); stream.getPid(), psStreamTypes[stream.getStreamType()], "DVBSUB");
return stream.getPid(); return stream.getPid();
default: default:
Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s", Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s\n",
stream.getPid(), psStreamTypes[stream.getStreamType()], "UNKNOWN"); stream.getPid(), psStreamTypes[stream.getStreamType()], "UNKNOWN");
break; break;
} }
@ -201,7 +201,7 @@ int cStreamdevPatFilter::GetPid(SI::PMT::Stream& stream)
return stream.getPid(); return stream.getPid();
} }
} }
Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s", Dprintf("cStreamdevPatFilter PMT scanner: NOT adding PID %d (%s) %s\n",
stream.getPid(), psStreamTypes[stream.getStreamType()<0x1c?stream.getStreamType():0], "UNKNOWN"); stream.getPid(), psStreamTypes[stream.getStreamType()<0x1c?stream.getStreamType():0], "UNKNOWN");
break; break;
} }
@ -221,7 +221,7 @@ void cStreamdevPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, i
const cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId()); const cChannel *Channel = Channels.GetByServiceID(Source(), Transponder(), assoc.getServiceId());
if (Channel && (Channel == m_Channel)) { if (Channel && (Channel == m_Channel)) {
if (0 != (pmtPid = assoc.getPid())) { if (0 != (pmtPid = assoc.getPid())) {
Dprintf("cStreamdevPatFilter: PMT pid for channel %s: %d", Channel->Name(), pmtPid); Dprintf("cStreamdevPatFilter: PMT pid for channel %s: %d\n", Channel->Name(), pmtPid);
pmtSid = assoc.getServiceId(); pmtSid = assoc.getServiceId();
if (Length < TS_SIZE-5) { if (Length < TS_SIZE-5) {
// repack PAT to TS frame and send to client // repack PAT to TS frame and send to client
@ -286,7 +286,7 @@ void cStreamdevPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, i
return; // skip broken PMT records return; // skip broken PMT records
if (pmtVersion != -1) { if (pmtVersion != -1) {
if (pmtVersion != pmt.getVersionNumber()) { if (pmtVersion != pmt.getVersionNumber()) {
Dprintf("cStreamdevPatFilter: PMT version changed, detaching all pids"); Dprintf("cStreamdevPatFilter: PMT version changed, detaching all pids\n");
Del(pmtPid, 0x02); Del(pmtPid, 0x02);
pmtPid = 0; // this triggers PAT scan pmtPid = 0; // this triggers PAT scan
} }