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
cd0112a5
Commit
cd0112a5
authored
Apr 04, 2012
by
Martin Storsjö
Committed by
Jean-Baptiste Kempf
Apr 04, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
omxil: Get the new port definition on crop rect changes
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
f27586ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
3 deletions
+23
-3
modules/codec/omxil/omxil.c
modules/codec/omxil/omxil.c
+22
-3
modules/codec/omxil/omxil.h
modules/codec/omxil/omxil.h
+1
-0
No files found.
modules/codec/omxil/omxil.c
View file @
cd0112a5
...
@@ -1213,6 +1213,12 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
...
@@ -1213,6 +1213,12 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
OMX_FIFO_PEEK
(
&
p_sys
->
out
.
fifo
,
p_header
);
OMX_FIFO_PEEK
(
&
p_sys
->
out
.
fifo
,
p_header
);
if
(
!
p_header
)
break
;
/* No frame available */
if
(
!
p_header
)
break
;
/* No frame available */
if
(
p_sys
->
out
.
b_update_def
)
{
omx_error
=
GetPortDefinition
(
p_dec
,
&
p_sys
->
out
,
p_sys
->
out
.
p_fmt
);
p_sys
->
out
.
b_update_def
=
0
;
}
if
(
p_header
->
nFilledLen
)
if
(
p_header
->
nFilledLen
)
{
{
p_pic
=
p_header
->
pAppPrivate
;
p_pic
=
p_header
->
pAppPrivate
;
...
@@ -1320,9 +1326,16 @@ reconfig:
...
@@ -1320,9 +1326,16 @@ reconfig:
for
(
i
=
0
;
i
<
p_sys
->
ports
;
i
++
)
for
(
i
=
0
;
i
<
p_sys
->
ports
;
i
++
)
{
{
OmxPort
*
p_port
=
&
p_sys
->
p_ports
[
i
];
OmxPort
*
p_port
=
&
p_sys
->
p_ports
[
i
];
if
(
!
p_port
->
b_reconfigure
)
continue
;
if
(
p_port
->
b_reconfigure
)
p_port
->
b_reconfigure
=
0
;
{
omx_error
=
PortReconfigure
(
p_dec
,
p_port
);
omx_error
=
PortReconfigure
(
p_dec
,
p_port
);
p_port
->
b_reconfigure
=
0
;
}
if
(
p_port
->
b_update_def
)
{
omx_error
=
GetPortDefinition
(
p_dec
,
p_port
,
p_port
->
p_fmt
);
p_port
->
b_update_def
=
0
;
}
}
}
return
p_pic
;
return
p_pic
;
...
@@ -1639,6 +1652,12 @@ static OMX_ERRORTYPE OmxEventHandler( OMX_HANDLETYPE omx_handle,
...
@@ -1639,6 +1652,12 @@ static OMX_ERRORTYPE OmxEventHandler( OMX_HANDLETYPE omx_handle,
p_sys
->
sentinel_buffer
.
nFlags
=
OMX_BUFFERFLAG_EOS
;
p_sys
->
sentinel_buffer
.
nFlags
=
OMX_BUFFERFLAG_EOS
;
OMX_FIFO_PUT
(
&
p_sys
->
in
.
fifo
,
&
p_sys
->
sentinel_buffer
);
OMX_FIFO_PUT
(
&
p_sys
->
in
.
fifo
,
&
p_sys
->
sentinel_buffer
);
}
}
else
if
(
data_2
==
OMX_IndexConfigCommonOutputCrop
)
{
for
(
i
=
0
;
i
<
p_sys
->
ports
;
i
++
)
if
(
p_sys
->
p_ports
[
i
].
definition
.
nPortIndex
==
data_1
)
p_sys
->
p_ports
[
i
].
b_update_def
=
true
;
}
else
else
{
{
msg_Dbg
(
p_dec
,
"Unhandled setting change %x"
,
(
unsigned
int
)
data_2
);
msg_Dbg
(
p_dec
,
"Unhandled setting change %x"
,
(
unsigned
int
)
data_2
);
...
...
modules/codec/omxil/omxil.h
View file @
cd0112a5
...
@@ -69,6 +69,7 @@ typedef struct OmxPort
...
@@ -69,6 +69,7 @@ typedef struct OmxPort
OmxFormatParam
format_param
;
OmxFormatParam
format_param
;
OMX_BOOL
b_reconfigure
;
OMX_BOOL
b_reconfigure
;
OMX_BOOL
b_update_def
;
OMX_BOOL
b_direct
;
OMX_BOOL
b_direct
;
OMX_BOOL
b_flushed
;
OMX_BOOL
b_flushed
;
...
...
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