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
59fe5a33
Commit
59fe5a33
authored
Nov 23, 2012
by
Peter Ross
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iff decoder: DEEP TVDC 32-bit decoder
Signed-off-by:
Peter Ross
<
pross@xvid.org
>
parent
400647f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
4 deletions
+68
-4
iff.c
libavcodec/iff.c
+66
-2
version.h
libavcodec/version.h
+2
-2
No files found.
libavcodec/iff.c
View file @
59fe5a33
...
@@ -53,6 +53,7 @@ typedef struct {
...
@@ -53,6 +53,7 @@ typedef struct {
unsigned
transparency
;
///< TODO: transparency color index in palette
unsigned
transparency
;
///< TODO: transparency color index in palette
unsigned
masking
;
///< TODO: masking method used
unsigned
masking
;
///< TODO: masking method used
int
init
;
// 1 if buffer and palette data already initialized, 0 otherwise
int
init
;
// 1 if buffer and palette data already initialized, 0 otherwise
int16_t
tvdc
[
16
];
///< TVDC lookup table
}
IffContext
;
}
IffContext
;
#define LUT8_PART(plane, v) \
#define LUT8_PART(plane, v) \
...
@@ -191,7 +192,7 @@ static int extract_header(AVCodecContext *const avctx,
...
@@ -191,7 +192,7 @@ static int extract_header(AVCodecContext *const avctx,
const
uint8_t
*
buf
;
const
uint8_t
*
buf
;
unsigned
buf_size
;
unsigned
buf_size
;
IffContext
*
s
=
avctx
->
priv_data
;
IffContext
*
s
=
avctx
->
priv_data
;
int
palette_size
;
int
i
,
palette_size
;
if
(
avctx
->
extradata_size
<
2
)
{
if
(
avctx
->
extradata_size
<
2
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"not enough extradata
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"not enough extradata
\n
"
);
...
@@ -223,13 +224,16 @@ static int extract_header(AVCodecContext *const avctx,
...
@@ -223,13 +224,16 @@ static int extract_header(AVCodecContext *const avctx,
}
}
}
}
if
(
buf_size
>
8
)
{
if
(
buf_size
>
=
41
)
{
s
->
compression
=
bytestream_get_byte
(
&
buf
);
s
->
compression
=
bytestream_get_byte
(
&
buf
);
s
->
bpp
=
bytestream_get_byte
(
&
buf
);
s
->
bpp
=
bytestream_get_byte
(
&
buf
);
s
->
ham
=
bytestream_get_byte
(
&
buf
);
s
->
ham
=
bytestream_get_byte
(
&
buf
);
s
->
flags
=
bytestream_get_byte
(
&
buf
);
s
->
flags
=
bytestream_get_byte
(
&
buf
);
s
->
transparency
=
bytestream_get_be16
(
&
buf
);
s
->
transparency
=
bytestream_get_be16
(
&
buf
);
s
->
masking
=
bytestream_get_byte
(
&
buf
);
s
->
masking
=
bytestream_get_byte
(
&
buf
);
for
(
i
=
0
;
i
<
16
;
i
++
)
s
->
tvdc
[
i
]
=
bytestream_get_be16
(
&
buf
);
if
(
s
->
masking
==
MASK_HAS_MASK
)
{
if
(
s
->
masking
==
MASK_HAS_MASK
)
{
if
(
s
->
bpp
>=
8
&&
!
s
->
ham
)
{
if
(
s
->
bpp
>=
8
&&
!
s
->
ham
)
{
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB32
;
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB32
;
...
@@ -528,6 +532,56 @@ static void decode_deep_rle32(uint8_t *dst, const uint8_t *src, int src_size, in
...
@@ -528,6 +532,56 @@ static void decode_deep_rle32(uint8_t *dst, const uint8_t *src, int src_size, in
}
}
}
}
/**
* Decode DEEP TVDC 32-bit buffer
* @param[out] dst Destination buffer
* @param[in] src Source buffer
* @param src_size Source buffer size (bytes)
* @param width Width of destination buffer (pixels)
* @param height Height of destination buffer (pixels)
* @param linesize Line size of destination buffer (bytes)
* @param[int] tvdc TVDC lookup table
*/
static
void
decode_deep_tvdc32
(
uint8_t
*
dst
,
const
uint8_t
*
src
,
int
src_size
,
int
width
,
int
height
,
int
linesize
,
const
int16_t
*
tvdc
)
{
int
x
=
0
,
y
=
0
,
plane
=
0
;
int8_t
pixel
=
0
;
int
i
,
j
;
for
(
i
=
0
;
i
<
src_size
*
2
;)
{
#define GETNIBBLE ((i & 1) ? (src[i>>1] & 0xF) : (src[i>>1] >> 4))
int
d
=
tvdc
[
GETNIBBLE
];
i
++
;
if
(
d
)
{
pixel
+=
d
;
dst
[
y
*
linesize
+
x
*
4
+
plane
]
=
pixel
;
x
++
;
}
else
{
if
(
i
>=
src_size
*
2
)
return
;
d
=
GETNIBBLE
+
1
;
i
++
;
d
=
FFMIN
(
d
,
width
-
x
);
for
(
j
=
0
;
j
<
d
;
j
++
)
{
dst
[
y
*
linesize
+
x
*
4
+
plane
]
=
pixel
;
x
++
;
}
}
if
(
x
>=
width
)
{
plane
++
;
if
(
plane
>=
4
)
{
y
++
;
if
(
y
>=
height
)
return
;
plane
=
0
;
}
x
=
0
;
pixel
=
0
;
i
=
(
i
+
1
)
&
~
1
;
}
}
}
static
int
unsupported
(
AVCodecContext
*
avctx
)
static
int
unsupported
(
AVCodecContext
*
avctx
)
{
{
IffContext
*
s
=
avctx
->
priv_data
;
IffContext
*
s
=
avctx
->
priv_data
;
...
@@ -715,6 +769,16 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -715,6 +769,16 @@ static int decode_frame(AVCodecContext *avctx,
return
unsupported
(
avctx
);
return
unsupported
(
avctx
);
}
}
break
;
break
;
case
5
:
if
(
avctx
->
codec_tag
==
MKTAG
(
'D'
,
'E'
,
'E'
,
'P'
))
{
const
AVPixFmtDescriptor
*
desc
=
av_pix_fmt_desc_get
(
avctx
->
pix_fmt
);
if
(
av_get_bits_per_pixel
(
desc
)
==
32
)
decode_deep_tvdc32
(
s
->
frame
.
data
[
0
],
buf
,
buf_size
,
avctx
->
width
,
avctx
->
height
,
s
->
frame
.
linesize
[
0
],
s
->
tvdc
);
else
return
unsupported
(
avctx
);
}
else
return
unsupported
(
avctx
);
break
;
default:
default:
return
unsupported
(
avctx
);
return
unsupported
(
avctx
);
}
}
...
...
libavcodec/version.h
View file @
59fe5a33
...
@@ -29,8 +29,8 @@
...
@@ -29,8 +29,8 @@
#include "libavutil/avutil.h"
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 7
8
#define LIBAVCODEC_VERSION_MINOR 7
9
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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