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
7d46ab9e
Commit
7d46ab9e
authored
May 23, 2024
by
Zhao Zhili
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mediacodecenc: workaround the alignment requirement for H.265
Signed-off-by:
Zhao Zhili
<
zhilizhao@tencent.com
>
parent
2a68b2d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
mediacodecenc.c
libavcodec/mediacodecenc.c
+8
-3
No files found.
libavcodec/mediacodecenc.c
View file @
7d46ab9e
...
...
@@ -154,8 +154,12 @@ static int mediacodec_init_bsf(AVCodecContext *avctx)
ret
=
snprintf
(
str
,
sizeof
(
str
),
"h264_metadata=crop_right=%d:crop_bottom=%d"
,
crop_right
,
crop_bottom
);
else
if
(
avctx
->
codec_id
==
AV_CODEC_ID_HEVC
)
ret
=
snprintf
(
str
,
sizeof
(
str
),
"hevc_metadata=crop_right=%d:crop_bottom=%d"
,
crop_right
,
crop_bottom
);
/* Encoder can use CTU size larger than 16x16, so the real crop
* margin can be larger than crop_right/crop_bottom. Let bsf figure
* out the real crop margin.
*/
ret
=
snprintf
(
str
,
sizeof
(
str
),
"hevc_metadata=width=%d:height=%d"
,
avctx
->
width
,
avctx
->
height
);
if
(
ret
>=
sizeof
(
str
))
return
AVERROR_BUFFER_TOO_SMALL
;
}
...
...
@@ -235,7 +239,8 @@ static av_cold int mediacodec_init(AVCodecContext *avctx)
// Workaround the alignment requirement of mediacodec. We can't do it
// silently for AV_PIX_FMT_MEDIACODEC.
if
(
avctx
->
pix_fmt
!=
AV_PIX_FMT_MEDIACODEC
&&
avctx
->
codec_id
==
AV_CODEC_ID_H264
)
{
(
avctx
->
codec_id
==
AV_CODEC_ID_H264
||
avctx
->
codec_id
==
AV_CODEC_ID_HEVC
))
{
s
->
width
=
FFALIGN
(
avctx
->
width
,
16
);
s
->
height
=
FFALIGN
(
avctx
->
height
,
16
);
}
else
{
...
...
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