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
e0bf2bb3
Commit
e0bf2bb3
authored
Sep 09, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transcode: use width/height if visible dimension is not specified by decoder/filter
parent
cac5ac7d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
0 deletions
+16
-0
modules/stream_out/transcode/video.c
modules/stream_out/transcode/video.c
+16
-0
No files found.
modules/stream_out/transcode/video.c
View file @
e0bf2bb3
...
@@ -193,6 +193,16 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
...
@@ -193,6 +193,16 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
?
id
->
p_encoder
->
fmt_out
.
video
.
i_height
?
id
->
p_encoder
->
fmt_out
.
video
.
i_height
:
id
->
p_decoder
->
fmt_in
.
video
.
i_height
:
id
->
p_decoder
->
fmt_in
.
video
.
i_height
?
id
->
p_decoder
->
fmt_in
.
video
.
i_height
:
16
;
?
id
->
p_decoder
->
fmt_in
.
video
.
i_height
:
16
;
id
->
p_encoder
->
fmt_in
.
video
.
i_visible_width
=
id
->
p_encoder
->
fmt_out
.
video
.
i_visible_width
?
id
->
p_encoder
->
fmt_out
.
video
.
i_visible_width
:
id
->
p_decoder
->
fmt_in
.
video
.
i_visible_width
?
id
->
p_decoder
->
fmt_in
.
video
.
i_visible_width
:
16
;
id
->
p_encoder
->
fmt_in
.
video
.
i_visible_height
=
id
->
p_encoder
->
fmt_out
.
video
.
i_visible_height
?
id
->
p_encoder
->
fmt_out
.
video
.
i_visible_height
:
id
->
p_decoder
->
fmt_in
.
video
.
i_visible_height
?
id
->
p_decoder
->
fmt_in
.
video
.
i_visible_height
:
16
;
id
->
p_encoder
->
fmt_in
.
video
.
i_frame_rate
=
ENC_FRAMERATE
;
id
->
p_encoder
->
fmt_in
.
video
.
i_frame_rate
=
ENC_FRAMERATE
;
id
->
p_encoder
->
fmt_in
.
video
.
i_frame_rate_base
=
ENC_FRAMERATE_BASE
;
id
->
p_encoder
->
fmt_in
.
video
.
i_frame_rate_base
=
ENC_FRAMERATE_BASE
;
...
@@ -347,6 +357,12 @@ static void transcode_video_encoder_init( sout_stream_t *p_stream,
...
@@ -347,6 +357,12 @@ static void transcode_video_encoder_init( sout_stream_t *p_stream,
int
i_src_visible_width
=
p_fmt_out
->
video
.
i_visible_width
;
int
i_src_visible_width
=
p_fmt_out
->
video
.
i_visible_width
;
int
i_src_visible_height
=
p_fmt_out
->
video
.
i_visible_height
;
int
i_src_visible_height
=
p_fmt_out
->
video
.
i_visible_height
;
if
(
i_src_visible_width
==
0
)
i_src_visible_width
=
p_fmt_out
->
video
.
i_width
;
if
(
i_src_visible_height
==
0
)
i_src_visible_height
=
p_fmt_out
->
video
.
i_height
;
/* with/height scaling */
/* with/height scaling */
float
f_scale_width
=
1
;
float
f_scale_width
=
1
;
float
f_scale_height
=
1
;
float
f_scale_height
=
1
;
...
...
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