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
557e011b
Commit
557e011b
authored
Jul 22, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/libxavs: Export pict_type in side data
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
c40ecffd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
libxavs.c
libavcodec/libxavs.c
+10
-6
No files found.
libavcodec/libxavs.c
View file @
557e011b
...
@@ -118,6 +118,7 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -118,6 +118,7 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
int
nnal
,
i
,
ret
;
int
nnal
,
i
,
ret
;
xavs_picture_t
pic_out
;
xavs_picture_t
pic_out
;
uint8_t
*
sd
;
uint8_t
*
sd
;
int
pict_type
;
x4
->
pic
.
img
.
i_csp
=
XAVS_CSP_I420
;
x4
->
pic
.
img
.
i_csp
=
XAVS_CSP_I420
;
x4
->
pic
.
img
.
i_plane
=
3
;
x4
->
pic
.
img
.
i_plane
=
3
;
...
@@ -173,21 +174,24 @@ FF_ENABLE_DEPRECATION_WARNINGS
...
@@ -173,21 +174,24 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
else
}
else
pkt
->
dts
=
pkt
->
pts
;
pkt
->
dts
=
pkt
->
pts
;
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
switch
(
pic_out
.
i_type
)
{
switch
(
pic_out
.
i_type
)
{
case
XAVS_TYPE_IDR
:
case
XAVS_TYPE_IDR
:
case
XAVS_TYPE_I
:
case
XAVS_TYPE_I
:
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_I
;
pict_type
=
AV_PICTURE_TYPE_I
;
break
;
break
;
case
XAVS_TYPE_P
:
case
XAVS_TYPE_P
:
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_P
;
pict_type
=
AV_PICTURE_TYPE_P
;
break
;
break
;
case
XAVS_TYPE_B
:
case
XAVS_TYPE_B
:
case
XAVS_TYPE_BREF
:
case
XAVS_TYPE_BREF
:
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_B
;
pict_type
=
AV_PICTURE_TYPE_B
;
break
;
break
;
default:
pict_type
=
AV_PICTURE_TYPE_NONE
;
}
}
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
avctx
->
coded_frame
->
pict_type
=
pict_type
;
FF_ENABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#endif
...
@@ -208,7 +212,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
...
@@ -208,7 +212,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#endif
ff_side_data_set_encoder_stats
(
pkt
,
(
pic_out
.
i_qpplus1
-
1
)
*
FF_QP2LAMBDA
,
NULL
,
0
,
0
);
ff_side_data_set_encoder_stats
(
pkt
,
(
pic_out
.
i_qpplus1
-
1
)
*
FF_QP2LAMBDA
,
NULL
,
0
,
pict_type
);
x4
->
out_frame_count
++
;
x4
->
out_frame_count
++
;
*
got_packet
=
ret
;
*
got_packet
=
ret
;
...
...
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