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
6ce87411
Commit
6ce87411
authored
Mar 14, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reverse parameters order of video_format_ApplyRotation()
parent
adb10cda
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
14 deletions
+14
-14
include/vlc_es.h
include/vlc_es.h
+1
-1
modules/video_output/sdl.c
modules/video_output/sdl.c
+1
-2
modules/video_output/xcb/x11.c
modules/video_output/xcb/x11.c
+7
-7
modules/video_output/xcb/xvideo.c
modules/video_output/xcb/xvideo.c
+1
-1
src/misc/es_format.c
src/misc/es_format.c
+2
-1
src/video_output/display.c
src/video_output/display.c
+1
-1
src/video_output/video_output.c
src/video_output/video_output.c
+1
-1
No files found.
include/vlc_es.h
View file @
6ce87411
...
...
@@ -282,7 +282,7 @@ VLC_API void video_format_ScaleCropAr( video_format_t *, const video_format_t *
* This function "normalizes" the formats orientation, by switching the a/r according to the orientation,
* producing a format whose orientation is ORIENT_NORMAL. It makes a shallow copy (pallette is not alloc'ed).
*/
VLC_API
void
video_format_ApplyRotation
(
const
video_format_t
*
restrict
in
,
video_format_t
*
restrict
out
);
VLC_API
void
video_format_ApplyRotation
(
video_format_t
*
restrict
out
,
const
video_format_t
*
restrict
in
);
/**
* This function applies the transform operation to fmt.
...
...
modules/video_output/sdl.c
View file @
6ce87411
...
...
@@ -164,9 +164,8 @@ static int Open(vlc_object_t *object)
sys
->
desktop_height
=
SDL_GetVideoInfo
()
->
current_h
;
/* */
video_format_t
fmt
=
vd
->
fmt
;
video_format_t
fmt
;
video_format_ApplyRotation
(
&
fmt
,
&
vd
->
fmt
);
fmt
=
vd
->
fmt
;
/* */
vout_display_info_t
info
=
vd
->
info
;
...
...
modules/video_output/xcb/x11.c
View file @
6ce87411
...
...
@@ -139,7 +139,7 @@ static int Open (vlc_object_t *obj)
if
(
fmt
->
depth
<=
sys
->
depth
)
continue
;
/* no better than earlier format */
video_format_ApplyRotation
(
&
vd
->
fmt
,
&
fmt_pic
);
video_format_ApplyRotation
(
&
fmt_pic
,
&
vd
->
fmt
);
/* Check that the pixmap format is supported by VLC. */
switch
(
fmt
->
depth
)
...
...
@@ -533,16 +533,16 @@ static int Control (vout_display_t *vd, int query, va_list ap)
vout_display_place_t
place
;
vout_display_PlacePicture
(
&
place
,
&
vd
->
source
,
vd
->
cfg
,
false
);
video_format_t
s
ource_rot
;
video_format_ApplyRotation
(
&
vd
->
source
,
&
source_rot
);
video_format_t
s
rc
;
video_format_ApplyRotation
(
&
src
,
&
vd
->
source
);
vd
->
fmt
.
i_width
=
s
ource_rot
.
i_width
*
place
.
width
/
source_rot
.
i_visible_width
;
vd
->
fmt
.
i_height
=
s
ource_rot
.
i_height
*
place
.
height
/
source_rot
.
i_visible_height
;
vd
->
fmt
.
i_width
=
s
rc
.
i_width
*
place
.
width
/
src
.
i_visible_width
;
vd
->
fmt
.
i_height
=
s
rc
.
i_height
*
place
.
height
/
src
.
i_visible_height
;
vd
->
fmt
.
i_visible_width
=
place
.
width
;
vd
->
fmt
.
i_visible_height
=
place
.
height
;
vd
->
fmt
.
i_x_offset
=
s
ource_rot
.
i_x_offset
*
place
.
width
/
source_rot
.
i_visible_width
;
vd
->
fmt
.
i_y_offset
=
s
ource_rot
.
i_y_offset
*
place
.
height
/
source_rot
.
i_visible_height
;
vd
->
fmt
.
i_x_offset
=
s
rc
.
i_x_offset
*
place
.
width
/
src
.
i_visible_width
;
vd
->
fmt
.
i_y_offset
=
s
rc
.
i_y_offset
*
place
.
height
/
src
.
i_visible_height
;
return
VLC_SUCCESS
;
}
...
...
modules/video_output/xcb/xvideo.c
View file @
6ce87411
...
...
@@ -441,7 +441,7 @@ static int Open (vlc_object_t *obj)
continue
;
/* Look for an image format */
video_format_ApplyRotation
(
&
vd
->
fmt
,
&
fmt
);
video_format_ApplyRotation
(
&
fmt
,
&
vd
->
fmt
);
free
(
p_sys
->
att
);
p_sys
->
att
=
FindFormat
(
obj
,
conn
,
&
fmt
,
a
,
&
p_sys
->
id
);
if
(
p_sys
->
att
==
NULL
)
/* No acceptable image formats */
...
...
src/misc/es_format.c
View file @
6ce87411
...
...
@@ -410,7 +410,8 @@ void video_format_TransformBy( video_format_t *fmt, video_transform_t transform
fmt
->
orientation
=
dst_orient
;
}
void
video_format_ApplyRotation
(
const
video_format_t
*
restrict
in
,
video_format_t
*
restrict
out
)
void
video_format_ApplyRotation
(
video_format_t
*
restrict
out
,
const
video_format_t
*
restrict
in
)
{
*
out
=
*
in
;
...
...
src/video_output/display.c
View file @
6ce87411
...
...
@@ -222,7 +222,7 @@ void vout_display_PlacePicture(vout_display_place_t *place,
unsigned
display_height
;
video_format_t
source_rot
;
video_format_ApplyRotation
(
source
,
&
source_rot
);
video_format_ApplyRotation
(
&
source_rot
,
source
);
source
=
&
source_rot
;
if
(
cfg
->
is_display_filled
)
{
...
...
src/video_output/video_output.c
View file @
6ce87411
...
...
@@ -971,7 +971,7 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
}
video_format_t
fmt_spu_rot
;
video_format_ApplyRotation
(
&
fmt_spu
,
&
fmt_spu_rot
);
video_format_ApplyRotation
(
&
fmt_spu
_rot
,
&
fmt_spu
);
subpicture_t
*
subpic
=
spu_Render
(
vout
->
p
->
spu
,
subpicture_chromas
,
&
fmt_spu_rot
,
&
vd
->
source
,
...
...
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