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
bef48895
Commit
bef48895
authored
Sep 04, 2008
by
Rafaël Carré
Committed by
Jean-Paul Saman
Nov 15, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resizer: fix display when output width changed, comment black color
Signed-off-by:
Jean-Paul Saman
<
jean-paul.saman@m2x.nl
>
parent
ae80ab50
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
16 deletions
+8
-16
modules/codec/davinci/viddec.c
modules/codec/davinci/viddec.c
+8
-16
No files found.
modules/codec/davinci/viddec.c
View file @
bef48895
...
@@ -961,25 +961,18 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
...
@@ -961,25 +961,18 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
{
{
Resize
(
p_dec
,
VLC_FALSE
);
/* convert to YUYV */
Resize
(
p_dec
,
VLC_FALSE
);
/* convert to YUYV */
/* we write 2 pixels of 2 bytes at a time (packed 4:2:2) */
uint32_t
black
=
0x88888888
;
/* for vout YUYV */
uint32_t
black
;
switch
(
p_dec
->
fmt_out
.
video
.
i_chroma
)
/* video input */
{
case
VLC_FOURCC
(
'U'
,
'Y'
,
'V'
,
'Y'
):
black
=
0x88888888
;
break
;
default:
black
=
0
;
}
/* fb */
/* fb */
/* output top & bottom black */
/* output top & bottom black */
int
i_line_len
=
p_sys
->
var_info
.
xres
*
BPP
/
8
;
/* in bytes */
int
i_line_len
=
p_sys
->
var_info
.
xres
*
BPP
/
8
;
/* in bytes */
int
i_nlines
=
p_sys
->
var_info
.
yres
;
/* in lines */
int
i_nlines
=
p_sys
->
var_info
.
yres
;
/* in lines */
/* bytes per input line */
int
i_vidw
=
p_dec
->
fmt_out
.
video
.
i_width
*
(
BPP
/
8
);
/* borders */
/* borders */
int
i_sideborder
=
/* in bytes */
int
i_sideborder
=
(
i_line_len
-
i_vidw
)
/
2
;
/* in bytes */
(
i_line_len
-
p_dec
->
fmt_out
.
video
.
i_width
*
(
BPP
/
8
)
)
/
2
;
int
i_edgeborder
=
/* in lines */
int
i_edgeborder
=
/* in lines */
(
i_nlines
-
p_dec
->
fmt_out
.
video
.
i_height
)
/
2
;
(
i_nlines
-
p_dec
->
fmt_out
.
video
.
i_height
)
/
2
;
...
@@ -998,13 +991,12 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
...
@@ -998,13 +991,12 @@ static picture_t *DecodeVideoBlockInner( decoder_t *p_dec, block_t **pp_block, i
{
{
assert
(
p_sys
->
out
.
numBufs
==
1
);
assert
(
p_sys
->
out
.
numBufs
==
1
);
/* bytes per input line */
int
i_vidw
=
p_dec
->
fmt_out
.
video
.
i_width
*
(
BPP
/
8
);
/* draw a line */
/* draw a line */
int
i_vidw_pad
=
(
i_vidw
+
15
)
&
~
15
;
memcpy
(
&
p_sys
->
p_fb_map
[
i
*
i_line_len
+
i_sideborder
],
memcpy
(
&
p_sys
->
p_fb_map
[
i
*
i_line_len
+
i_sideborder
],
&
p_sys
->
p_yuyv
[(
i
-
i_edgeborder
)
*
i_vidw
],
&
p_sys
->
p_yuyv
[(
i
-
i_edgeborder
)
*
i_vidw_pad
],
i_vidw
i_vidw_pad
);
);
/* and black borders */
/* and black borders */
...
...
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