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
a837c4f2
Commit
a837c4f2
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zmbvenc: use the AVFrame API properly.
parent
d100f9e7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
24 deletions
+22
-24
zmbvenc.c
libavcodec/zmbvenc.c
+22
-24
No files found.
libavcodec/zmbvenc.c
View file @
a837c4f2
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
*/
*/
typedef
struct
ZmbvEncContext
{
typedef
struct
ZmbvEncContext
{
AVCodecContext
*
avctx
;
AVCodecContext
*
avctx
;
AVFrame
pic
;
int
range
;
int
range
;
uint8_t
*
comp_buf
,
*
work_buf
;
uint8_t
*
comp_buf
,
*
work_buf
;
...
@@ -121,7 +120,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -121,7 +120,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const
AVFrame
*
pict
,
int
*
got_packet
)
const
AVFrame
*
pict
,
int
*
got_packet
)
{
{
ZmbvEncContext
*
const
c
=
avctx
->
priv_data
;
ZmbvEncContext
*
const
c
=
avctx
->
priv_data
;
AVFrame
*
const
p
=
&
c
->
pic
;
const
AVFrame
*
const
p
=
pict
;
uint8_t
*
src
,
*
prev
,
*
buf
;
uint8_t
*
src
,
*
prev
,
*
buf
;
uint32_t
*
palptr
;
uint32_t
*
palptr
;
int
keyframe
,
chpal
;
int
keyframe
,
chpal
;
...
@@ -134,9 +133,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -134,9 +133,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
c
->
curfrm
++
;
c
->
curfrm
++
;
if
(
c
->
curfrm
==
c
->
keyint
)
if
(
c
->
curfrm
==
c
->
keyint
)
c
->
curfrm
=
0
;
c
->
curfrm
=
0
;
*
p
=
*
pict
;
avctx
->
coded_frame
->
pict_type
=
keyframe
?
AV_PICTURE_TYPE_I
:
AV_PICTURE_TYPE_P
;
p
->
pict_type
=
keyframe
?
AV_PICTURE_TYPE_I
:
AV_PICTURE_TYPE_P
;
avctx
->
coded_frame
->
key_frame
=
keyframe
;
p
->
key_frame
=
keyframe
;
chpal
=
!
keyframe
&&
memcmp
(
p
->
data
[
1
],
c
->
pal2
,
1024
);
chpal
=
!
keyframe
&&
memcmp
(
p
->
data
[
1
],
c
->
pal2
,
1024
);
palptr
=
(
uint32_t
*
)
p
->
data
[
1
];
palptr
=
(
uint32_t
*
)
p
->
data
[
1
];
...
@@ -253,6 +251,20 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -253,6 +251,20 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return
0
;
return
0
;
}
}
static
av_cold
int
encode_end
(
AVCodecContext
*
avctx
)
{
ZmbvEncContext
*
const
c
=
avctx
->
priv_data
;
av_freep
(
&
c
->
comp_buf
);
av_freep
(
&
c
->
work_buf
);
deflateEnd
(
&
c
->
zstream
);
av_freep
(
&
c
->
prev
);
av_frame_free
(
&
avctx
->
coded_frame
);
return
0
;
}
/**
/**
* Init zmbv encoder
* Init zmbv encoder
...
@@ -314,25 +326,11 @@ static av_cold int encode_init(AVCodecContext *avctx)
...
@@ -314,25 +326,11 @@ static av_cold int encode_init(AVCodecContext *avctx)
return
-
1
;
return
-
1
;
}
}
avctx
->
coded_frame
=
&
c
->
pic
;
avctx
->
coded_frame
=
av_frame_alloc
();
if
(
!
avctx
->
coded_frame
)
{
return
0
;
encode_end
(
avctx
);
}
return
AVERROR
(
ENOMEM
);
}
/**
* Uninit zmbv encoder
*/
static
av_cold
int
encode_end
(
AVCodecContext
*
avctx
)
{
ZmbvEncContext
*
const
c
=
avctx
->
priv_data
;
av_freep
(
&
c
->
comp_buf
);
av_freep
(
&
c
->
work_buf
);
deflateEnd
(
&
c
->
zstream
);
av_freep
(
&
c
->
prev
);
return
0
;
return
0
;
}
}
...
...
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