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
55c4cba2
Commit
55c4cba2
authored
Mar 10, 2013
by
Michael Niedermayer
Committed by
Diego Biurrun
Jul 29, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huffyuvenc: BGRA support
Bug-Id: 452 Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
c110cbf6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
116 additions
and
35 deletions
+116
-35
huffyuvenc.c
libavcodec/huffyuvenc.c
+116
-35
No files found.
libavcodec/huffyuvenc.c
View file @
55c4cba2
...
@@ -55,24 +55,29 @@ static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst,
...
@@ -55,24 +55,29 @@ static inline int sub_left_prediction(HYuvContext *s, uint8_t *dst,
static
inline
void
sub_left_prediction_bgr32
(
HYuvContext
*
s
,
uint8_t
*
dst
,
static
inline
void
sub_left_prediction_bgr32
(
HYuvContext
*
s
,
uint8_t
*
dst
,
uint8_t
*
src
,
int
w
,
uint8_t
*
src
,
int
w
,
int
*
red
,
int
*
green
,
int
*
blue
)
int
*
red
,
int
*
green
,
int
*
blue
,
int
*
alpha
)
{
{
int
i
;
int
i
;
int
r
,
g
,
b
;
int
r
,
g
,
b
,
a
;
r
=
*
red
;
r
=
*
red
;
g
=
*
green
;
g
=
*
green
;
b
=
*
blue
;
b
=
*
blue
;
a
=
*
alpha
;
for
(
i
=
0
;
i
<
FFMIN
(
w
,
4
);
i
++
)
{
for
(
i
=
0
;
i
<
FFMIN
(
w
,
4
);
i
++
)
{
const
int
rt
=
src
[
i
*
4
+
R
];
const
int
rt
=
src
[
i
*
4
+
R
];
const
int
gt
=
src
[
i
*
4
+
G
];
const
int
gt
=
src
[
i
*
4
+
G
];
const
int
bt
=
src
[
i
*
4
+
B
];
const
int
bt
=
src
[
i
*
4
+
B
];
const
int
at
=
src
[
i
*
4
+
A
];
dst
[
i
*
4
+
R
]
=
rt
-
r
;
dst
[
i
*
4
+
R
]
=
rt
-
r
;
dst
[
i
*
4
+
G
]
=
gt
-
g
;
dst
[
i
*
4
+
G
]
=
gt
-
g
;
dst
[
i
*
4
+
B
]
=
bt
-
b
;
dst
[
i
*
4
+
B
]
=
bt
-
b
;
dst
[
i
*
4
+
A
]
=
at
-
a
;
r
=
rt
;
r
=
rt
;
g
=
gt
;
g
=
gt
;
b
=
bt
;
b
=
bt
;
a
=
at
;
}
}
s
->
dsp
.
diff_bytes
(
dst
+
16
,
src
+
16
,
src
+
12
,
w
*
4
-
16
);
s
->
dsp
.
diff_bytes
(
dst
+
16
,
src
+
16
,
src
+
12
,
w
*
4
-
16
);
...
@@ -80,6 +85,35 @@ static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst,
...
@@ -80,6 +85,35 @@ static inline void sub_left_prediction_bgr32(HYuvContext *s, uint8_t *dst,
*
red
=
src
[(
w
-
1
)
*
4
+
R
];
*
red
=
src
[(
w
-
1
)
*
4
+
R
];
*
green
=
src
[(
w
-
1
)
*
4
+
G
];
*
green
=
src
[(
w
-
1
)
*
4
+
G
];
*
blue
=
src
[(
w
-
1
)
*
4
+
B
];
*
blue
=
src
[(
w
-
1
)
*
4
+
B
];
*
alpha
=
src
[(
w
-
1
)
*
4
+
A
];
}
static
inline
void
sub_left_prediction_rgb24
(
HYuvContext
*
s
,
uint8_t
*
dst
,
uint8_t
*
src
,
int
w
,
int
*
red
,
int
*
green
,
int
*
blue
)
{
int
i
;
int
r
,
g
,
b
;
r
=
*
red
;
g
=
*
green
;
b
=
*
blue
;
for
(
i
=
0
;
i
<
FFMIN
(
w
,
16
);
i
++
)
{
const
int
rt
=
src
[
i
*
3
+
0
];
const
int
gt
=
src
[
i
*
3
+
1
];
const
int
bt
=
src
[
i
*
3
+
2
];
dst
[
i
*
3
+
0
]
=
rt
-
r
;
dst
[
i
*
3
+
1
]
=
gt
-
g
;
dst
[
i
*
3
+
2
]
=
bt
-
b
;
r
=
rt
;
g
=
gt
;
b
=
bt
;
}
s
->
dsp
.
diff_bytes
(
dst
+
48
,
src
+
48
,
src
+
48
-
3
,
w
*
3
-
48
);
*
red
=
src
[(
w
-
1
)
*
3
+
0
];
*
green
=
src
[(
w
-
1
)
*
3
+
1
];
*
blue
=
src
[(
w
-
1
)
*
3
+
2
];
}
}
static
int
store_table
(
HYuvContext
*
s
,
const
uint8_t
*
len
,
uint8_t
*
buf
)
static
int
store_table
(
HYuvContext
*
s
,
const
uint8_t
*
len
,
uint8_t
*
buf
)
...
@@ -121,12 +155,17 @@ static av_cold int encode_init(AVCodecContext *avctx)
...
@@ -121,12 +155,17 @@ static av_cold int encode_init(AVCodecContext *avctx)
switch
(
avctx
->
pix_fmt
)
{
switch
(
avctx
->
pix_fmt
)
{
case
AV_PIX_FMT_YUV420P
:
case
AV_PIX_FMT_YUV420P
:
s
->
bitstream_bpp
=
12
;
break
;
case
AV_PIX_FMT_YUV422P
:
case
AV_PIX_FMT_YUV422P
:
s
->
bitstream_bpp
=
16
;
if
(
s
->
width
&
1
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Width must be even for this colorspace.
\n
"
);
return
-
1
;
}
s
->
bitstream_bpp
=
avctx
->
pix_fmt
==
AV_PIX_FMT_YUV420P
?
12
:
16
;
break
;
break
;
case
AV_PIX_FMT_RGB32
:
case
AV_PIX_FMT_RGB32
:
s
->
bitstream_bpp
=
32
;
break
;
case
AV_PIX_FMT_RGB24
:
s
->
bitstream_bpp
=
24
;
s
->
bitstream_bpp
=
24
;
break
;
break
;
default:
default:
...
@@ -338,44 +377,52 @@ static int encode_gray_bitstream(HYuvContext *s, int count)
...
@@ -338,44 +377,52 @@ static int encode_gray_bitstream(HYuvContext *s, int count)
return
0
;
return
0
;
}
}
static
in
t
encode_bgr_bitstream
(
HYuvContext
*
s
,
int
count
)
static
in
line
int
encode_bgra_bitstream
(
HYuvContext
*
s
,
int
count
,
int
planes
)
{
{
int
i
;
int
i
;
if
(
s
->
pb
.
buf_end
-
s
->
pb
.
buf
-
(
put_bits_count
(
&
s
->
pb
)
>>
3
)
<
3
*
4
*
count
)
{
if
(
s
->
pb
.
buf_end
-
s
->
pb
.
buf
-
(
put_bits_count
(
&
s
->
pb
)
>>
3
)
<
4
*
planes
*
count
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"encoded frame too large
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"encoded frame too large
\n
"
);
return
-
1
;
return
-
1
;
}
}
#define LOAD3\
#define LOAD_GBRA \
int g = s->temp[0][4 * i + G];\
int g = s->temp[0][planes == 3 ? 3 * i + 1 : 4 * i + G]; \
int b = (s->temp[0][4 * i + B] - g) & 0xff;\
int b = s->temp[0][planes == 3 ? 3 * i + 2 : 4 * i + B] - g & 0xFF; \
int r = (s->temp[0][4 * i + R] - g) & 0xff;
int r = s->temp[0][planes == 3 ? 3 * i + 0 : 4 * i + R] - g & 0xFF; \
#define STAT3\
int a = s->temp[0][planes * i + A];
s->stats[0][b]++;\
s->stats[1][g]++;\
#define STAT_BGRA \
s->stats[2][r]++;
s->stats[0][b]++; \
#define WRITE3\
s->stats[1][g]++; \
put_bits(&s->pb, s->len[1][g], s->bits[1][g]);\
s->stats[2][r]++; \
put_bits(&s->pb, s->len[0][b], s->bits[0][b]);\
if (planes == 4) \
put_bits(&s->pb, s->len[2][r], s->bits[2][r]);
s->stats[2][a]++;
#define WRITE_GBRA \
put_bits(&s->pb, s->len[1][g], s->bits[1][g]); \
put_bits(&s->pb, s->len[0][b], s->bits[0][b]); \
put_bits(&s->pb, s->len[2][r], s->bits[2][r]); \
if (planes == 4) \
put_bits(&s->pb, s->len[2][a], s->bits[2][a]);
if
((
s
->
flags
&
CODEC_FLAG_PASS1
)
&&
if
((
s
->
flags
&
CODEC_FLAG_PASS1
)
&&
(
s
->
avctx
->
flags2
&
CODEC_FLAG2_NO_OUTPUT
))
{
(
s
->
avctx
->
flags2
&
CODEC_FLAG2_NO_OUTPUT
))
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
LOAD
3
;
LOAD
_GBRA
;
STAT
3
;
STAT
_BGRA
;
}
}
}
else
if
(
s
->
context
||
(
s
->
flags
&
CODEC_FLAG_PASS1
))
{
}
else
if
(
s
->
context
||
(
s
->
flags
&
CODEC_FLAG_PASS1
))
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
LOAD
3
;
LOAD
_GBRA
;
STAT
3
;
STAT
_BGRA
;
WRITE
3
;
WRITE
_GBRA
;
}
}
}
else
{
}
else
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
LOAD
3
;
LOAD
_GBRA
;
WRITE
3
;
WRITE
_GBRA
;
}
}
}
}
return
0
;
return
0
;
...
@@ -529,25 +576,57 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -529,25 +576,57 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const
int
stride
=
-
p
->
linesize
[
0
];
const
int
stride
=
-
p
->
linesize
[
0
];
const
int
fake_stride
=
-
fake_ystride
;
const
int
fake_stride
=
-
fake_ystride
;
int
y
;
int
y
;
int
leftr
,
leftg
,
leftb
;
int
leftr
,
leftg
,
leftb
,
lefta
;
put_bits
(
&
s
->
pb
,
8
,
lefta
=
data
[
A
]);
put_bits
(
&
s
->
pb
,
8
,
leftr
=
data
[
R
]);
put_bits
(
&
s
->
pb
,
8
,
leftr
=
data
[
R
]);
put_bits
(
&
s
->
pb
,
8
,
leftg
=
data
[
G
]);
put_bits
(
&
s
->
pb
,
8
,
leftg
=
data
[
G
]);
put_bits
(
&
s
->
pb
,
8
,
leftb
=
data
[
B
]);
put_bits
(
&
s
->
pb
,
8
,
leftb
=
data
[
B
]);
put_bits
(
&
s
->
pb
,
8
,
0
);
sub_left_prediction_bgr32
(
s
,
s
->
temp
[
0
],
data
+
4
,
width
-
1
,
&
leftr
,
&
leftg
,
&
leftb
);
sub_left_prediction_bgr32
(
s
,
s
->
temp
[
0
],
data
+
4
,
width
-
1
,
encode_bgr_bitstream
(
s
,
width
-
1
);
&
leftr
,
&
leftg
,
&
leftb
,
&
lefta
);
encode_bgra_bitstream
(
s
,
width
-
1
,
4
);
for
(
y
=
1
;
y
<
s
->
height
;
y
++
)
{
for
(
y
=
1
;
y
<
s
->
height
;
y
++
)
{
uint8_t
*
dst
=
data
+
y
*
stride
;
uint8_t
*
dst
=
data
+
y
*
stride
;
if
(
s
->
predictor
==
PLANE
&&
s
->
interlaced
<
y
)
{
if
(
s
->
predictor
==
PLANE
&&
s
->
interlaced
<
y
)
{
s
->
dsp
.
diff_bytes
(
s
->
temp
[
1
],
dst
,
dst
-
fake_stride
,
width
*
4
);
s
->
dsp
.
diff_bytes
(
s
->
temp
[
1
],
dst
,
dst
-
fake_stride
,
width
*
4
);
sub_left_prediction_bgr32
(
s
,
s
->
temp
[
0
],
s
->
temp
[
1
],
width
,
&
leftr
,
&
leftg
,
&
leftb
);
sub_left_prediction_bgr32
(
s
,
s
->
temp
[
0
],
s
->
temp
[
1
],
width
,
&
leftr
,
&
leftg
,
&
leftb
,
&
lefta
);
}
else
{
sub_left_prediction_bgr32
(
s
,
s
->
temp
[
0
],
dst
,
width
,
&
leftr
,
&
leftg
,
&
leftb
,
&
lefta
);
}
encode_bgra_bitstream
(
s
,
width
,
4
);
}
}
else
if
(
avctx
->
pix_fmt
==
AV_PIX_FMT_RGB24
)
{
uint8_t
*
data
=
p
->
data
[
0
]
+
(
height
-
1
)
*
p
->
linesize
[
0
];
const
int
stride
=
-
p
->
linesize
[
0
];
const
int
fake_stride
=
-
fake_ystride
;
int
y
;
int
leftr
,
leftg
,
leftb
;
put_bits
(
&
s
->
pb
,
8
,
leftr
=
data
[
0
]);
put_bits
(
&
s
->
pb
,
8
,
leftg
=
data
[
1
]);
put_bits
(
&
s
->
pb
,
8
,
leftb
=
data
[
2
]);
put_bits
(
&
s
->
pb
,
8
,
0
);
sub_left_prediction_rgb24
(
s
,
s
->
temp
[
0
],
data
+
3
,
width
-
1
,
&
leftr
,
&
leftg
,
&
leftb
);
encode_bgra_bitstream
(
s
,
width
-
1
,
3
);
for
(
y
=
1
;
y
<
s
->
height
;
y
++
)
{
uint8_t
*
dst
=
data
+
y
*
stride
;
if
(
s
->
predictor
==
PLANE
&&
s
->
interlaced
<
y
)
{
s
->
dsp
.
diff_bytes
(
s
->
temp
[
1
],
dst
,
dst
-
fake_stride
,
width
*
3
);
sub_left_prediction_rgb24
(
s
,
s
->
temp
[
0
],
s
->
temp
[
1
],
width
,
&
leftr
,
&
leftg
,
&
leftb
);
}
else
{
}
else
{
sub_left_prediction_bgr32
(
s
,
s
->
temp
[
0
],
dst
,
width
,
&
leftr
,
&
leftg
,
&
leftb
);
sub_left_prediction_rgb24
(
s
,
s
->
temp
[
0
],
dst
,
width
,
&
leftr
,
&
leftg
,
&
leftb
);
}
}
encode_bgr
_bitstream
(
s
,
width
);
encode_bgr
a_bitstream
(
s
,
width
,
3
);
}
}
}
else
{
}
else
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Format not supported!
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Format not supported!
\n
"
);
...
@@ -610,7 +689,8 @@ AVCodec ff_huffyuv_encoder = {
...
@@ -610,7 +689,8 @@ AVCodec ff_huffyuv_encoder = {
.
encode2
=
encode_frame
,
.
encode2
=
encode_frame
,
.
close
=
encode_end
,
.
close
=
encode_end
,
.
pix_fmts
=
(
const
enum
AVPixelFormat
[]){
.
pix_fmts
=
(
const
enum
AVPixelFormat
[]){
AV_PIX_FMT_YUV422P
,
AV_PIX_FMT_RGB32
,
AV_PIX_FMT_NONE
AV_PIX_FMT_YUV422P
,
AV_PIX_FMT_RGB24
,
AV_PIX_FMT_RGB32
,
AV_PIX_FMT_NONE
},
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Huffyuv / HuffYUV"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Huffyuv / HuffYUV"
),
};
};
...
@@ -626,7 +706,8 @@ AVCodec ff_ffvhuff_encoder = {
...
@@ -626,7 +706,8 @@ AVCodec ff_ffvhuff_encoder = {
.
encode2
=
encode_frame
,
.
encode2
=
encode_frame
,
.
close
=
encode_end
,
.
close
=
encode_end
,
.
pix_fmts
=
(
const
enum
AVPixelFormat
[]){
.
pix_fmts
=
(
const
enum
AVPixelFormat
[]){
AV_PIX_FMT_YUV420P
,
AV_PIX_FMT_YUV422P
,
AV_PIX_FMT_RGB32
,
AV_PIX_FMT_NONE
AV_PIX_FMT_YUV420P
,
AV_PIX_FMT_YUV422P
,
AV_PIX_FMT_RGB24
,
AV_PIX_FMT_RGB32
,
AV_PIX_FMT_NONE
},
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Huffyuv FFmpeg variant"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Huffyuv FFmpeg variant"
),
};
};
...
...
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