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
29ddb6e6
Commit
29ddb6e6
authored
Oct 04, 2011
by
Georgi Chorbadzhiyski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg/psi: Add support for descriptor 0x1e (SL descriptor).
parent
997a6323
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
99 additions
and
1 deletion
+99
-1
README
README
+1
-0
TODO
TODO
+0
-1
examples/dvb_gen_si.c
examples/dvb_gen_si.c
+9
-0
mpeg/psi/desc_1e.h
mpeg/psi/desc_1e.h
+87
-0
mpeg/psi/descs_list.h
mpeg/psi/descs_list.h
+1
-0
mpeg/psi/descs_print.h
mpeg/psi/descs_print.h
+1
-0
No files found.
README
View file @
29ddb6e6
...
...
@@ -81,6 +81,7 @@ Supported MPEG descriptors
* Descriptor 0x1b: MPEG-4 video descriptor
* Descriptor 0x1c: MPEG-4 audio descriptor
* Descriptor 0x1d: IOD_descriptor
* Descriptor 0x1e: SL_descriptor
Supported DVB descriptors
...
...
TODO
View file @
29ddb6e6
...
...
@@ -2,7 +2,6 @@ TODO items for biTStream. The items are not ordered by importance
so if you like something just do it and send a patch.
- Add support (parser, generator, example) for these MPEG descriptors:
- Descriptor 0x1e SL_descriptor
- Descriptor 0x1f FMC_descriptor
- Descriptor 0x20 external_ES_ID_descriptor
- Descriptor 0x21 MuxCode_descriptor
...
...
examples/dvb_gen_si.c
View file @
29ddb6e6
...
...
@@ -245,6 +245,12 @@ static void build_desc1d(uint8_t *desc) {
desc1d_set_iod
(
desc
,
0x45
);
}
/* MPEG Descriptor 0x1e: SL descriptor */
static
void
build_desc1e
(
uint8_t
*
desc
)
{
desc1e_init
(
desc
);
desc1e_set_es_id
(
desc
,
0x1234
);
}
/* =========================================================================
* DVB defined descriptors
* ========================================================================= */
...
...
@@ -1600,6 +1606,9 @@ static void generate_pmt(void) {
desc_loop
=
pmtn_get_descs
(
pmt_n
);
descs_set_length
(
desc_loop
,
DESCS_MAX_SIZE
);
// This is needed so descs_get_desc(x, n) works
desc
=
descs_get_desc
(
desc_loop
,
desc_counter
++
);
build_desc1e
(
desc
);
desc
=
descs_get_desc
(
desc_loop
,
desc_counter
++
);
build_desc1d
(
desc
);
...
...
mpeg/psi/desc_1e.h
0 → 100644
View file @
29ddb6e6
/*****************************************************************************
* desc_1e.h: ISO/IEC 13818-1 Descriptor 0x1e (SL 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:
* - ISO/IEC 13818-1:2007(E) (MPEG-2 Systems)
*/
#ifndef __BITSTREAM_MPEG_DESC_1e_H__
#define __BITSTREAM_MPEG_DESC_1e_H__
#include <bitstream/common.h>
#include <bitstream/mpeg/psi/descriptors.h>
#ifdef __cplusplus
extern
"C"
{
#endif
/*****************************************************************************
* Descriptor 0x1e (SL descriptor)
*****************************************************************************/
#define DESC1E_HEADER_SIZE (DESC_HEADER_SIZE + 2)
static
inline
void
desc1e_init
(
uint8_t
*
p_desc
)
{
desc_set_tag
(
p_desc
,
0x1e
);
desc_set_length
(
p_desc
,
DESC1E_HEADER_SIZE
-
DESC_HEADER_SIZE
);
}
static
inline
bool
desc1e_validate
(
const
uint8_t
*
p_desc
)
{
return
desc_get_length
(
p_desc
)
>=
DESC1E_HEADER_SIZE
-
DESC_HEADER_SIZE
;
}
static
inline
uint16_t
desc1e_get_es_id
(
const
uint8_t
*
p_desc
)
{
return
(
p_desc
[
2
]
<<
8
)
|
p_desc
[
3
];
}
static
inline
void
desc1e_set_es_id
(
uint8_t
*
p_desc
,
uint16_t
i_es_id
)
{
p_desc
[
2
]
=
(
i_es_id
>>
8
)
&
0xff
;
p_desc
[
3
]
=
i_es_id
&
0xff
;
}
static
inline
void
desc1e_print
(
const
uint8_t
*
p_desc
,
f_print
pf_print
,
void
*
opaque
,
print_type_t
i_print_type
)
{
switch
(
i_print_type
)
{
case
PRINT_XML
:
pf_print
(
opaque
,
"<SL_DESC es_id=
\"
0x%04x
\"
/>"
,
desc1e_get_es_id
(
p_desc
));
break
;
default:
pf_print
(
opaque
,
" - desc 1e sl es_id=0x%04x"
,
desc1e_get_es_id
(
p_desc
));
}
}
#ifdef __cplusplus
}
#endif
#endif
mpeg/psi/descs_list.h
View file @
29ddb6e6
...
...
@@ -54,5 +54,6 @@
#include <bitstream/mpeg/psi/desc_1b.h>
#include <bitstream/mpeg/psi/desc_1c.h>
#include <bitstream/mpeg/psi/desc_1d.h>
#include <bitstream/mpeg/psi/desc_1e.h>
#endif
mpeg/psi/descs_print.h
View file @
29ddb6e6
...
...
@@ -120,6 +120,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
CASE_DESC
(
1
b
)
CASE_DESC
(
1
c
)
CASE_DESC
(
1
d
)
CASE_DESC
(
1
e
)
CASE_DESC_ICONV
(
40
)
CASE_DESC
(
41
)
CASE_DESC
(
43
)
...
...
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