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
b18c7c8d
Commit
b18c7c8d
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libxavs: use the AVFrame API properly.
parent
5290e02a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
libxavs.c
libavcodec/libxavs.c
+12
-8
No files found.
libavcodec/libxavs.c
View file @
b18c7c8d
...
...
@@ -45,7 +45,6 @@ typedef struct XavsContext {
xavs_picture_t
pic
;
uint8_t
*
sei
;
int
sei_size
;
AVFrame
out_pic
;
int
end_of_stream
;
float
crf
;
int
cqp
;
...
...
@@ -161,7 +160,7 @@ static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt,
return
0
;
}
x4
->
out_pic
.
pts
=
pic_out
.
i_pts
;
avctx
->
coded_frame
->
pts
=
pic_out
.
i_pts
;
pkt
->
pts
=
pic_out
.
i_pts
;
if
(
ctx
->
has_b_frames
)
{
if
(
!
x4
->
out_frame_count
)
...
...
@@ -174,25 +173,25 @@ static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt,
switch
(
pic_out
.
i_type
)
{
case
XAVS_TYPE_IDR
:
case
XAVS_TYPE_I
:
x4
->
out_pic
.
pict_type
=
AV_PICTURE_TYPE_I
;
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_I
;
break
;
case
XAVS_TYPE_P
:
x4
->
out_pic
.
pict_type
=
AV_PICTURE_TYPE_P
;
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_P
;
break
;
case
XAVS_TYPE_B
:
case
XAVS_TYPE_BREF
:
x4
->
out_pic
.
pict_type
=
AV_PICTURE_TYPE_B
;
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_B
;
break
;
}
/* There is no IDR frame in AVS JiZhun */
/* Sequence header is used as a flag */
if
(
pic_out
.
i_type
==
XAVS_TYPE_I
)
{
x4
->
out_pic
.
key_frame
=
1
;
avctx
->
coded_frame
->
key_frame
=
1
;
pkt
->
flags
|=
AV_PKT_FLAG_KEY
;
}
x4
->
out_pic
.
quality
=
(
pic_out
.
i_qpplus1
-
1
)
*
FF_QP2LAMBDA
;
avctx
->
coded_frame
->
quality
=
(
pic_out
.
i_qpplus1
-
1
)
*
FF_QP2LAMBDA
;
x4
->
out_frame_count
++
;
*
got_packet
=
ret
;
...
...
@@ -210,6 +209,8 @@ static av_cold int XAVS_close(AVCodecContext *avctx)
if
(
x4
->
enc
)
xavs_encoder_close
(
x4
->
enc
);
av_frame_free
(
&
avctx
->
coded_frame
);
return
0
;
}
...
...
@@ -357,7 +358,10 @@ static av_cold int XAVS_init(AVCodecContext *avctx)
if
(
!
(
x4
->
pts_buffer
=
av_mallocz
((
avctx
->
max_b_frames
+
1
)
*
sizeof
(
*
x4
->
pts_buffer
))))
return
AVERROR
(
ENOMEM
);
avctx
->
coded_frame
=
&
x4
->
out_pic
;
avctx
->
coded_frame
=
av_frame_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
/* TAG: Do we have GLOBAL HEADER in AVS */
/* We Have PPS and SPS in AVS */
if
(
avctx
->
flags
&
CODEC_FLAG_GLOBAL_HEADER
)
{
...
...
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