From dd7ee34c8c2512256675907e4fb17efcda47c13c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 1 Jun 2013 17:05:23 +0200 Subject: [PATCH] cDemux: fix error reporting vor video, audio, ... channels --- azbox/dmx.cpp | 6 +++--- generic-pc/dmx.cpp | 6 +++--- libspark/dmx.cpp | 6 +++--- libtriple/dmx_td.cpp | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/azbox/dmx.cpp b/azbox/dmx.cpp index 1fe5561..a68327c 100644 --- a/azbox/dmx.cpp +++ b/azbox/dmx.cpp @@ -43,10 +43,10 @@ extern cVideo *videoDecoder; #define dmx_err(_errfmt, _errstr, _revents) do { \ uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\ - if (dmx_type == DMX_PES_CHANNEL) { \ - _pid = p_flt.pid; \ - } else if (dmx_type == DMX_PSI_CHANNEL) { \ + if (dmx_type == DMX_PSI_CHANNEL) { \ _pid = s_flt.pid; _f = s_flt.filter.filter[0]; \ + } else { \ + _pid = p_flt.pid; \ }; \ lt_info("%s " _errfmt " fd:%d, ev:0x%x %s pid:0x%04hx flt:0x%02hx\n", \ __func__, _errstr, fd, _revents, DMX_T[dmx_type], _pid, _f); \ diff --git a/generic-pc/dmx.cpp b/generic-pc/dmx.cpp index 19d8fc4..715e6cd 100644 --- a/generic-pc/dmx.cpp +++ b/generic-pc/dmx.cpp @@ -41,10 +41,10 @@ #define dmx_err(_errfmt, _errstr, _revents) do { \ uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\ - if (dmx_type == DMX_PES_CHANNEL) { \ - _pid = p_flt.pid; \ - } else if (dmx_type == DMX_PSI_CHANNEL) { \ + if (dmx_type == DMX_PSI_CHANNEL) { \ _pid = s_flt.pid; _f = s_flt.filter.filter[0]; \ + } else { \ + _pid = p_flt.pid; \ }; \ lt_info("%s " _errfmt " fd:%d, ev:0x%x %s pid:0x%04hx flt:0x%02hx\n", \ __func__, _errstr, fd, _revents, DMX_T[dmx_type], _pid, _f); \ diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp index ab55271..da9780d 100644 --- a/libspark/dmx.cpp +++ b/libspark/dmx.cpp @@ -78,10 +78,10 @@ extern cVideo *videoDecoder; #define dmx_err(_errfmt, _errstr, _revents) do { \ uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\ - if (dmx_type == DMX_PES_CHANNEL) { \ - _pid = p_flt.pid; \ - } else if (dmx_type == DMX_PSI_CHANNEL) { \ + if (dmx_type == DMX_PSI_CHANNEL) { \ _pid = s_flt.pid; _f = s_flt.filter.filter[0]; \ + } else { \ + _pid = p_flt.pid; \ }; \ lt_info("%s " _errfmt " fd:%d, ev:0x%x %s pid:0x%04hx flt:0x%02hx\n", \ __func__, _errstr, fd, _revents, DMX_T[dmx_type], _pid, _f); \ diff --git a/libtriple/dmx_td.cpp b/libtriple/dmx_td.cpp index 7ae9ffe..92242d3 100644 --- a/libtriple/dmx_td.cpp +++ b/libtriple/dmx_td.cpp @@ -40,10 +40,10 @@ extern cVideo *videoDecoder; #define dmx_err(_errfmt, _errstr, _revents) do { \ uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\ - if (dmx_type == DMX_PES_CHANNEL) { \ - _pid = p_flt.pid; \ - } else if (dmx_type == DMX_PSI_CHANNEL) { \ + if (dmx_type == DMX_PSI_CHANNEL) { \ _pid = s_flt.pid; _f = s_flt.filter[0]; \ + } else { \ + _pid = p_flt.pid; \ }; \ lt_info("%s " _errfmt " fd:%d, ev:0x%x %s pid:0x%04hx flt:0x%02hx\n", \ __func__, _errstr, fd, _revents, DMX_T[dmx_type], _pid, _f); \