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
11505f39
Commit
11505f39
authored
Feb 10, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zmbvenc: switch to encode2().
parent
8c8c7b5e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
15 deletions
+26
-15
zmbvenc.c
libavcodec/zmbvenc.c
+26
-15
No files found.
libavcodec/zmbvenc.c
View file @
11505f39
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "avcodec.h"
#include "internal.h"
#include <zlib.h>
#include <zlib.h>
...
@@ -115,19 +116,18 @@ static int zmbv_me(ZmbvEncContext *c, uint8_t *src, int sstride, uint8_t *prev,
...
@@ -115,19 +116,18 @@ static int zmbv_me(ZmbvEncContext *c, uint8_t *src, int sstride, uint8_t *prev,
return
bv
;
return
bv
;
}
}
static
int
encode_frame
(
AVCodecContext
*
avctx
,
uint8_t
*
buf
,
int
buf_size
,
void
*
data
)
static
int
encode_frame
(
AVCodecContext
*
avctx
,
AVPacket
*
pkt
,
const
AVFrame
*
pict
,
int
*
got_packet
)
{
{
ZmbvEncContext
*
const
c
=
avctx
->
priv_data
;
ZmbvEncContext
*
const
c
=
avctx
->
priv_data
;
AVFrame
*
pict
=
data
;
AVFrame
*
const
p
=
&
c
->
pic
;
AVFrame
*
const
p
=
&
c
->
pic
;
uint8_t
*
src
,
*
prev
;
uint8_t
*
src
,
*
prev
,
*
buf
;
uint32_t
*
palptr
;
uint32_t
*
palptr
;
int
len
=
0
;
int
keyframe
,
chpal
;
int
keyframe
,
chpal
;
int
fl
;
int
fl
;
int
work_size
=
0
;
int
work_size
=
0
,
pkt_size
;
int
bw
,
bh
;
int
bw
,
bh
;
int
i
,
j
;
int
i
,
j
,
ret
;
keyframe
=
!
c
->
curfrm
;
keyframe
=
!
c
->
curfrm
;
c
->
curfrm
++
;
c
->
curfrm
++
;
...
@@ -227,18 +227,29 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
...
@@ -227,18 +227,29 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
return
-
1
;
return
-
1
;
}
}
pkt_size
=
c
->
zstream
.
total_out
+
1
+
6
*
keyframe
;
if
((
ret
=
ff_alloc_packet
(
pkt
,
pkt_size
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error getting packet of size %d.
\n
"
,
pkt_size
);
return
ret
;
}
buf
=
pkt
->
data
;
fl
=
(
keyframe
?
ZMBV_KEYFRAME
:
0
)
|
(
chpal
?
ZMBV_DELTAPAL
:
0
);
fl
=
(
keyframe
?
ZMBV_KEYFRAME
:
0
)
|
(
chpal
?
ZMBV_DELTAPAL
:
0
);
*
buf
++
=
fl
;
len
++
;
*
buf
++
=
fl
;
if
(
keyframe
)
{
if
(
keyframe
)
{
*
buf
++
=
0
;
len
++
;
// hi ver
*
buf
++
=
0
;
// hi ver
*
buf
++
=
1
;
len
++
;
// lo ver
*
buf
++
=
1
;
// lo ver
*
buf
++
=
1
;
len
++
;
// comp
*
buf
++
=
1
;
// comp
*
buf
++
=
4
;
len
++
;
// format - 8bpp
*
buf
++
=
4
;
// format - 8bpp
*
buf
++
=
ZMBV_BLOCK
;
len
++
;
// block width
*
buf
++
=
ZMBV_BLOCK
;
// block width
*
buf
++
=
ZMBV_BLOCK
;
len
++
;
// block height
*
buf
++
=
ZMBV_BLOCK
;
// block height
}
}
memcpy
(
buf
,
c
->
comp_buf
,
c
->
zstream
.
total_out
);
memcpy
(
buf
,
c
->
comp_buf
,
c
->
zstream
.
total_out
);
return
len
+
c
->
zstream
.
total_out
;
pkt
->
flags
|=
AV_PKT_FLAG_KEY
*
keyframe
;
*
got_packet
=
1
;
return
0
;
}
}
...
@@ -331,7 +342,7 @@ AVCodec ff_zmbv_encoder = {
...
@@ -331,7 +342,7 @@ AVCodec ff_zmbv_encoder = {
.
id
=
CODEC_ID_ZMBV
,
.
id
=
CODEC_ID_ZMBV
,
.
priv_data_size
=
sizeof
(
ZmbvEncContext
),
.
priv_data_size
=
sizeof
(
ZmbvEncContext
),
.
init
=
encode_init
,
.
init
=
encode_init
,
.
encode
=
encode_frame
,
.
encode
2
=
encode_frame
,
.
close
=
encode_end
,
.
close
=
encode_end
,
.
pix_fmts
=
(
const
enum
PixelFormat
[]){
PIX_FMT_PAL8
,
PIX_FMT_NONE
},
.
pix_fmts
=
(
const
enum
PixelFormat
[]){
PIX_FMT_PAL8
,
PIX_FMT_NONE
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Zip Motion Blocks Video"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Zip Motion Blocks Video"
),
...
...
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