Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
fb5c1aae
Commit
fb5c1aae
authored
May 06, 2012
by
Kostya Shishkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dfa: use more meaningful return codes
parent
71a3c59e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
27 deletions
+27
-27
dfa.c
libavcodec/dfa.c
+27
-27
No files found.
libavcodec/dfa.c
View file @
fb5c1aae
...
...
@@ -49,7 +49,7 @@ static int decode_copy(GetByteContext *gb, uint8_t *frame, int width, int height
const
int
size
=
width
*
height
;
if
(
bytestream2_get_buffer
(
gb
,
frame
,
size
)
!=
size
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
return
0
;
}
...
...
@@ -64,23 +64,23 @@ static int decode_tsw1(GetByteContext *gb, uint8_t *frame, int width, int height
segments
=
bytestream2_get_le32
(
gb
);
offset
=
bytestream2_get_le32
(
gb
);
if
(
frame_end
-
frame
<=
offset
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
frame
+=
offset
;
while
(
segments
--
)
{
if
(
bytestream2_get_bytes_left
(
gb
)
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
mask
==
0x10000
)
{
bitbuf
=
bytestream2_get_le16u
(
gb
);
mask
=
1
;
}
if
(
frame_end
-
frame
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
bitbuf
&
mask
)
{
v
=
bytestream2_get_le16
(
gb
);
offset
=
(
v
&
0x1FFF
)
<<
1
;
count
=
((
v
>>
13
)
+
2
)
<<
1
;
if
(
frame
-
frame_start
<
offset
||
frame_end
-
frame
<
count
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
av_memcpy_backptr
(
frame
,
offset
,
count
);
frame
+=
count
;
}
else
{
...
...
@@ -103,19 +103,19 @@ static int decode_dsw1(GetByteContext *gb, uint8_t *frame, int width, int height
segments
=
bytestream2_get_le16
(
gb
);
while
(
segments
--
)
{
if
(
bytestream2_get_bytes_left
(
gb
)
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
mask
==
0x10000
)
{
bitbuf
=
bytestream2_get_le16u
(
gb
);
mask
=
1
;
}
if
(
frame_end
-
frame
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
bitbuf
&
mask
)
{
v
=
bytestream2_get_le16
(
gb
);
offset
=
(
v
&
0x1FFF
)
<<
1
;
count
=
((
v
>>
13
)
+
2
)
<<
1
;
if
(
frame
-
frame_start
<
offset
||
frame_end
-
frame
<
count
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
// can't use av_memcpy_backptr() since it can overwrite following pixels
for
(
v
=
0
;
v
<
count
;
v
++
)
frame
[
v
]
=
frame
[
v
-
offset
];
...
...
@@ -142,19 +142,19 @@ static int decode_dds1(GetByteContext *gb, uint8_t *frame, int width, int height
segments
=
bytestream2_get_le16
(
gb
);
while
(
segments
--
)
{
if
(
bytestream2_get_bytes_left
(
gb
)
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
mask
==
0x10000
)
{
bitbuf
=
bytestream2_get_le16u
(
gb
);
mask
=
1
;
}
if
(
frame_end
-
frame
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
bitbuf
&
mask
)
{
v
=
bytestream2_get_le16
(
gb
);
offset
=
(
v
&
0x1FFF
)
<<
2
;
count
=
((
v
>>
13
)
+
2
)
<<
1
;
if
(
frame
-
frame_start
<
offset
||
frame_end
-
frame
<
count
*
2
+
width
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
for
(
i
=
0
;
i
<
count
;
i
++
)
{
frame
[
0
]
=
frame
[
1
]
=
frame
[
width
]
=
frame
[
width
+
1
]
=
frame
[
-
offset
];
...
...
@@ -186,32 +186,32 @@ static int decode_bdlt(GetByteContext *gb, uint8_t *frame, int width, int height
count
=
bytestream2_get_le16
(
gb
);
if
(
count
>=
height
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
frame
+=
width
*
count
;
lines
=
bytestream2_get_le16
(
gb
);
if
(
count
+
lines
>
height
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
while
(
lines
--
)
{
if
(
bytestream2_get_bytes_left
(
gb
)
<
1
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
line_ptr
=
frame
;
frame
+=
width
;
segments
=
bytestream2_get_byteu
(
gb
);
while
(
segments
--
)
{
if
(
frame
-
line_ptr
<=
bytestream2_peek_byte
(
gb
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
line_ptr
+=
bytestream2_get_byte
(
gb
);
count
=
(
int8_t
)
bytestream2_get_byte
(
gb
);
if
(
count
>=
0
)
{
if
(
frame
-
line_ptr
<
count
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
bytestream2_get_buffer
(
gb
,
line_ptr
,
count
)
!=
count
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
else
{
count
=
-
count
;
if
(
frame
-
line_ptr
<
count
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
memset
(
line_ptr
,
bytestream2_get_byte
(
gb
),
count
);
}
line_ptr
+=
count
;
...
...
@@ -230,17 +230,17 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
lines
=
bytestream2_get_le16
(
gb
);
if
(
lines
>
height
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
while
(
lines
--
)
{
if
(
bytestream2_get_bytes_left
(
gb
)
<
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
segments
=
bytestream2_get_le16u
(
gb
);
while
((
segments
&
0xC000
)
==
0xC000
)
{
unsigned
skip_lines
=
-
(
int16_t
)
segments
;
unsigned
delta
=
-
((
int16_t
)
segments
*
width
);
if
(
frame_end
-
frame
<=
delta
||
y
+
lines
+
skip_lines
>
height
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
frame
+=
delta
;
y
+=
skip_lines
;
segments
=
bytestream2_get_le16
(
gb
);
...
...
@@ -254,19 +254,19 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
y
++
;
while
(
segments
--
)
{
if
(
frame
-
line_ptr
<=
bytestream2_peek_byte
(
gb
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
line_ptr
+=
bytestream2_get_byte
(
gb
);
count
=
(
int8_t
)
bytestream2_get_byte
(
gb
);
if
(
count
>=
0
)
{
if
(
frame
-
line_ptr
<
count
*
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
bytestream2_get_buffer
(
gb
,
line_ptr
,
count
*
2
)
!=
count
*
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
line_ptr
+=
count
*
2
;
}
else
{
count
=
-
count
;
if
(
frame
-
line_ptr
<
count
*
2
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
v
=
bytestream2_get_le16
(
gb
);
for
(
i
=
0
;
i
<
count
;
i
++
)
bytestream_put_le16
(
&
line_ptr
,
v
);
...
...
@@ -279,7 +279,7 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
static
int
decode_unk6
(
GetByteContext
*
gb
,
uint8_t
*
frame
,
int
width
,
int
height
)
{
return
-
1
;
return
AVERROR_PATCHWELCOME
;
}
static
int
decode_blck
(
GetByteContext
*
gb
,
uint8_t
*
frame
,
int
width
,
int
height
)
...
...
@@ -338,7 +338,7 @@ static int dfa_decode_frame(AVCodecContext *avctx,
if
(
decoder
[
chunk_type
-
2
](
&
gb
,
s
->
frame_buf
,
avctx
->
width
,
avctx
->
height
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error decoding %s chunk
\n
"
,
chunk_name
[
chunk_type
-
2
]);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
else
{
av_log
(
avctx
,
AV_LOG_WARNING
,
"Ignoring unknown chunk type %d
\n
"
,
...
...
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