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
1785bf6f
Commit
1785bf6f
authored
Feb 15, 2014
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transcode: obsolete hurry-up flag
parent
d2acb621
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
20 deletions
+2
-20
modules/stream_out/transcode/transcode.c
modules/stream_out/transcode/transcode.c
+2
-8
modules/stream_out/transcode/video.c
modules/stream_out/transcode/video.c
+0
-12
No files found.
modules/stream_out/transcode/transcode.c
View file @
1785bf6f
...
...
@@ -137,9 +137,6 @@
"This option will drop/duplicate video frames to synchronise the video " \
"track on the audio track." )
#define HURRYUP_TEXT N_( "Hurry up" )
#define HURRYUP_LONGTEXT N_( "The transcoder will drop frames if your CPU " \
"can't keep up with the encoding rate." )
static
const
char
*
const
ppsz_deinterlace_type
[]
=
{
...
...
@@ -170,8 +167,7 @@ vlc_module_begin ()
SCALE_LONGTEXT
,
false
)
add_string
(
SOUT_CFG_PREFIX
"fps"
,
NULL
,
FPS_TEXT
,
FPS_LONGTEXT
,
false
)
add_bool
(
SOUT_CFG_PREFIX
"hurry-up"
,
false
,
HURRYUP_TEXT
,
HURRYUP_LONGTEXT
,
false
)
add_obsolete_bool
(
SOUT_CFG_PREFIX
"hurry-up"
);
/* Since 2.2.0 */
add_bool
(
SOUT_CFG_PREFIX
"deinterlace"
,
false
,
DEINTERLACE_TEXT
,
DEINTERLACE_LONGTEXT
,
false
)
add_string
(
SOUT_CFG_PREFIX
"deinterlace-module"
,
"deinterlace"
,
...
...
@@ -232,7 +228,7 @@ vlc_module_end ()
static
const
char
*
const
ppsz_sout_options
[]
=
{
"venc"
,
"vcodec"
,
"vb"
,
"scale"
,
"fps"
,
"width"
,
"height"
,
"vfilter"
,
"deinterlace"
,
"deinterlace-module"
,
"threads"
,
"
hurry-up"
,
"
aenc"
,
"acodec"
,
"ab"
,
"alang"
,
"deinterlace-module"
,
"threads"
,
"aenc"
,
"acodec"
,
"ab"
,
"alang"
,
"afilter"
,
"samplerate"
,
"channels"
,
"senc"
,
"scodec"
,
"soverlay"
,
"sfilter"
,
"osd"
,
"audio-sync"
,
"high-priority"
,
"maxwidth"
,
"maxheight"
,
NULL
...
...
@@ -351,8 +347,6 @@ static int Open( vlc_object_t *p_this )
p_sys
->
b_master_sync
=
var_InheritURational
(
p_stream
,
&
p_sys
->
fps_num
,
&
p_sys
->
fps_den
,
SOUT_CFG_PREFIX
"fps"
);
p_sys
->
b_hurry_up
=
var_GetBool
(
p_stream
,
SOUT_CFG_PREFIX
"hurry-up"
);
p_sys
->
i_width
=
var_GetInteger
(
p_stream
,
SOUT_CFG_PREFIX
"width"
);
p_sys
->
i_height
=
var_GetInteger
(
p_stream
,
SOUT_CFG_PREFIX
"height"
);
...
...
modules/stream_out/transcode/video.c
View file @
1785bf6f
...
...
@@ -832,18 +832,6 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
while
(
(
p_pic
=
id
->
p_decoder
->
pf_decode_video
(
id
->
p_decoder
,
&
in
))
)
{
if
(
p_stream
->
p_sout
->
i_out_pace_nocontrol
&&
p_sys
->
b_hurry_up
)
{
mtime_t
current_date
=
mdate
();
if
(
unlikely
(
(
current_date
-
50000
)
>
p_pic
->
date
)
)
{
msg_Dbg
(
p_stream
,
"late picture skipped (%"
PRId64
")"
,
current_date
-
50000
-
p_pic
->
date
);
picture_Release
(
p_pic
);
continue
;
}
}
if
(
unlikely
(
id
->
p_encoder
->
p_module
&&
!
video_format_IsSimilar
(
&
p_sys
->
fmt_input_video
,
&
id
->
p_decoder
->
fmt_out
.
video
)
...
...
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