Skip to content

B
bitstream
Commit effeceed authored by Christophe Massiot's avatar Christophe Massiot Committed by Georgi Chorbadzhiyski
Browse files
Options

mpeg/psi: Move PAT functions out to mpeg/psi/pat{_print}.h

parent c6f3b52c
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 174 deletions
mpeg/psi.h
View file @ effeceed
......@@ -38,6 +38,7 @@
#include <bitstream/mpeg/ts.h>
#include <bitstream/mpeg/psi/descriptors.h>
#include <bitstream/mpeg/psi/psi.h>
#include <bitstream/mpeg/psi/pat.h>
#ifdef __cplusplus
extern "C"
......@@ -190,180 +191,6 @@ static inline void desc0a_print(uint8_t *p_desc, f_print pf_print,
}
}
/*****************************************************************************
* Program Association Table
*****************************************************************************/
#define PAT_PID 0x0
#define PAT_TABLE_ID 0x0
#define PAT_HEADER_SIZE PSI_HEADER_SIZE_SYNTAX1
#define PAT_PROGRAM_SIZE 4
#define pat_set_tsid psi_set_tableidext
#define pat_get_tsid psi_get_tableidext
static inline void pat_init(uint8_t *p_pat)
{
psi_init(p_pat, true);
psi_set_tableid(p_pat, PAT_TABLE_ID);
p_pat[1] &= ~0x40;
}
static inline void pat_set_length(uint8_t *p_pat, uint16_t i_pat_length)
{
psi_set_length(p_pat, PAT_HEADER_SIZE + PSI_CRC_SIZE - PSI_HEADER_SIZE
+ i_pat_length);
}
static inline void patn_init(uint8_t *p_pat_n)
{
p_pat_n[2] = 0xe0;
}
static inline void patn_set_program(uint8_t *p_pat_n, uint16_t i_program)
{
p_pat_n[0] = i_program >> 8;
p_pat_n[1] = i_program & 0xff;
}
static inline uint16_t patn_get_program(const uint8_t *p_pat_n)
{
return (p_pat_n[0] << 8) | p_pat_n[1];
}
static inline void patn_set_pid(uint8_t *p_pat_n, uint16_t i_pid)
{
p_pat_n[2] &= ~0x1f;
p_pat_n[2] |= i_pid >> 8;
p_pat_n[3] = i_pid & 0xff;
}
static inline uint16_t patn_get_pid(const uint8_t *p_pat_n)
{
return ((p_pat_n[2] & 0x1f) << 8) | p_pat_n[3];
}
static inline uint8_t *pat_get_program(uint8_t *p_pat, uint8_t n)
{
uint8_t *p_pat_n = p_pat + PAT_HEADER_SIZE + n * PAT_PROGRAM_SIZE;
if (p_pat_n + PAT_PROGRAM_SIZE - p_pat
> psi_get_length(p_pat) + PSI_HEADER_SIZE - PSI_CRC_SIZE)
return NULL;
return p_pat_n;
}
static inline bool pat_validate(const uint8_t *p_pat)
{
if (!psi_get_syntax(p_pat) || psi_get_tableid(p_pat) != PAT_TABLE_ID)
return false;
if ((psi_get_length(p_pat) - PAT_HEADER_SIZE + PSI_HEADER_SIZE
- PSI_CRC_SIZE) % PAT_PROGRAM_SIZE)
return false;
return true;
}
static inline uint8_t *pat_table_find_program(uint8_t **pp_sections,
uint16_t i_program)
{
uint8_t i_last_section = psi_table_get_lastsection(pp_sections);
uint8_t i;
for (i = 0; i <= i_last_section; i++) {
uint8_t *p_section = psi_table_get_section(pp_sections, i);
uint8_t *p_program;
int j = 0;
while ((p_program = pat_get_program(p_section, j)) != NULL) {
j++;
if (patn_get_program(p_program) == i_program)
return p_program;
}
}
return NULL;
}
static inline bool pat_table_validate(uint8_t **pp_sections)
{
uint8_t i_last_section = psi_table_get_lastsection(pp_sections);
uint8_t i;
for (i = 0; i <= i_last_section; i++) {
uint8_t *p_section = psi_table_get_section(pp_sections, i);
uint8_t *p_program;
int j = 0;
if (!psi_check_crc(p_section))
return false;
while ((p_program = pat_get_program(p_section, j)) != NULL) {
uint8_t *p_program2 = pat_table_find_program(pp_sections,
patn_get_program(p_program));
j++;
/* check that the program number is not already in the table
* with another PID */
if (patn_get_pid(p_program) != patn_get_pid(p_program2))
return false;
}
}
return true;
}
static inline void pat_table_print(uint8_t **pp_sections, f_print pf_print,
void *opaque, print_type_t i_print_type)
{
uint8_t i_last_section = psi_table_get_lastsection(pp_sections);
uint8_t i;
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "<PAT tsid=\"%hu\" version=\"%hhu\" current_next=\"%d\">",
psi_table_get_tableidext(pp_sections),
psi_table_get_version(pp_sections),
!psi_table_get_current(pp_sections) ? 0 : 1);
break;
default:
pf_print(opaque, "new PAT tsid=%hu version=%hhu%s",
psi_table_get_tableidext(pp_sections),
psi_table_get_version(pp_sections),
!psi_table_get_current(pp_sections) ? " (next)" : "");
}
for (i = 0; i <= i_last_section; i++) {
uint8_t *p_section = psi_table_get_section(pp_sections, i);
const uint8_t *p_program;
int j = 0;
while ((p_program = pat_get_program(p_section, j)) != NULL) {
uint16_t i_program = patn_get_program(p_program);
uint16_t i_pid = patn_get_pid(p_program);
j++;
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "<PROGRAM number=\"%hu\" pid=\"%hu\"/>",
i_program, i_pid);
break;
default:
if (i_program == 0)
pf_print(opaque, " * NIT pid=%hu", i_pid);
else
pf_print(opaque, " * program number=%hu pid=%hu",
i_program, i_pid);
}
}
}
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "</PAT>");
break;
default:
pf_print(opaque, "end PAT");
}
}
/*****************************************************************************
* Conditional Access Table
*****************************************************************************/
......
mpeg/psi/pat.h 0 → 100644
View file @ effeceed
/*****************************************************************************
* pat.h: ISO/IEC 13818-1 Program Allocation Table (PAT)
*****************************************************************************
* Copyright (C) 2009-2010 VideoLAN
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*
* Normative references:
* - ISO/IEC 13818-1:2007(E) (MPEG-2 Systems)
*/
#ifndef __BITSTREAM_MPEG_PAT_H__
#define __BITSTREAM_MPEG_PAT_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/psi.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Program Association Table
*****************************************************************************/
#define PAT_PID 0x0
#define PAT_TABLE_ID 0x0
#define PAT_HEADER_SIZE PSI_HEADER_SIZE_SYNTAX1
#define PAT_PROGRAM_SIZE 4
#define pat_set_tsid psi_set_tableidext
#define pat_get_tsid psi_get_tableidext
static inline void pat_init(uint8_t *p_pat)
{
psi_init(p_pat, true);
psi_set_tableid(p_pat, PAT_TABLE_ID);
p_pat[1] &= ~0x40;
}
static inline void pat_set_length(uint8_t *p_pat, uint16_t i_pat_length)
{
psi_set_length(p_pat, PAT_HEADER_SIZE + PSI_CRC_SIZE - PSI_HEADER_SIZE
+ i_pat_length);
}
static inline void patn_init(uint8_t *p_pat_n)
{
p_pat_n[2] = 0xe0;
}
static inline void patn_set_program(uint8_t *p_pat_n, uint16_t i_program)
{
p_pat_n[0] = i_program >> 8;
p_pat_n[1] = i_program & 0xff;
}
static inline uint16_t patn_get_program(const uint8_t *p_pat_n)
{
return (p_pat_n[0] << 8) | p_pat_n[1];
}
static inline void patn_set_pid(uint8_t *p_pat_n, uint16_t i_pid)
{
p_pat_n[2] &= ~0x1f;
p_pat_n[2] |= i_pid >> 8;
p_pat_n[3] = i_pid & 0xff;
}
static inline uint16_t patn_get_pid(const uint8_t *p_pat_n)
{
return ((p_pat_n[2] & 0x1f) << 8) | p_pat_n[3];
}
static inline uint8_t *pat_get_program(uint8_t *p_pat, uint8_t n)
{
uint8_t *p_pat_n = p_pat + PAT_HEADER_SIZE + n * PAT_PROGRAM_SIZE;
if (p_pat_n + PAT_PROGRAM_SIZE - p_pat
> psi_get_length(p_pat) + PSI_HEADER_SIZE - PSI_CRC_SIZE)
return NULL;
return p_pat_n;
}
static inline bool pat_validate(const uint8_t *p_pat)
{
if (!psi_get_syntax(p_pat) || psi_get_tableid(p_pat) != PAT_TABLE_ID)
return false;
if ((psi_get_length(p_pat) - PAT_HEADER_SIZE + PSI_HEADER_SIZE
- PSI_CRC_SIZE) % PAT_PROGRAM_SIZE)
return false;
return true;
}
static inline uint8_t *pat_table_find_program(uint8_t **pp_sections,
uint16_t i_program)
{
uint8_t i_last_section = psi_table_get_lastsection(pp_sections);
uint8_t i;
for (i = 0; i <= i_last_section; i++) {
uint8_t *p_section = psi_table_get_section(pp_sections, i);
uint8_t *p_program;
int j = 0;
while ((p_program = pat_get_program(p_section, j)) != NULL) {
j++;
if (patn_get_program(p_program) == i_program)
return p_program;
}
}
return NULL;
}
static inline bool pat_table_validate(uint8_t **pp_sections)
{
uint8_t i_last_section = psi_table_get_lastsection(pp_sections);
uint8_t i;
for (i = 0; i <= i_last_section; i++) {
uint8_t *p_section = psi_table_get_section(pp_sections, i);
uint8_t *p_program;
int j = 0;
if (!psi_check_crc(p_section))
return false;
while ((p_program = pat_get_program(p_section, j)) != NULL) {
uint8_t *p_program2 = pat_table_find_program(pp_sections,
patn_get_program(p_program));
j++;
/* check that the program number is not already in the table
* with another PID */
if (patn_get_pid(p_program) != patn_get_pid(p_program2))
return false;
}
}
return true;
}
#ifdef __cplusplus
}
#endif
#endif
mpeg/psi/pat_print.h 0 → 100644
View file @ effeceed
/*****************************************************************************
* pat_print.h: ISO/IEC 13818-1 Program Allocation Table (PAT) (printing)
*****************************************************************************
* Copyright (C) 2009-2010 VideoLAN
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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_MPEG_PAT_PRINT_H__
#define __BITSTREAM_MPEG_PAT_PRINT_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/psi.h>
#include <bitstream/mpeg/psi/pat.h>
#ifdef __cplusplus
extern "C"
{
#endif
/*****************************************************************************
* Program Association Table
*****************************************************************************/
static inline void pat_table_print(uint8_t **pp_sections, f_print pf_print,
void *opaque, print_type_t i_print_type)
{
uint8_t i_last_section = psi_table_get_lastsection(pp_sections);
uint8_t i;
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "<PAT tsid=\"%hu\" version=\"%hhu\" current_next=\"%d\">",
psi_table_get_tableidext(pp_sections),
psi_table_get_version(pp_sections),
!psi_table_get_current(pp_sections) ? 0 : 1);
break;
default:
pf_print(opaque, "new PAT tsid=%hu version=%hhu%s",
psi_table_get_tableidext(pp_sections),
psi_table_get_version(pp_sections),
!psi_table_get_current(pp_sections) ? " (next)" : "");
}
for (i = 0; i <= i_last_section; i++) {
uint8_t *p_section = psi_table_get_section(pp_sections, i);
const uint8_t *p_program;
int j = 0;
while ((p_program = pat_get_program(p_section, j)) != NULL) {
uint16_t i_program = patn_get_program(p_program);
uint16_t i_pid = patn_get_pid(p_program);
j++;
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "<PROGRAM number=\"%hu\" pid=\"%hu\"/>",
i_program, i_pid);
break;
default:
if (i_program == 0)
pf_print(opaque, " * NIT pid=%hu", i_pid);
else
pf_print(opaque, " * program number=%hu pid=%hu",
i_program, i_pid);
}
}
}
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque, "</PAT>");
break;
default:
pf_print(opaque, "end PAT");
}
}
#ifdef __cplusplus
}
#endif
#endif
mpeg/psi_print.h
View file @ effeceed
......@@ -35,6 +35,7 @@
#include <bitstream/common.h>
#include <bitstream/mpeg/psi.h>
#include <bitstream/mpeg/psi/pat_print.h>
/* here you must manually include <bitstream/dvb/si.h> or the ATSC equivalent
* if/when it is available */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment