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
2d7665e0
Commit
2d7665e0
authored
May 09, 2006
by
Boris Dorès
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- monitor aspect ratio, source aspect ratio and crop ratio are not
octal numbers
parent
15dce7e1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
src/video_output/vout_intf.c
src/video_output/vout_intf.c
+12
-12
No files found.
src/video_output/vout_intf.c
View file @
2d7665e0
...
@@ -235,11 +235,11 @@ void vout_IntfInit( vout_thread_t *p_vout )
...
@@ -235,11 +235,11 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_DELCHOICE
,
&
val
,
0
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_DELCHOICE
,
&
val
,
0
);
val
.
psz_string
=
""
;
text
.
psz_string
=
_
(
"Default"
);
val
.
psz_string
=
""
;
text
.
psz_string
=
_
(
"Default"
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"
00
1:1"
;
text
.
psz_string
=
"1:1"
;
val
.
psz_string
=
"1:1"
;
text
.
psz_string
=
"1:1"
;
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"
00
4:3"
;
text
.
psz_string
=
"4:3"
;
val
.
psz_string
=
"4:3"
;
text
.
psz_string
=
"4:3"
;
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"
0
16:9"
;
text
.
psz_string
=
"16:9"
;
val
.
psz_string
=
"16:9"
;
text
.
psz_string
=
"16:9"
;
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"16:10"
;
text
.
psz_string
=
"16:10"
;
val
.
psz_string
=
"16:10"
;
text
.
psz_string
=
"16:10"
;
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"crop"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
...
@@ -264,8 +264,8 @@ void vout_IntfInit( vout_thread_t *p_vout )
...
@@ -264,8 +264,8 @@ void vout_IntfInit( vout_thread_t *p_vout )
float
i_aspect
=
0
;
float
i_aspect
=
0
;
if
(
psz_parser
)
if
(
psz_parser
)
{
{
i_aspect_num
=
strtol
(
val
.
psz_string
,
0
,
0
);
i_aspect_num
=
strtol
(
val
.
psz_string
,
0
,
1
0
);
i_aspect_den
=
strtol
(
++
psz_parser
,
0
,
0
);
i_aspect_den
=
strtol
(
++
psz_parser
,
0
,
1
0
);
}
}
else
else
{
{
...
@@ -298,11 +298,11 @@ void vout_IntfInit( vout_thread_t *p_vout )
...
@@ -298,11 +298,11 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_DELCHOICE
,
&
val
,
0
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_DELCHOICE
,
&
val
,
0
);
val
.
psz_string
=
""
;
text
.
psz_string
=
_
(
"Default"
);
val
.
psz_string
=
""
;
text
.
psz_string
=
_
(
"Default"
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"
00
1:1"
;
text
.
psz_string
=
"1:1"
;
val
.
psz_string
=
"1:1"
;
text
.
psz_string
=
"1:1"
;
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"
00
4:3"
;
text
.
psz_string
=
"4:3"
;
val
.
psz_string
=
"4:3"
;
text
.
psz_string
=
"4:3"
;
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"
0
16:9"
;
text
.
psz_string
=
"16:9"
;
val
.
psz_string
=
"16:9"
;
text
.
psz_string
=
"16:9"
;
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
val
.
psz_string
=
"16:10"
;
text
.
psz_string
=
"16:10"
;
val
.
psz_string
=
"16:10"
;
text
.
psz_string
=
"16:10"
;
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
var_Change
(
p_vout
,
"aspect-ratio"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
...
@@ -741,10 +741,10 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -741,10 +741,10 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
if
(
!
psz_parser
)
goto
crop_end
;
if
(
!
psz_parser
)
goto
crop_end
;
i_aspect_num
=
strtol
(
newval
.
psz_string
,
&
psz_end
,
0
);
i_aspect_num
=
strtol
(
newval
.
psz_string
,
&
psz_end
,
1
0
);
if
(
psz_end
==
newval
.
psz_string
||
!
i_aspect_num
)
goto
crop_end
;
if
(
psz_end
==
newval
.
psz_string
||
!
i_aspect_num
)
goto
crop_end
;
i_aspect_den
=
strtol
(
++
psz_parser
,
&
psz_end
,
0
);
i_aspect_den
=
strtol
(
++
psz_parser
,
&
psz_end
,
1
0
);
if
(
psz_end
==
psz_parser
||
!
i_aspect_den
)
goto
crop_end
;
if
(
psz_end
==
psz_parser
||
!
i_aspect_den
)
goto
crop_end
;
i_width
=
p_vout
->
fmt_in
.
i_sar_den
*
p_vout
->
fmt_render
.
i_visible_height
*
i_width
=
p_vout
->
fmt_in
.
i_sar_den
*
p_vout
->
fmt_render
.
i_visible_height
*
...
@@ -797,10 +797,10 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
...
@@ -797,10 +797,10 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
if
(
!
psz_parser
)
goto
aspect_end
;
if
(
!
psz_parser
)
goto
aspect_end
;
i_aspect_num
=
strtol
(
newval
.
psz_string
,
&
psz_end
,
0
);
i_aspect_num
=
strtol
(
newval
.
psz_string
,
&
psz_end
,
1
0
);
if
(
psz_end
==
newval
.
psz_string
||
!
i_aspect_num
)
goto
aspect_end
;
if
(
psz_end
==
newval
.
psz_string
||
!
i_aspect_num
)
goto
aspect_end
;
i_aspect_den
=
strtol
(
++
psz_parser
,
&
psz_end
,
0
);
i_aspect_den
=
strtol
(
++
psz_parser
,
&
psz_end
,
1
0
);
if
(
psz_end
==
psz_parser
||
!
i_aspect_den
)
goto
aspect_end
;
if
(
psz_end
==
psz_parser
||
!
i_aspect_den
)
goto
aspect_end
;
i_sar_num
=
i_aspect_num
*
p_vout
->
fmt_render
.
i_visible_height
;
i_sar_num
=
i_aspect_num
*
p_vout
->
fmt_render
.
i_visible_height
;
...
...
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