Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
46082c2b
Commit
46082c2b
authored
Mar 01, 2017
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/sheervideo: Fix Y prediction for interlaced frames with transparency.
Based on
260de8a2
by Paul B Mahol. Fixes ticket #6210.
parent
d1bfd19a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
sheervideo.c
libavcodec/sheervideo.c
+4
-2
No files found.
libavcodec/sheervideo.c
View file @
46082c2b
...
@@ -2185,7 +2185,7 @@ static void decode_aybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
...
@@ -2185,7 +2185,7 @@ static void decode_aybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
dst_v
[
x
]
=
get_bits
(
gb
,
8
);
dst_v
[
x
]
=
get_bits
(
gb
,
8
);
}
}
}
else
{
}
else
{
int
pred
[
4
]
=
{
125
,
125
,
-
128
,
-
128
};
int
pred
[
4
]
=
{
125
,
s
->
alt
?
125
:
-
146
,
-
128
,
-
128
};
for
(
x
=
0
;
x
<
avctx
->
width
;
x
++
)
{
for
(
x
=
0
;
x
<
avctx
->
width
;
x
++
)
{
int
a
,
y
,
u
,
v
;
int
a
,
y
,
u
,
v
;
...
@@ -2263,7 +2263,7 @@ static void decode_aybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
...
@@ -2263,7 +2263,7 @@ static void decode_aybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
dst_v
[
x
]
=
get_bits
(
gb
,
8
);
dst_v
[
x
]
=
get_bits
(
gb
,
8
);
}
}
}
else
{
}
else
{
int
pred
[
4
]
=
{
125
,
125
,
-
128
,
-
128
};
int
pred
[
4
]
=
{
125
,
s
->
alt
?
125
:
-
146
,
-
128
,
-
128
};
for
(
x
=
0
;
x
<
avctx
->
width
;
x
++
)
{
for
(
x
=
0
;
x
<
avctx
->
width
;
x
++
)
{
int
a
,
y
,
u
,
v
;
int
a
,
y
,
u
,
v
;
...
@@ -2959,6 +2959,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -2959,6 +2959,7 @@ static int decode_frame(AVCodecContext *avctx,
}
}
break
;
break
;
case
MKTAG
(
'A'
,
'Y'
,
'B'
,
'R'
):
case
MKTAG
(
'A'
,
'Y'
,
'B'
,
'R'
):
s
->
alt
=
1
;
case
MKTAG
(
'A'
,
'Y'
,
'b'
,
'R'
):
case
MKTAG
(
'A'
,
'Y'
,
'b'
,
'R'
):
avctx
->
pix_fmt
=
AV_PIX_FMT_YUVA444P
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUVA444P
;
s
->
decode_frame
=
decode_aybr
;
s
->
decode_frame
=
decode_aybr
;
...
@@ -2968,6 +2969,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -2968,6 +2969,7 @@ static int decode_frame(AVCodecContext *avctx,
}
}
break
;
break
;
case
MKTAG
(
'A'
,
'y'
,
'B'
,
'R'
):
case
MKTAG
(
'A'
,
'y'
,
'B'
,
'R'
):
s
->
alt
=
1
;
case
MKTAG
(
'A'
,
'y'
,
'b'
,
'R'
):
case
MKTAG
(
'A'
,
'y'
,
'b'
,
'R'
):
avctx
->
pix_fmt
=
AV_PIX_FMT_YUVA444P
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUVA444P
;
s
->
decode_frame
=
decode_aybri
;
s
->
decode_frame
=
decode_aybri
;
...
...
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