Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
bitstream
Commits
86e286ae
Commit
86e286ae
authored
Oct 07, 2011
by
Georgi Chorbadzhiyski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dvb/si: Add support for descriptor 0x50 (Component descriptor).
parent
10d1a83c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
174 additions
and
2 deletions
+174
-2
README
README
+1
-0
TODO
TODO
+0
-1
dvb/si/desc_50.h
dvb/si/desc_50.h
+157
-0
dvb/si/descs_list.h
dvb/si/descs_list.h
+1
-0
examples/dvb_gen_si.c
examples/dvb_gen_si.c
+14
-1
mpeg/psi/descs_print.h
mpeg/psi/descs_print.h
+1
-0
No files found.
README
View file @
86e286ae
...
...
@@ -113,6 +113,7 @@ Supported DVB descriptors
* Descriptor 0x4d: Short event descriptor
* Descriptor 0x4e: Extended event descriptor
* Descriptor 0x4f: Time shifted event descriptor
* Descriptor 0x50: Component descriptor
* Descriptor 0x52: Stream identifier descriptor
* Descriptor 0x54: Content descriptor
* Descriptor 0x55: Parental rating descriptor
...
...
TODO
View file @
86e286ae
...
...
@@ -14,7 +14,6 @@ so if you like something just do it and send a patch.
- Descriptor 0x6a: AC-3 descriptor
- Add support (parser, generator, example) for these DVB descriptors:
- Descriptor 0x50: component_descriptor
- Descriptor 0x51: mosaic_descriptor
- Descriptor 0x53: CA_identifier_descriptor
- Descriptor 0x57: telephone_descriptor
...
...
dvb/si/desc_50.h
0 → 100644
View file @
86e286ae
/*****************************************************************************
* desc_50.h: ETSI EN 300 468 Descriptor 0x50: Component descriptor
*****************************************************************************
* Copyright (C) 2011 Unix Solutions Ltd.
*
* Authors: Georgi Chorbadzhiyski <georgi@unixsol.org>
*
* 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:
* - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
*/
#ifndef __BITSTREAM_DVB_DESC_50_H__
#define __BITSTREAM_DVB_DESC_50_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#include <bitstream/dvb/si/strings.h>
#ifdef __cplusplus
extern
"C"
{
#endif
/*****************************************************************************
* Descriptor 0x50: Component descriptor
*****************************************************************************/
#define DESC50_HEADER_SIZE (DESC_HEADER_SIZE + 6)
static
inline
void
desc50_init
(
uint8_t
*
p_desc
)
{
desc_set_tag
(
p_desc
,
0x50
);
p_desc
[
2
]
=
0xf0
;
desc_set_length
(
p_desc
,
DESC50_HEADER_SIZE
-
DESC_HEADER_SIZE
);
}
static
inline
uint8_t
desc50_get_stream_content
(
const
uint8_t
*
p_desc
)
{
return
p_desc
[
2
]
&
0x0f
;
}
static
inline
void
desc50_set_stream_content
(
uint8_t
*
p_desc
,
uint8_t
i_stream_content
)
{
p_desc
[
2
]
=
0xf0
|
(
i_stream_content
&
0x0f
);
}
static
inline
uint8_t
desc50_get_component_type
(
const
uint8_t
*
p_desc
)
{
return
p_desc
[
3
];
}
static
inline
void
desc50_set_component_type
(
uint8_t
*
p_desc
,
uint8_t
i_component_type
)
{
p_desc
[
3
]
=
i_component_type
;
}
static
inline
uint8_t
desc50_get_component_tag
(
const
uint8_t
*
p_desc
)
{
return
p_desc
[
4
];
}
static
inline
void
desc50_set_component_tag
(
uint8_t
*
p_desc
,
uint8_t
i_component_tag
)
{
p_desc
[
4
]
=
i_component_tag
;
}
static
inline
void
desc50_set_language
(
uint8_t
*
p_desc
,
const
uint8_t
p_language
[
3
])
{
p_desc
[
5
]
=
p_language
[
0
];
p_desc
[
6
]
=
p_language
[
1
];
p_desc
[
7
]
=
p_language
[
2
];
}
static
inline
const
uint8_t
*
desc50_get_language
(
const
uint8_t
*
p_desc
)
{
return
p_desc
+
5
;
}
static
inline
const
uint8_t
*
desc50_get_text
(
const
uint8_t
*
p_desc
,
uint8_t
*
pi_length
)
{
*
pi_length
=
desc_get_length
(
p_desc
)
-
(
DESC50_HEADER_SIZE
-
DESC_HEADER_SIZE
);
return
p_desc
+
DESC50_HEADER_SIZE
;
}
static
inline
void
desc50_set_text
(
uint8_t
*
p_desc
,
const
uint8_t
*
p_text
,
uint8_t
i_length
)
{
desc_set_length
(
p_desc
,
DESC50_HEADER_SIZE
-
DESC_HEADER_SIZE
+
i_length
);
memcpy
(
p_desc
+
DESC50_HEADER_SIZE
,
p_text
,
i_length
);
}
static
inline
bool
desc50_validate
(
const
uint8_t
*
p_desc
)
{
return
desc_get_length
(
p_desc
)
>=
DESC50_HEADER_SIZE
-
DESC_HEADER_SIZE
;
}
static
inline
void
desc50_print
(
const
uint8_t
*
p_desc
,
f_print
pf_print
,
void
*
print_opaque
,
f_iconv
pf_iconv
,
void
*
iconv_opaque
,
print_type_t
i_print_type
)
{
uint8_t
i_text_len
;
const
uint8_t
*
p_text
=
desc50_get_text
(
p_desc
,
&
i_text_len
);
char
*
psz_text
=
dvb_string_get
(
p_text
,
i_text_len
,
pf_iconv
,
iconv_opaque
);
switch
(
i_print_type
)
{
case
PRINT_XML
:
psz_text
=
dvb_string_xml_escape
(
psz_text
);
pf_print
(
print_opaque
,
"<COMPONENT_DESC stream_content=
\"
0x%02x
\"
component_type=
\"
0x%02x
\"
"
" component_tag=
\"
%u
\"
language=
\"
%3.3s
\"
text=
\"
%s
\"
/>"
,
desc50_get_stream_content
(
p_desc
),
desc50_get_component_type
(
p_desc
),
desc50_get_component_tag
(
p_desc
),
(
char
*
)
desc50_get_language
(
p_desc
),
psz_text
);
break
;
default:
pf_print
(
print_opaque
,
" - desc 50 component stream_content=0x%02x component_type=0x%02x"
" component_tag=%u language=%3.3s text=
\"
%s
\"
/>"
,
desc50_get_stream_content
(
p_desc
),
desc50_get_component_type
(
p_desc
),
desc50_get_component_tag
(
p_desc
),
(
char
*
)
desc50_get_language
(
p_desc
),
psz_text
);
}
free
(
psz_text
);
}
#ifdef __cplusplus
}
#endif
#endif
dvb/si/descs_list.h
View file @
86e286ae
...
...
@@ -50,6 +50,7 @@
#include <bitstream/dvb/si/desc_4d.h>
#include <bitstream/dvb/si/desc_4e.h>
#include <bitstream/dvb/si/desc_4f.h>
#include <bitstream/dvb/si/desc_50.h>
#include <bitstream/dvb/si/desc_52.h>
#include <bitstream/dvb/si/desc_54.h>
#include <bitstream/dvb/si/desc_55.h>
...
...
examples/dvb_gen_si.c
View file @
86e286ae
...
...
@@ -632,7 +632,17 @@ static void build_desc4f(uint8_t *desc) {
desc4f_set_reference_event_id
(
desc
,
event_id
+
2000
);
}
/* --- Descriptor 0x50: component_descriptor */
/* DVB Descriptor 0x50: Component descriptor */
static
void
build_desc50
(
uint8_t
*
desc
)
{
char
*
text
=
"Stereo"
;
desc50_init
(
desc
);
desc50_set_stream_content
(
desc
,
0x02
);
desc50_set_component_type
(
desc
,
0x03
);
desc50_set_component_tag
(
desc
,
46
);
desc50_set_language
(
desc
,
(
uint8_t
*
)
"eng"
);
desc50_set_text
(
desc
,
(
uint8_t
*
)
text
,
strlen
(
text
));
// Not required
}
/* --- Descriptor 0x51: mosaic_descriptor */
/* DVB Descriptor 0x52: Stream identifier descriptor */
static
void
build_desc52
(
uint8_t
*
desc
)
{
...
...
@@ -1792,6 +1802,9 @@ static void generate_pmt(void) {
desc
=
descs_get_desc
(
desc_loop
,
desc_counter
++
);
build_desc1c
(
desc
);
desc
=
descs_get_desc
(
desc_loop
,
desc_counter
++
);
build_desc50
(
desc
);
// Finish descriptor generation
desc
=
descs_get_desc
(
desc_loop
,
desc_counter
);
// Get next descriptor pos
descs_set_length
(
desc_loop
,
desc
-
desc_loop
-
DESCS_HEADER_SIZE
);
...
...
mpeg/psi/descs_print.h
View file @
86e286ae
...
...
@@ -145,6 +145,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC_ICONV
(
4
d
)
CASE_DESC_ICONV
(
4
e
)
CASE_DESC
(
4
f
)
CASE_DESC_ICONV
(
50
)
CASE_DESC
(
52
)
CASE_DESC
(
54
)
CASE_DESC
(
55
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment