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
48985576
Commit
48985576
authored
Jan 01, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ffv1dec: Support AV_PIX_FMT_YA8
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
7ea2db6e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
9 deletions
+18
-9
ffv1dec.c
libavcodec/ffv1dec.c
+18
-9
No files found.
libavcodec/ffv1dec.c
View file @
48985576
...
@@ -181,7 +181,8 @@ static av_always_inline void decode_line(FFV1Context *s, int w,
...
@@ -181,7 +181,8 @@ static av_always_inline void decode_line(FFV1Context *s, int w,
}
}
static
void
decode_plane
(
FFV1Context
*
s
,
uint8_t
*
src
,
static
void
decode_plane
(
FFV1Context
*
s
,
uint8_t
*
src
,
int
w
,
int
h
,
int
stride
,
int
plane_index
)
int
w
,
int
h
,
int
stride
,
int
plane_index
,
int
pixel_stride
)
{
{
int
x
,
y
;
int
x
,
y
;
int16_t
*
sample
[
2
];
int16_t
*
sample
[
2
];
...
@@ -205,16 +206,16 @@ static void decode_plane(FFV1Context *s, uint8_t *src,
...
@@ -205,16 +206,16 @@ static void decode_plane(FFV1Context *s, uint8_t *src,
if
(
s
->
avctx
->
bits_per_raw_sample
<=
8
)
{
if
(
s
->
avctx
->
bits_per_raw_sample
<=
8
)
{
decode_line
(
s
,
w
,
sample
,
plane_index
,
8
);
decode_line
(
s
,
w
,
sample
,
plane_index
,
8
);
for
(
x
=
0
;
x
<
w
;
x
++
)
for
(
x
=
0
;
x
<
w
;
x
++
)
src
[
x
+
stride
*
y
]
=
sample
[
1
][
x
];
src
[
x
*
pixel_stride
+
stride
*
y
]
=
sample
[
1
][
x
];
}
else
{
}
else
{
decode_line
(
s
,
w
,
sample
,
plane_index
,
s
->
avctx
->
bits_per_raw_sample
);
decode_line
(
s
,
w
,
sample
,
plane_index
,
s
->
avctx
->
bits_per_raw_sample
);
if
(
s
->
packed_at_lsb
)
{
if
(
s
->
packed_at_lsb
)
{
for
(
x
=
0
;
x
<
w
;
x
++
)
{
for
(
x
=
0
;
x
<
w
;
x
++
)
{
((
uint16_t
*
)(
src
+
stride
*
y
))[
x
]
=
sample
[
1
][
x
];
((
uint16_t
*
)(
src
+
stride
*
y
))[
x
*
pixel_stride
]
=
sample
[
1
][
x
];
}
}
}
else
{
}
else
{
for
(
x
=
0
;
x
<
w
;
x
++
)
{
for
(
x
=
0
;
x
<
w
;
x
++
)
{
((
uint16_t
*
)(
src
+
stride
*
y
))[
x
]
=
sample
[
1
][
x
]
<<
(
16
-
s
->
avctx
->
bits_per_raw_sample
);
((
uint16_t
*
)(
src
+
stride
*
y
))[
x
*
pixel_stride
]
=
sample
[
1
][
x
]
<<
(
16
-
s
->
avctx
->
bits_per_raw_sample
);
}
}
}
}
}
}
...
@@ -433,19 +434,22 @@ static int decode_slice(AVCodecContext *c, void *arg)
...
@@ -433,19 +434,22 @@ static int decode_slice(AVCodecContext *c, void *arg)
}
}
av_assert1
(
width
&&
height
);
av_assert1
(
width
&&
height
);
if
(
f
->
colorspace
==
0
)
{
if
(
f
->
colorspace
==
0
&&
(
f
->
chroma_planes
||
!
fs
->
transparency
)
)
{
const
int
chroma_width
=
FF_CEIL_RSHIFT
(
width
,
f
->
chroma_h_shift
);
const
int
chroma_width
=
FF_CEIL_RSHIFT
(
width
,
f
->
chroma_h_shift
);
const
int
chroma_height
=
FF_CEIL_RSHIFT
(
height
,
f
->
chroma_v_shift
);
const
int
chroma_height
=
FF_CEIL_RSHIFT
(
height
,
f
->
chroma_v_shift
);
const
int
cx
=
x
>>
f
->
chroma_h_shift
;
const
int
cx
=
x
>>
f
->
chroma_h_shift
;
const
int
cy
=
y
>>
f
->
chroma_v_shift
;
const
int
cy
=
y
>>
f
->
chroma_v_shift
;
decode_plane
(
fs
,
p
->
data
[
0
]
+
ps
*
x
+
y
*
p
->
linesize
[
0
],
width
,
height
,
p
->
linesize
[
0
],
0
);
decode_plane
(
fs
,
p
->
data
[
0
]
+
ps
*
x
+
y
*
p
->
linesize
[
0
],
width
,
height
,
p
->
linesize
[
0
],
0
,
1
);
if
(
f
->
chroma_planes
)
{
if
(
f
->
chroma_planes
)
{
decode_plane
(
fs
,
p
->
data
[
1
]
+
ps
*
cx
+
cy
*
p
->
linesize
[
1
],
chroma_width
,
chroma_height
,
p
->
linesize
[
1
],
1
);
decode_plane
(
fs
,
p
->
data
[
1
]
+
ps
*
cx
+
cy
*
p
->
linesize
[
1
],
chroma_width
,
chroma_height
,
p
->
linesize
[
1
],
1
,
1
);
decode_plane
(
fs
,
p
->
data
[
2
]
+
ps
*
cx
+
cy
*
p
->
linesize
[
2
],
chroma_width
,
chroma_height
,
p
->
linesize
[
2
],
1
);
decode_plane
(
fs
,
p
->
data
[
2
]
+
ps
*
cx
+
cy
*
p
->
linesize
[
2
],
chroma_width
,
chroma_height
,
p
->
linesize
[
2
],
1
,
1
);
}
}
if
(
fs
->
transparency
)
if
(
fs
->
transparency
)
decode_plane
(
fs
,
p
->
data
[
3
]
+
ps
*
x
+
y
*
p
->
linesize
[
3
],
width
,
height
,
p
->
linesize
[
3
],
(
f
->
version
>=
4
&&
!
f
->
chroma_planes
)
?
1
:
2
);
decode_plane
(
fs
,
p
->
data
[
3
]
+
ps
*
x
+
y
*
p
->
linesize
[
3
],
width
,
height
,
p
->
linesize
[
3
],
(
f
->
version
>=
4
&&
!
f
->
chroma_planes
)
?
1
:
2
,
1
);
}
else
if
(
f
->
colorspace
==
0
)
{
decode_plane
(
fs
,
p
->
data
[
0
]
+
ps
*
x
+
y
*
p
->
linesize
[
0
]
,
width
,
height
,
p
->
linesize
[
0
],
0
,
2
);
decode_plane
(
fs
,
p
->
data
[
0
]
+
ps
*
x
+
y
*
p
->
linesize
[
0
]
+
1
,
width
,
height
,
p
->
linesize
[
0
],
1
,
2
);
}
else
{
}
else
{
uint8_t
*
planes
[
3
]
=
{
p
->
data
[
0
]
+
ps
*
x
+
y
*
p
->
linesize
[
0
],
uint8_t
*
planes
[
3
]
=
{
p
->
data
[
0
]
+
ps
*
x
+
y
*
p
->
linesize
[
0
],
p
->
data
[
1
]
+
ps
*
x
+
y
*
p
->
linesize
[
1
],
p
->
data
[
1
]
+
ps
*
x
+
y
*
p
->
linesize
[
1
],
...
@@ -697,6 +701,11 @@ static int read_header(FFV1Context *f)
...
@@ -697,6 +701,11 @@ static int read_header(FFV1Context *f)
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_GRAY8
;
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_GRAY8
;
else
else
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_GRAY16
;
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_GRAY16
;
}
else
if
(
f
->
transparency
&&
!
f
->
chroma_planes
)
{
if
(
f
->
avctx
->
bits_per_raw_sample
<=
8
)
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_YA8
;
else
return
AVERROR
(
ENOSYS
);
}
else
if
(
f
->
avctx
->
bits_per_raw_sample
<=
8
&&
!
f
->
transparency
)
{
}
else
if
(
f
->
avctx
->
bits_per_raw_sample
<=
8
&&
!
f
->
transparency
)
{
switch
(
16
*
f
->
chroma_h_shift
+
f
->
chroma_v_shift
)
{
switch
(
16
*
f
->
chroma_h_shift
+
f
->
chroma_v_shift
)
{
case
0x00
:
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV444P
;
break
;
case
0x00
:
f
->
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV444P
;
break
;
...
...
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