Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1aa2b0c9
Commit
1aa2b0c9
authored
Dec 07, 2009
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mash: use VLC_TS_INVALID (refs #3135)
parent
ddd3ca51
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
modules/codec/mash.cpp
modules/codec/mash.cpp
+8
-8
No files found.
modules/codec/mash.cpp
View file @
1aa2b0c9
...
...
@@ -97,7 +97,7 @@ static int OpenDecoder( vlc_object_t *p_this )
(
decoder_sys_t
*
)
malloc
(
sizeof
(
decoder_sys_t
))
)
==
NULL
)
return
VLC_ENOMEM
;
/* Misc init */
p_sys
->
i_pts
=
0
;
p_sys
->
i_pts
=
VLC_TS_INVALID
;
p_sys
->
b_inited
=
false
;
p_sys
->
i_counter
=
0
;
...
...
@@ -143,7 +143,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_block
=
*
pp_block
;
if
(
!
p_sys
->
i_pts
&&
!
p_block
->
i_pts
&&
!
p_block
->
i_dts
)
if
(
p_sys
->
i_pts
<=
VLC_TS_INVALID
&&
p_block
->
i_pts
<=
VLC_TS_INVALID
&&
p_block
->
i_dts
<=
VLC_TS_INVALID
)
{
/* We've just started the stream, wait for the first PTS. */
block_Release
(
p_block
);
...
...
@@ -152,11 +153,10 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
/* Date management */
if
(
p_block
->
i_pts
>
0
||
p_block
->
i_dts
>
0
)
{
if
(
p_block
->
i_pts
>
0
)
p_sys
->
i_pts
=
p_block
->
i_pts
;
else
if
(
p_block
->
i_dts
>
0
)
p_sys
->
i_pts
=
p_block
->
i_dts
;
}
if
(
p_block
->
i_pts
>
VLC_TS_INVALID
)
p_sys
->
i_pts
=
p_block
->
i_pts
;
else
if
(
p_block
->
i_dts
>
VLC_TS_INVALID
)
p_sys
->
i_pts
=
p_block
->
i_dts
;
i_video_header
=
*
(
uint32_t
*
)
p_block
->
p_buffer
;
/* yes, it is native endian */
sbit
=
i_video_header
>>
29
;
/* start bit position */
...
...
@@ -173,7 +173,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
mvdv
=
i_video_header
&
0x1f
;
/* vertical motion vector data */
cc
=
p_block
->
i_buffer
-
4
;
msg_Dbg
(
p_dec
,
"packet size %d"
,
cc
);
/* Find out p_vdec->i_raw_size */
p_sys
->
p_decoder
->
decode
(
p_block
->
p_buffer
+
4
/*bp?*/
,
cc
/*cc?*/
,
...
...
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