diff --git a/dvb/si/rst.h b/dvb/si/rst.h index 1329319..113c54b 100644 --- a/dvb/si/rst.h +++ b/dvb/si/rst.h @@ -4,6 +4,7 @@ * Copyright (C) 2010 VideoLAN * * Authors: Christophe Massiot + * Georgi Chorbadzhiyski * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -47,9 +48,96 @@ extern "C" #define RST_PID 0x13 #define RST_TABLE_ID 0x71 #define RST_HEADER_SIZE PSI_HEADER_SIZE -#define RST_EVENT_SIZE 9 +#define RST_STATUS_SIZE 9 -/* TODO: unfinished support */ +static inline void rst_init(uint8_t *p_rst) +{ + psi_set_tableid(p_rst, RST_TABLE_ID); + psi_init(p_rst, false); +} + +static inline void rst_set_length(uint8_t *p_rst, uint16_t i_rst_length) +{ + psi_set_length(p_rst, i_rst_length & 0x3fff); +} + +static inline void rstn_init(uint8_t *p_rst_n) +{ + p_rst_n[8] = 0xf8; +} + +static inline uint16_t rstn_get_tsid(const uint8_t *p_rst_n) +{ + return (p_rst_n[0] << 8) | p_rst_n[1]; +} + +static inline void rstn_set_tsid(uint8_t *p_rst_n, uint16_t i_tsid) +{ + p_rst_n[0] = i_tsid >> 8; + p_rst_n[1] = i_tsid & 0xff; +} + +static inline uint16_t rstn_get_onid(const uint8_t *p_rst_n) +{ + return (p_rst_n[2] << 8) | p_rst_n[3]; +} + +static inline void rstn_set_onid(uint8_t *p_rst_n, uint16_t i_onid) +{ + p_rst_n[2] = i_onid >> 8; + p_rst_n[3] = i_onid & 0xff; +} + +static inline uint16_t rstn_get_service_id(const uint8_t *p_rst_n) +{ + return (p_rst_n[4] << 8) | p_rst_n[5]; +} + +static inline void rstn_set_service_id(uint8_t *p_rst_n, uint16_t i_service_id) +{ + p_rst_n[4] = i_service_id >> 8; + p_rst_n[5] = i_service_id & 0xff; +} + +static inline uint16_t rstn_get_event_id(const uint8_t *p_rst_n) +{ + return (p_rst_n[6] << 8) | p_rst_n[7]; +} + +static inline void rstn_set_event_id(uint8_t *p_rst_n, uint16_t i_event_id) +{ + p_rst_n[6] = i_event_id >> 8; + p_rst_n[7] = i_event_id & 0xff; +} + +static inline uint8_t rstn_get_running_status(const uint8_t *p_rst_n) +{ + return p_rst_n[8] & 0x07; +} + +static inline void rstn_set_running_status(uint8_t *p_rst_n, uint8_t i_running_status) +{ + p_rst_n[8] = 0xf8 | (i_running_status & 0x07); +} + +static inline uint8_t *rst_get_status(uint8_t *p_rst, uint8_t n) +{ + uint8_t *p_rst_n = p_rst + RST_HEADER_SIZE + n * RST_STATUS_SIZE; + if (p_rst_n + RST_STATUS_SIZE - p_rst + > psi_get_length(p_rst) + PSI_HEADER_SIZE) + return NULL; + return p_rst_n; +} + +static inline bool rst_validate(const uint8_t *p_rst) +{ + if (psi_get_syntax(p_rst) || psi_get_tableid(p_rst) != RST_TABLE_ID) + return false; + if (psi_get_length(p_rst) % RST_STATUS_SIZE) + return false; + + return true; +} #ifdef __cplusplus } diff --git a/dvb/si/rst_print.h b/dvb/si/rst_print.h new file mode 100644 index 0000000..0d859f4 --- /dev/null +++ b/dvb/si/rst_print.h @@ -0,0 +1,97 @@ +/***************************************************************************** + * rst_print.h: ETSI EN 300 468 Running Status Table (RST) (printing) + ***************************************************************************** + * Copyright (C) 2011 Unix Solutions Ltd. + * + * Authors: Georgi Chorbadzhiyski + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + *****************************************************************************/ + +#ifndef __BITSTREAM_DVB_RST_PRINT_H__ +#define __BITSTREAM_DVB_RST_PRINT_H__ + +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * Running Status Table + *****************************************************************************/ +static inline void rst_print(uint8_t *p_rst, + f_print pf_print, void *print_opaque, + f_iconv pf_iconv, void *iconv_opaque, + print_type_t i_print_type) +{ + uint8_t j = 0; + uint8_t *p_rst_n; + + switch (i_print_type) { + case PRINT_XML: + pf_print(print_opaque, ""); + break; + default: + pf_print(print_opaque, "new RST"); + } + + while ((p_rst_n = rst_get_status(p_rst, j++)) != NULL) { + switch (i_print_type) { + case PRINT_XML: + pf_print(print_opaque, + "", + rstn_get_tsid(p_rst_n), + rstn_get_onid(p_rst_n), + rstn_get_service_id(p_rst_n), + rstn_get_event_id(p_rst_n), + rstn_get_running_status(p_rst_n) + ); + break; + default: + pf_print(print_opaque, + " * status tsid=\"%hu\" onid=\"%hu\" service_id=\"%hu\"" + " event_id=\"%hu\" running_status=\"%hu\"", + rstn_get_tsid(p_rst_n), + rstn_get_onid(p_rst_n), + rstn_get_service_id(p_rst_n), + rstn_get_event_id(p_rst_n), + rstn_get_running_status(p_rst_n) + ); + } + } + + switch (i_print_type) { + case PRINT_XML: + pf_print(print_opaque, ""); + break; + default: + pf_print(print_opaque, "end RST"); + } +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/dvb/si_print.h b/dvb/si_print.h index 47948b1..4edf3ac 100644 --- a/dvb/si_print.h +++ b/dvb/si_print.h @@ -35,5 +35,6 @@ #include #include #include +#include #endif diff --git a/examples/dvb_print_si.c b/examples/dvb_print_si.c index 610aa82..1a485f9 100644 --- a/examples/dvb_print_si.c +++ b/examples/dvb_print_si.c @@ -651,6 +651,29 @@ static void handle_tot_section(uint16_t i_pid, uint8_t *p_tot) free(p_tot); } +/***************************************************************************** + * handle_rst + *****************************************************************************/ +static void handle_rst_section(uint16_t i_pid, uint8_t *p_rst) +{ + if (i_pid != RST_PID || !rst_validate(p_rst)) { + switch (i_print_type) { + case PRINT_XML: + printf("\n", + i_pid); + break; + default: + printf("invalid RST section received on PID %hu\n", i_pid); + } + free(p_rst); + return; + } + + rst_print(p_rst, print_wrapper, NULL, iconv_wrapper, NULL, i_print_type); + + free(p_rst); +} + /***************************************************************************** * handle_section *****************************************************************************/ @@ -703,6 +726,10 @@ static void handle_section(uint16_t i_pid, uint8_t *p_section) handle_tot_section(i_pid, p_section); break; + case RST_TABLE_ID: + handle_rst_section(i_pid, p_section); + break; + default: if (i_table_id == EIT_TABLE_ID_PF_ACTUAL || (i_table_id >= EIT_TABLE_ID_SCHED_ACTUAL_FIRST && @@ -803,6 +830,7 @@ int main(int i_argc, char **ppsz_argv) p_pids[SDT_PID].i_psi_refcount++; p_pids[EIT_PID].i_psi_refcount++; p_pids[TDT_PID].i_psi_refcount++; + p_pids[RST_PID].i_psi_refcount++; switch (i_print_type) { case PRINT_XML: