-
-
Notifications
You must be signed in to change notification settings - Fork 488
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
linux: fmpeg patching support (#1415)
batteries included! updates ffmepg too
- Loading branch information
Showing
2 changed files
with
34 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...hes/FFmpeg-devel-v3-vaapi_encode_h264-Only-set-pic_order_cnt_type-to-0-with-B-frames.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c | ||
index f15bcc6..de0951f 100644 | ||
--- a/libavcodec/vaapi_encode_h264.c | ||
+++ b/libavcodec/vaapi_encode_h264.c | ||
@@ -361,8 +361,10 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) | ||
sps->chroma_format_idc = 1; | ||
|
||
sps->log2_max_frame_num_minus4 = 4; | ||
- sps->pic_order_cnt_type = 0; | ||
- sps->log2_max_pic_order_cnt_lsb_minus4 = 4; | ||
+ sps->pic_order_cnt_type = ctx->max_b_depth ? 0 : 2; | ||
+ if (sps->pic_order_cnt_type == 0) { | ||
+ sps->log2_max_pic_order_cnt_lsb_minus4 = 4; | ||
+ } | ||
|
||
sps->max_num_ref_frames = priv->dpb_frames; | ||
|
||
@@ -643,6 +645,10 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, | ||
} | ||
} | ||
hpic->pic_order_cnt = pic->display_order - hpic->last_idr_frame; | ||
+ if (priv->raw_sps.pic_order_cnt_type == 2) { | ||
+ hpic->pic_order_cnt *= 2; | ||
+ } | ||
+ | ||
hpic->dpb_delay = pic->display_order - pic->encode_order + ctx->max_b_depth; | ||
hpic->cpb_delay = pic->encode_order - hpic->last_idr_frame; | ||
|