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
dc2d56a6
Commit
dc2d56a6
authored
Aug 21, 2018
by
Timo Rothenpieler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/nvenc: add option to turn off a53 closed caption embedding
parent
6972dae5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
2 deletions
+4
-2
nvenc.c
libavcodec/nvenc.c
+1
-1
nvenc.h
libavcodec/nvenc.h
+1
-0
nvenc_h264.c
libavcodec/nvenc_h264.c
+1
-0
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/nvenc.c
View file @
dc2d56a6
...
...
@@ -2107,7 +2107,7 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame)
pic_params
.
inputTimeStamp
=
frame
->
pts
;
if
(
av_frame_get_side_data
(
frame
,
AV_FRAME_DATA_A53_CC
))
{
if
(
ctx
->
a53_cc
&&
av_frame_get_side_data
(
frame
,
AV_FRAME_DATA_A53_CC
))
{
if
(
ff_alloc_a53_sei
(
frame
,
sizeof
(
NV_ENC_SEI_PAYLOAD
),
(
void
**
)
&
sei_data
,
&
sei_size
)
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Not enough memory for closed captions, skipping
\n
"
);
}
...
...
libavcodec/nvenc.h
View file @
dc2d56a6
...
...
@@ -186,6 +186,7 @@ typedef struct NvencContext
int
weighted_pred
;
int
coder
;
int
b_ref_mode
;
int
a53_cc
;
}
NvencContext
;
int
ff_nvenc_encode_init
(
AVCodecContext
*
avctx
);
...
...
libavcodec/nvenc_h264.c
View file @
dc2d56a6
...
...
@@ -137,6 +137,7 @@ static const AVOption options[] = {
{
"each"
,
""
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
1
},
0
,
0
,
VE
,
"b_ref_mode"
},
{
"middle"
,
""
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
2
},
0
,
0
,
VE
,
"b_ref_mode"
},
#endif
{
"a53cc"
,
"Use A53 Closed Captions (if available)"
,
OFFSET
(
a53_cc
),
AV_OPT_TYPE_BOOL
,
{
.
i64
=
1
},
0
,
1
,
VE
},
{
NULL
}
};
...
...
libavcodec/version.h
View file @
dc2d56a6
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 24
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_MICRO 10
1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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