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
5da32d65
Commit
5da32d65
authored
Oct 18, 2007
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DVD CC are not reordered.
parent
22ec91db
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
modules/packetizer/mpegvideo.c
modules/packetizer/mpegvideo.c
+5
-2
No files found.
modules/packetizer/mpegvideo.c
View file @
5da32d65
...
@@ -130,6 +130,7 @@ struct decoder_sys_t
...
@@ -130,6 +130,7 @@ struct decoder_sys_t
vlc_bool_t
b_cc_reset
;
vlc_bool_t
b_cc_reset
;
uint32_t
i_cc_flags
;
uint32_t
i_cc_flags
;
mtime_t
i_cc_pts
;
mtime_t
i_cc_pts
;
mtime_t
i_cc_dts
;
cc_data_t
cc
;
cc_data_t
cc
;
};
};
...
@@ -200,6 +201,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -200,6 +201,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
b_cc_reset
=
VLC_FALSE
;
p_sys
->
b_cc_reset
=
VLC_FALSE
;
p_sys
->
i_cc_pts
=
0
;
p_sys
->
i_cc_pts
=
0
;
p_sys
->
i_cc_dts
=
0
;
p_sys
->
i_cc_flags
=
0
;
p_sys
->
i_cc_flags
=
0
;
cc_Init
(
&
p_sys
->
cc
);
cc_Init
(
&
p_sys
->
cc
);
...
@@ -401,8 +403,8 @@ static block_t *GetCc( decoder_t *p_dec, vlc_bool_t pb_present[4] )
...
@@ -401,8 +403,8 @@ static block_t *GetCc( decoder_t *p_dec, vlc_bool_t pb_present[4] )
{
{
memcpy
(
p_cc
->
p_buffer
,
p_sys
->
cc
.
p_data
,
p_sys
->
cc
.
i_data
);
memcpy
(
p_cc
->
p_buffer
,
p_sys
->
cc
.
p_data
,
p_sys
->
cc
.
i_data
);
p_cc
->
i_dts
=
p_cc
->
i_dts
=
p_cc
->
i_pts
=
p_sys
->
i_cc_p
ts
;
p_cc
->
i_pts
=
p_sys
->
cc
.
b_reorder
?
p_sys
->
i_cc_pts
:
p_sys
->
i_cc_d
ts
;
p_cc
->
i_flags
=
p_sys
->
i_cc_flags
&
(
BLOCK_FLAG_TYPE_I
|
BLOCK_FLAG_TYPE_P
|
BLOCK_FLAG_TYPE_B
);
p_cc
->
i_flags
=
(
p_sys
->
cc
.
b_reorder
?
p_sys
->
i_cc_flags
:
BLOCK_FLAG_TYPE_P
)
&
(
BLOCK_FLAG_TYPE_I
|
BLOCK_FLAG_TYPE_P
|
BLOCK_FLAG_TYPE_B
);
}
}
cc_Flush
(
&
p_sys
->
cc
);
cc_Flush
(
&
p_sys
->
cc
);
return
p_cc
;
return
p_cc
;
...
@@ -543,6 +545,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
...
@@ -543,6 +545,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
/* CC */
/* CC */
p_sys
->
b_cc_reset
=
VLC_TRUE
;
p_sys
->
b_cc_reset
=
VLC_TRUE
;
p_sys
->
i_cc_pts
=
p_pic
->
i_pts
;
p_sys
->
i_cc_pts
=
p_pic
->
i_pts
;
p_sys
->
i_cc_dts
=
p_pic
->
i_dts
;
p_sys
->
i_cc_flags
=
p_pic
->
i_flags
;
p_sys
->
i_cc_flags
=
p_pic
->
i_flags
;
}
}
...
...
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