Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
06484d0b
Commit
06484d0b
authored
Feb 06, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libx264: implement encode2().
parent
05d69922
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
18 deletions
+29
-18
libx264.c
libavcodec/libx264.c
+29
-18
No files found.
libavcodec/libx264.c
View file @
06484d0b
...
...
@@ -84,12 +84,23 @@ static void X264_log(void *p, int level, const char *fmt, va_list args)
}
static
int
encode_nals
(
AVCodecContext
*
ctx
,
uint8_t
*
buf
,
int
size
,
x264_nal_t
*
nals
,
int
nnal
,
int
skip_sei
)
static
int
encode_nals
(
AVCodecContext
*
ctx
,
AVPacket
*
pkt
,
x264_nal_t
*
nals
,
int
nnal
)
{
X264Context
*
x4
=
ctx
->
priv_data
;
uint8_t
*
p
=
buf
;
int
i
;
uint8_t
*
p
;
int
i
,
size
=
x4
->
sei_size
,
ret
;
if
(
!
nnal
)
return
0
;
for
(
i
=
0
;
i
<
nnal
;
i
++
)
size
+=
nals
[
i
].
i_payload
;
if
((
ret
=
ff_alloc_packet
(
pkt
,
size
))
<
0
)
return
ret
;
p
=
pkt
->
data
;
/* Write the SEI as part of the first frame. */
if
(
x4
->
sei_size
>
0
&&
nnal
>
0
)
{
...
...
@@ -103,16 +114,15 @@ static int encode_nals(AVCodecContext *ctx, uint8_t *buf, int size,
p
+=
nals
[
i
].
i_payload
;
}
return
p
-
buf
;
return
1
;
}
static
int
X264_frame
(
AVCodecContext
*
ctx
,
uint8_t
*
buf
,
int
bufsize
,
void
*
data
)
static
int
X264_frame
(
AVCodecContext
*
ctx
,
AVPacket
*
pkt
,
const
AVFrame
*
frame
,
int
*
got_packet
)
{
X264Context
*
x4
=
ctx
->
priv_data
;
AVFrame
*
frame
=
data
;
x264_nal_t
*
nal
;
int
nnal
,
i
;
int
nnal
,
i
,
ret
;
x264_picture_t
pic_out
;
x264_picture_init
(
&
x4
->
pic
);
...
...
@@ -143,13 +153,13 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
if
(
x264_encoder_encode
(
x4
->
enc
,
&
nal
,
&
nnal
,
frame
?
&
x4
->
pic
:
NULL
,
&
pic_out
)
<
0
)
return
-
1
;
bufsize
=
encode_nals
(
ctx
,
buf
,
bufsize
,
nal
,
nnal
,
0
);
if
(
bufsize
<
0
)
ret
=
encode_nals
(
ctx
,
pkt
,
nal
,
nnal
);
if
(
ret
<
0
)
return
-
1
;
}
while
(
!
bufsize
&&
!
frame
&&
x264_encoder_delayed_frames
(
x4
->
enc
));
}
while
(
!
ret
&&
!
frame
&&
x264_encoder_delayed_frames
(
x4
->
enc
));
/* FIXME: libx264 now provides DTS, but AVFrame doesn't have a field for it. */
x4
->
out_pic
.
pts
=
pic_out
.
i_p
ts
;
pkt
->
pts
=
pic_out
.
i_pts
;
pkt
->
dts
=
pic_out
.
i_d
ts
;
switch
(
pic_out
.
i_type
)
{
case
X264_TYPE_IDR
:
...
...
@@ -165,11 +175,12 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
break
;
}
x4
->
out_pic
.
key_frame
=
pic_out
.
b_keyframe
;
if
(
bufsize
)
pkt
->
flags
|=
AV_PKT_FLAG_KEY
*
pic_out
.
b_keyframe
;
if
(
ret
)
x4
->
out_pic
.
quality
=
(
pic_out
.
i_qpplus1
-
1
)
*
FF_QP2LAMBDA
;
return
bufsize
;
*
got_packet
=
ret
;
return
0
;
}
static
av_cold
int
X264_close
(
AVCodecContext
*
avctx
)
...
...
@@ -534,7 +545,7 @@ AVCodec ff_libx264_encoder = {
.
id
=
CODEC_ID_H264
,
.
priv_data_size
=
sizeof
(
X264Context
),
.
init
=
X264_init
,
.
encode
=
X264_frame
,
.
encode
2
=
X264_frame
,
.
close
=
X264_close
,
.
capabilities
=
CODEC_CAP_DELAY
|
CODEC_CAP_AUTO_THREADS
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
...
...
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