Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
1220075a
Commit
1220075a
authored
Sep 30, 2014
by
Thomas Guillem
Committed by
Jean-Baptiste Kempf
Oct 01, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
omxil-dr: reorient video
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
842b6578
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
6 deletions
+32
-6
modules/codec/omxil/omxil.c
modules/codec/omxil/omxil.c
+31
-6
modules/codec/omxil/omxil.h
modules/codec/omxil/omxil.h
+1
-0
No files found.
modules/codec/omxil/omxil.c
View file @
1220075a
...
...
@@ -2173,6 +2173,31 @@ static int HwBuffer_AllocateBuffers( decoder_t *p_dec, OmxPort *p_port )
i_hw_usage
=
0
;
}
if
(
p_port
->
p_fmt
->
video
.
orientation
!=
ORIENT_NORMAL
)
{
int
i_angle
;
switch
(
p_port
->
p_fmt
->
video
.
orientation
)
{
case
ORIENT_ROTATED_90
:
i_angle
=
90
;
break
;
case
ORIENT_ROTATED_180
:
i_angle
=
180
;
break
;
case
ORIENT_ROTATED_270
:
i_angle
=
270
;
break
;
default:
i_angle
=
0
;
}
p_port
->
p_hwbuf
->
anwpriv
.
setOrientation
(
p_port
->
p_hwbuf
->
window
,
i_angle
);
video_format_ApplyRotation
(
&
p_port
->
p_hwbuf
->
fmt_out
,
&
p_port
->
p_fmt
->
video
);
}
else
p_port
->
p_hwbuf
->
fmt_out
=
p_port
->
p_fmt
->
video
;
if
(
p_port
->
p_hwbuf
->
anwpriv
.
setup
(
p_port
->
p_hwbuf
->
window
,
def
->
format
.
video
.
nFrameWidth
,
def
->
format
.
video
.
nFrameHeight
,
...
...
@@ -2212,12 +2237,12 @@ static int HwBuffer_AllocateBuffers( decoder_t *p_dec, OmxPort *p_port )
goto
error
;
}
jni_SetAndroidSurfaceSize
(
def
->
format
.
video
.
nFrameW
idth
,
def
->
format
.
video
.
nFrameH
eight
,
def
->
format
.
video
.
nFrameW
idth
,
def
->
format
.
video
.
nFrameH
eight
,
p_
dec
->
fmt_out
.
video
.
i_sar_num
,
p_
dec
->
fmt_out
.
video
.
i_sar_den
);
jni_SetAndroidSurfaceSize
(
p_port
->
p_hwbuf
->
fmt_out
.
i_w
idth
,
p_port
->
p_hwbuf
->
fmt_out
.
i_h
eight
,
p_port
->
p_hwbuf
->
fmt_out
.
i_visible_w
idth
,
p_port
->
p_hwbuf
->
fmt_out
.
i_visible_h
eight
,
p_
port
->
p_hwbuf
->
fmt_out
.
i_sar_num
,
p_
port
->
p_hwbuf
->
fmt_out
.
i_sar_den
);
p_port
->
p_hwbuf
->
i_buffers
=
p_port
->
definition
.
nBufferCountActual
;
p_port
->
p_hwbuf
->
i_max_owned
=
p_port
->
p_hwbuf
->
i_buffers
-
min_undequeued
;
...
...
modules/codec/omxil/omxil.h
View file @
1220075a
...
...
@@ -76,6 +76,7 @@ typedef struct HwBuffer
void
*
p_library
;
void
*
window
;
video_format_t
fmt_out
;
#if defined(USE_IOMX)
native_window_api_t
native_window
;
native_window_priv_api_t
anwpriv
;
...
...
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