Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
323d078c
Commit
323d078c
authored
Feb 11, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packetizers: do not rename variable
Use the same name than PacketizeParse
parent
bd190a99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
modules/packetizer/h264.c
modules/packetizer/h264.c
+4
-4
modules/packetizer/vc1.c
modules/packetizer/vc1.c
+4
-4
No files found.
modules/packetizer/h264.c
View file @
323d078c
...
...
@@ -165,7 +165,7 @@ static void PacketizeReset( void *p_private, bool b_broken );
static
block_t
*
PacketizeParse
(
void
*
p_private
,
bool
*
pb_ts_used
,
block_t
*
);
static
int
PacketizeValidate
(
void
*
p_private
,
block_t
*
);
static
block_t
*
ParseNALBlock
(
decoder_t
*
,
bool
*
pb_
used_ts
,
block_t
*
);
static
block_t
*
ParseNALBlock
(
decoder_t
*
,
bool
*
pb_
ts_used
,
block_t
*
);
static
block_t
*
CreateAnnexbNAL
(
decoder_t
*
,
const
uint8_t
*
p
,
int
);
static
block_t
*
OutputPicture
(
decoder_t
*
p_dec
);
...
...
@@ -603,7 +603,7 @@ static inline int bs_read_se( bs_t *s )
* ParseNALBlock: parses annexB type NALs
* All p_frag blocks are required to start with 0 0 0 1 4-byte startcode
*****************************************************************************/
static
block_t
*
ParseNALBlock
(
decoder_t
*
p_dec
,
bool
*
pb_
used_ts
,
block_t
*
p_frag
)
static
block_t
*
ParseNALBlock
(
decoder_t
*
p_dec
,
bool
*
pb_
ts_used
,
block_t
*
p_frag
)
{
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
block_t
*
p_pic
=
NULL
;
...
...
@@ -700,13 +700,13 @@ static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_used_ts, block_t *p_fr
if
(
p_frag
)
block_ChainAppend
(
&
p_sys
->
p_frame
,
p_frag
);
*
pb_
used_ts
=
false
;
*
pb_
ts_used
=
false
;
if
(
p_sys
->
i_frame_dts
<=
VLC_TS_INVALID
&&
p_sys
->
i_frame_pts
<=
VLC_TS_INVALID
)
{
p_sys
->
i_frame_dts
=
i_frag_dts
;
p_sys
->
i_frame_pts
=
i_frag_pts
;
*
pb_
used_ts
=
true
;
*
pb_
ts_used
=
true
;
}
return
p_pic
;
}
...
...
modules/packetizer/vc1.c
View file @
323d078c
...
...
@@ -116,7 +116,7 @@ static void PacketizeReset( void *p_private, bool b_broken );
static
block_t
*
PacketizeParse
(
void
*
p_private
,
bool
*
pb_ts_used
,
block_t
*
);
static
int
PacketizeValidate
(
void
*
p_private
,
block_t
*
);
static
block_t
*
ParseIDU
(
decoder_t
*
p_dec
,
bool
*
pb_
used_ts
,
block_t
*
p_frag
);
static
block_t
*
ParseIDU
(
decoder_t
*
p_dec
,
bool
*
pb_
ts_used
,
block_t
*
p_frag
);
static
const
uint8_t
p_vc1_startcode
[
3
]
=
{
0x00
,
0x00
,
0x01
};
/*****************************************************************************
...
...
@@ -319,13 +319,13 @@ static void BuildExtraData( decoder_t *p_dec )
p_sys
->
ep
.
p_ep
->
p_buffer
,
p_sys
->
ep
.
p_ep
->
i_buffer
);
}
/* ParseIDU: parse an Independent Decoding Unit */
static
block_t
*
ParseIDU
(
decoder_t
*
p_dec
,
bool
*
pb_
used_ts
,
block_t
*
p_frag
)
static
block_t
*
ParseIDU
(
decoder_t
*
p_dec
,
bool
*
pb_
ts_used
,
block_t
*
p_frag
)
{
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
block_t
*
p_pic
;
const
idu_type_t
idu
=
p_frag
->
p_buffer
[
3
];
*
pb_
used_ts
=
false
;
*
pb_
ts_used
=
false
;
if
(
!
p_sys
->
b_sequence_header
&&
idu
!=
IDU_TYPE_SEQUENCE_HEADER
)
{
msg_Warn
(
p_dec
,
"waiting for sequence header"
);
...
...
@@ -406,7 +406,7 @@ static block_t *ParseIDU( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag )
{
p_sys
->
i_frame_dts
=
p_frag
->
i_dts
;
p_sys
->
i_frame_pts
=
p_frag
->
i_pts
;
*
pb_
used_ts
=
true
;
*
pb_
ts_used
=
true
;
}
/* We will add back SH and EP on I frames */
...
...
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