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
21a10061
Commit
21a10061
authored
Jan 19, 2012
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support encoding 16bit pixel formats to sgi.
parent
b614c147
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
7 deletions
+48
-7
sgienc.c
libavcodec/sgienc.c
+47
-6
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/sgienc.c
View file @
21a10061
...
@@ -48,7 +48,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
...
@@ -48,7 +48,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
AVFrame
*
const
p
=
&
s
->
picture
;
AVFrame
*
const
p
=
&
s
->
picture
;
uint8_t
*
offsettab
,
*
lengthtab
,
*
in_buf
,
*
encode_buf
;
uint8_t
*
offsettab
,
*
lengthtab
,
*
in_buf
,
*
encode_buf
;
int
x
,
y
,
z
,
length
,
tablesize
;
int
x
,
y
,
z
,
length
,
tablesize
;
unsigned
int
width
,
height
,
depth
,
dimension
;
unsigned
int
width
,
height
,
depth
,
dimension
,
bytes_per_channel
,
pixmax
,
put_be
;
unsigned
char
*
orig_buf
=
buf
,
*
end_buf
=
buf
+
buf_size
;
unsigned
char
*
orig_buf
=
buf
,
*
end_buf
=
buf
+
buf_size
;
*
p
=
*
(
AVFrame
*
)
data
;
*
p
=
*
(
AVFrame
*
)
data
;
...
@@ -57,6 +57,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
...
@@ -57,6 +57,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
width
=
avctx
->
width
;
width
=
avctx
->
width
;
height
=
avctx
->
height
;
height
=
avctx
->
height
;
bytes_per_channel
=
1
;
pixmax
=
0xFF
;
put_be
=
HAVE_BIGENDIAN
;
switch
(
avctx
->
pix_fmt
)
{
switch
(
avctx
->
pix_fmt
)
{
case
PIX_FMT_GRAY8
:
case
PIX_FMT_GRAY8
:
...
@@ -71,6 +74,33 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
...
@@ -71,6 +74,33 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
dimension
=
SGI_MULTI_CHAN
;
dimension
=
SGI_MULTI_CHAN
;
depth
=
SGI_RGBA
;
depth
=
SGI_RGBA
;
break
;
break
;
case
PIX_FMT_GRAY16LE
:
put_be
=
!
HAVE_BIGENDIAN
;
case
PIX_FMT_GRAY16BE
:
avctx
->
coder_type
=
FF_CODER_TYPE_RAW
;
bytes_per_channel
=
2
;
pixmax
=
0xFFFF
;
dimension
=
SGI_SINGLE_CHAN
;
depth
=
SGI_GRAYSCALE
;
break
;
case
PIX_FMT_RGB48LE
:
put_be
=
!
HAVE_BIGENDIAN
;
case
PIX_FMT_RGB48BE
:
avctx
->
coder_type
=
FF_CODER_TYPE_RAW
;
bytes_per_channel
=
2
;
pixmax
=
0xFFFF
;
dimension
=
SGI_MULTI_CHAN
;
depth
=
SGI_RGB
;
break
;
case
PIX_FMT_RGBA64LE
:
put_be
=
!
HAVE_BIGENDIAN
;
case
PIX_FMT_RGBA64BE
:
avctx
->
coder_type
=
FF_CODER_TYPE_RAW
;
bytes_per_channel
=
2
;
pixmax
=
0xFFFF
;
dimension
=
SGI_MULTI_CHAN
;
depth
=
SGI_RGBA
;
break
;
default:
default:
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
@@ -86,15 +116,14 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
...
@@ -86,15 +116,14 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
/* Encode header. */
/* Encode header. */
bytestream_put_be16
(
&
buf
,
SGI_MAGIC
);
bytestream_put_be16
(
&
buf
,
SGI_MAGIC
);
bytestream_put_byte
(
&
buf
,
avctx
->
coder_type
!=
FF_CODER_TYPE_RAW
);
/* RLE 1 - VERBATIM 0*/
bytestream_put_byte
(
&
buf
,
avctx
->
coder_type
!=
FF_CODER_TYPE_RAW
);
/* RLE 1 - VERBATIM 0*/
bytestream_put_byte
(
&
buf
,
1
);
/* bytes_per_channel */
bytestream_put_byte
(
&
buf
,
bytes_per_channel
);
bytestream_put_be16
(
&
buf
,
dimension
);
bytestream_put_be16
(
&
buf
,
dimension
);
bytestream_put_be16
(
&
buf
,
width
);
bytestream_put_be16
(
&
buf
,
width
);
bytestream_put_be16
(
&
buf
,
height
);
bytestream_put_be16
(
&
buf
,
height
);
bytestream_put_be16
(
&
buf
,
depth
);
bytestream_put_be16
(
&
buf
,
depth
);
/* The rest are constant in this implementation. */
bytestream_put_be32
(
&
buf
,
0L
);
/* pixmin */
bytestream_put_be32
(
&
buf
,
0L
);
/* pixmin */
bytestream_put_be32
(
&
buf
,
255L
);
/* pixmax */
bytestream_put_be32
(
&
buf
,
pixmax
);
bytestream_put_be32
(
&
buf
,
0L
);
/* dummy */
bytestream_put_be32
(
&
buf
,
0L
);
/* dummy */
/* name */
/* name */
...
@@ -144,11 +173,19 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
...
@@ -144,11 +173,19 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
av_free
(
encode_buf
);
av_free
(
encode_buf
);
}
else
{
}
else
{
for
(
z
=
0
;
z
<
depth
;
z
++
)
{
for
(
z
=
0
;
z
<
depth
;
z
++
)
{
in_buf
=
p
->
data
[
0
]
+
p
->
linesize
[
0
]
*
(
height
-
1
)
+
z
;
in_buf
=
p
->
data
[
0
]
+
p
->
linesize
[
0
]
*
(
height
-
1
)
+
z
*
bytes_per_channel
;
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
x
=
0
;
x
<
width
*
depth
;
x
+=
depth
)
for
(
x
=
0
;
x
<
width
*
depth
;
x
+=
depth
)
if
(
bytes_per_channel
==
1
)
{
bytestream_put_byte
(
&
buf
,
in_buf
[
x
]);
bytestream_put_byte
(
&
buf
,
in_buf
[
x
]);
}
else
{
if
(
put_be
)
{
bytestream_put_be16
(
&
buf
,
((
uint16_t
*
)
in_buf
)[
x
]);
}
else
{
bytestream_put_le16
(
&
buf
,
((
uint16_t
*
)
in_buf
)[
x
]);
}
}
in_buf
-=
p
->
linesize
[
0
];
in_buf
-=
p
->
linesize
[
0
];
}
}
...
@@ -166,6 +203,10 @@ AVCodec ff_sgi_encoder = {
...
@@ -166,6 +203,10 @@ AVCodec ff_sgi_encoder = {
.
priv_data_size
=
sizeof
(
SgiContext
),
.
priv_data_size
=
sizeof
(
SgiContext
),
.
init
=
encode_init
,
.
init
=
encode_init
,
.
encode
=
encode_frame
,
.
encode
=
encode_frame
,
.
pix_fmts
=
(
const
enum
PixelFormat
[]){
PIX_FMT_RGB24
,
PIX_FMT_RGBA
,
PIX_FMT_GRAY8
,
PIX_FMT_NONE
},
.
pix_fmts
=
(
const
enum
PixelFormat
[]){
PIX_FMT_RGB24
,
PIX_FMT_RGBA
,
PIX_FMT_RGB48LE
,
PIX_FMT_RGB48BE
,
PIX_FMT_RGBA64LE
,
PIX_FMT_RGBA64BE
,
PIX_FMT_GRAY16LE
,
PIX_FMT_GRAY16BE
,
PIX_FMT_GRAY8
,
PIX_FMT_NONE
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SGI image"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SGI image"
),
};
};
libavcodec/version.h
View file @
21a10061
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 57
#define LIBAVCODEC_VERSION_MINOR 57
#define LIBAVCODEC_VERSION_MICRO 10
2
#define LIBAVCODEC_VERSION_MICRO 10
3
#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