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
3ae0db5e
Commit
3ae0db5e
authored
Mar 01, 2005
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/stream_out/transcode.c: Fixed --sout-transcode-threads=1 option
(what the hell is i_duplicate ?)
parent
d5b916d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
10 deletions
+15
-10
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+15
-10
No files found.
modules/stream_out/transcode.c
View file @
3ae0db5e
...
@@ -1658,7 +1658,6 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
...
@@ -1658,7 +1658,6 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
{
{
sout_stream_id_t
*
id
=
p_sys
->
id_video
;
sout_stream_id_t
*
id
=
p_sys
->
id_video
;
picture_t
*
p_pic
;
picture_t
*
p_pic
;
int
i_plane
;
while
(
!
p_sys
->
b_die
&&
!
p_sys
->
b_error
)
while
(
!
p_sys
->
b_die
&&
!
p_sys
->
b_error
)
{
{
...
@@ -1683,13 +1682,23 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
...
@@ -1683,13 +1682,23 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
p_block
=
id
->
p_encoder
->
pf_encode_video
(
id
->
p_encoder
,
p_pic
);
p_block
=
id
->
p_encoder
->
pf_encode_video
(
id
->
p_encoder
,
p_pic
);
vlc_mutex_lock
(
&
p_sys
->
lock_out
);
vlc_mutex_lock
(
&
p_sys
->
lock_out
);
block_ChainAppend
(
&
p_sys
->
p_buffers
,
p_block
);
block_ChainAppend
(
&
p_sys
->
p_buffers
,
p_block
);
vlc_mutex_unlock
(
&
p_sys
->
lock_out
);
for
(
i_plane
=
0
;
i_plane
<
p_pic
->
i_planes
;
i_plane
++
)
if
(
p_sys
->
b_master_sync
)
date_Increment
(
&
id
->
interpolated_pts
,
1
);
#if 0
if( p_sys->b_master_sync && i_duplicate > 1 )
{
{
free
(
p_pic
->
p
[
i_plane
].
p_pixels
);
mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
date_Increment( &id->interpolated_pts, 1 );
p_pic->date = i_pts;
p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
block_ChainAppend( &p_sys->p_buffers, p_block );
}
}
free
(
p_pic
);
#endif
vlc_mutex_unlock
(
&
p_sys
->
lock_out
);
p_pic
->
pf_release
(
p_pic
);
}
}
while
(
p_sys
->
i_last_pic
!=
p_sys
->
i_first_pic
)
while
(
p_sys
->
i_last_pic
!=
p_sys
->
i_first_pic
)
...
@@ -1697,11 +1706,7 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
...
@@ -1697,11 +1706,7 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
p_pic
=
p_sys
->
pp_pics
[
p_sys
->
i_first_pic
++
];
p_pic
=
p_sys
->
pp_pics
[
p_sys
->
i_first_pic
++
];
p_sys
->
i_first_pic
%=
PICTURE_RING_SIZE
;
p_sys
->
i_first_pic
%=
PICTURE_RING_SIZE
;
for
(
i_plane
=
0
;
i_plane
<
p_pic
->
i_planes
;
i_plane
++
)
p_pic
->
pf_release
(
p_pic
);
{
free
(
p_pic
->
p
[
i_plane
].
p_pixels
);
}
free
(
p_pic
);
}
}
block_ChainRelease
(
p_sys
->
p_buffers
);
block_ChainRelease
(
p_sys
->
p_buffers
);
...
...
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