[FFmpeg-cvslog] Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
Derek Buitenhuis
git at videolan.org
Sun May 8 23:44:05 CEST 2016
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun May 8 22:43:52 2016 +0100| [b975aeec02e4518a4e5f2996cf51d113e42e1727] | committer: Derek Buitenhuis
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
lavc: VAAPI H.264 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b975aeec02e4518a4e5f2996cf51d113e42e1727
---
Changelog | 1 +
configure | 3 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/vaapi_encode_h264.c | 847 ++++++++++++++++++++++++++++++++++++++++
libavcodec/vaapi_encode_h26x.c | 68 ++++
libavcodec/vaapi_encode_h26x.h | 45 +++
libavcodec/version.h | 2 +-
8 files changed, 967 insertions(+), 1 deletion(-)
diff --git a/Changelog b/Changelog
index bc4512d..50a6043 100644
--- a/Changelog
+++ b/Changelog
@@ -30,6 +30,7 @@ version <next>:
- libnpp/CUDA-accelerated format conversion and scaling
- Duck TrueMotion 2.0 Real Time decoder
- Wideband Single-bit Data (WSD) demuxer
+- VAAPI-accelerate H.264 encoding
version 3.0:
- Common Encryption (CENC) MP4 encoding and decoding support
diff --git a/configure b/configure
index d995926..32b9892 100755
--- a/configure
+++ b/configure
@@ -2363,6 +2363,8 @@ h264_qsv_decoder_deps="libmfx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
h264_qsv_encoder_deps="libmfx"
h264_qsv_encoder_select="qsvenc"
+h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
+h264_vaapi_encoder_select="vaapi_encode golomb"
hap_decoder_select="snappy texturedsp"
hap_encoder_deps="libsnappy"
hap_encoder_select="texturedspenc"
@@ -5471,6 +5473,7 @@ check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
check_type "va/va.h" "VAPictureParameterBufferHEVC"
check_type "va/va.h" "VADecPictureParameterBufferVP9"
check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
+check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 69b5364..11d399e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -317,6 +317,7 @@ OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o
OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o
OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h2645.o
OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
+OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o
OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o
OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o
OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index fe882de..4bceac6 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -196,6 +196,7 @@ void avcodec_register_all(void)
#if FF_API_VDPAU
REGISTER_DECODER(H264_VDPAU, h264_vdpau);
#endif
+ REGISTER_ENCODER(H264_VAAPI, h264_vaapi);
REGISTER_ENCDEC (HAP, hap);
REGISTER_DECODER(HEVC, hevc);
REGISTER_DECODER(HEVC_QSV, hevc_qsv);
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
new file mode 100644
index 0000000..12bd71d
--- /dev/null
+++ b/libavcodec/vaapi_encode_h264.c
@@ -0,0 +1,847 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <va/va.h>
+#include <va/va_enc_h264.h>
+
+#include "libavutil/avassert.h"
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixfmt.h"
+
+#include "avcodec.h"
+#include "h264.h"
+#include "internal.h"
+#include "vaapi_encode.h"
+#include "vaapi_encode_h26x.h"
+
+enum {
+ SLICE_TYPE_P = 0,
+ SLICE_TYPE_B = 1,
+ SLICE_TYPE_I = 2,
+ SLICE_TYPE_SP = 3,
+ SLICE_TYPE_SI = 4,
+};
+
+// This structure contains all possibly-useful per-sequence syntax elements
+// which are not already contained in the various VAAPI structures.
+typedef struct VAAPIEncodeH264MiscSequenceParams {
+ unsigned int profile_idc;
+ char constraint_set0_flag;
+ char constraint_set1_flag;
+ char constraint_set2_flag;
+ char constraint_set3_flag;
+ char constraint_set4_flag;
+ char constraint_set5_flag;
+
+ char separate_colour_plane_flag;
+ char qpprime_y_zero_transform_bypass_flag;
+
+ char gaps_in_frame_num_allowed_flag;
+ char delta_pic_order_always_zero_flag;
+ char bottom_field_pic_order_in_frame_present_flag;
+
+ unsigned int num_slice_groups_minus1;
+ unsigned int slice_group_map_type;
+
+ int pic_init_qs_minus26;
+
+ char vui_parameters_present_flag;
+} VAAPIEncodeH264MiscSequenceParams;
+
+// This structure contains all possibly-useful per-slice syntax elements
+// which are not already contained in the various VAAPI structures.
+typedef struct VAAPIEncodeH264MiscSliceParams {
+ unsigned int nal_unit_type;
+ unsigned int nal_ref_idc;
+
+ unsigned int colour_plane_id;
+ char field_pic_flag;
+ char bottom_field_flag;
+
+ unsigned int redundant_pic_cnt;
+
+ char sp_for_switch_flag;
+ int slice_qs_delta;
+
+ char ref_pic_list_modification_flag_l0;
+ char ref_pic_list_modification_flag_l1;
+
+ char no_output_of_prior_pics_flag;
+ char long_term_reference_flag;
+ char adaptive_ref_pic_marking_mode_flag;
+} VAAPIEncodeH264MiscSliceParams;
+
+typedef struct VAAPIEncodeH264Slice {
+ VAAPIEncodeH264MiscSliceParams misc_slice_params;
+} VAAPIEncodeH264Slice;
+
+typedef struct VAAPIEncodeH264Context {
+ VAAPIEncodeH264MiscSequenceParams misc_sequence_params;
+
+ int mb_width;
+ int mb_height;
+
+ int fixed_qp_idr;
+ int fixed_qp_p;
+ int fixed_qp_b;
+
+ int64_t idr_pic_count;
+ int64_t last_idr_frame;
+
+ // RefPicList management.
+} VAAPIEncodeH264Context;
+
+
+#define vseq_var(name) vseq->name, name
+#define vseq_field(name) vseq->seq_fields.bits.name, name
+#define vpic_var(name) vpic->name, name
+#define vpic_field(name) vpic->pic_fields.bits.name, name
+#define vslice_var(name) vslice->name, name
+#define vslice_field(name) vslice->slice_fields.bits.name, name
+#define mseq_var(name) mseq->name, name
+#define mslice_var(name) mslice->name, name
+
+static void vaapi_encode_h264_write_nal_header(PutBitContext *pbc,
+ int nal_unit_type, int nal_ref_idc)
+{
+ u(1, 0, forbidden_zero_bit);
+ u(2, nal_ref_idc, nal_ref_idc);
+ u(5, nal_unit_type, nal_unit_type);
+}
+
+static void vaapi_encode_h264_write_trailing_rbsp(PutBitContext *pbc)
+{
+ u(1, 1, rbsp_stop_one_bit);
+ while (put_bits_count(pbc) & 7)
+ u(1, 0, rbsp_alignment_zero_bit);
+}
+
+static void vaapi_encode_h264_write_sps(PutBitContext *pbc,
+ VAAPIEncodeContext *ctx)
+{
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+ int i;
+
+ vaapi_encode_h264_write_nal_header(pbc, NAL_SPS, 3);
+
+ u(8, mseq_var(profile_idc));
+ u(1, mseq_var(constraint_set0_flag));
+ u(1, mseq_var(constraint_set1_flag));
+ u(1, mseq_var(constraint_set2_flag));
+ u(1, mseq_var(constraint_set3_flag));
+ u(1, mseq_var(constraint_set4_flag));
+ u(1, mseq_var(constraint_set5_flag));
+ u(2, 0, reserved_zero_2bits);
+
+ u(8, vseq_var(level_idc));
+
+ ue(vseq_var(seq_parameter_set_id));
+
+ if (mseq->profile_idc == 100 || mseq->profile_idc == 110 ||
+ mseq->profile_idc == 122 || mseq->profile_idc == 244 ||
+ mseq->profile_idc == 44 || mseq->profile_idc == 83 ||
+ mseq->profile_idc == 86 || mseq->profile_idc == 118 ||
+ mseq->profile_idc == 128 || mseq->profile_idc == 138) {
+ ue(vseq_field(chroma_format_idc));
+
+ if (vseq->seq_fields.bits.chroma_format_idc == 3)
+ u(1, mseq_var(separate_colour_plane_flag));
+
+ ue(vseq_var(bit_depth_luma_minus8));
+ ue(vseq_var(bit_depth_chroma_minus8));
+
+ u(1, mseq_var(qpprime_y_zero_transform_bypass_flag));
+
+ u(1, vseq_field(seq_scaling_matrix_present_flag));
+ if (vseq->seq_fields.bits.seq_scaling_matrix_present_flag) {
+ av_assert0(0 && "scaling matrices not supported");
+ }
+ }
+
+ ue(vseq_field(log2_max_frame_num_minus4));
+ ue(vseq_field(pic_order_cnt_type));
+
+ if (vseq->seq_fields.bits.pic_order_cnt_type == 0) {
+ ue(vseq_field(log2_max_pic_order_cnt_lsb_minus4));
+ } else if (vseq->seq_fields.bits.pic_order_cnt_type == 1) {
+ u(1, mseq_var(delta_pic_order_always_zero_flag));
+ se(vseq_var(offset_for_non_ref_pic));
+ se(vseq_var(offset_for_top_to_bottom_field));
+ ue(vseq_var(num_ref_frames_in_pic_order_cnt_cycle));
+
+ for (i = 0; i < vseq->num_ref_frames_in_pic_order_cnt_cycle; i++)
+ se(vseq_var(offset_for_ref_frame[i]));
+ }
+
+ ue(vseq_var(max_num_ref_frames));
+ u(1, mseq_var(gaps_in_frame_num_allowed_flag));
+
+ ue(vseq->picture_width_in_mbs - 1, pic_width_in_mbs_minus1);
+ ue(vseq->picture_height_in_mbs - 1, pic_height_in_mbs_minus1);
+
+ u(1, vseq_field(frame_mbs_only_flag));
+ if (!vseq->seq_fields.bits.frame_mbs_only_flag)
+ u(1, vseq_field(mb_adaptive_frame_field_flag));
+
+ u(1, vseq_field(direct_8x8_inference_flag));
+
+ u(1, vseq_var(frame_cropping_flag));
+ if (vseq->frame_cropping_flag) {
+ ue(vseq_var(frame_crop_left_offset));
+ ue(vseq_var(frame_crop_right_offset));
+ ue(vseq_var(frame_crop_top_offset));
+ ue(vseq_var(frame_crop_bottom_offset));
+ }
+
+ u(1, mseq_var(vui_parameters_present_flag));
+
+ vaapi_encode_h264_write_trailing_rbsp(pbc);
+}
+
+static void vaapi_encode_h264_write_pps(PutBitContext *pbc,
+ VAAPIEncodeContext *ctx)
+{
+ VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+
+ vaapi_encode_h264_write_nal_header(pbc, NAL_PPS, 3);
+
+ ue(vpic_var(pic_parameter_set_id));
+ ue(vpic_var(seq_parameter_set_id));
+
+ u(1, vpic_field(entropy_coding_mode_flag));
+ u(1, mseq_var(bottom_field_pic_order_in_frame_present_flag));
+
+ ue(mseq_var(num_slice_groups_minus1));
+ if (mseq->num_slice_groups_minus1 > 0) {
+ ue(mseq_var(slice_group_map_type));
+ av_assert0(0 && "slice groups not supported");
+ }
+
+ ue(vpic_var(num_ref_idx_l0_active_minus1));
+ ue(vpic_var(num_ref_idx_l1_active_minus1));
+
+ u(1, vpic_field(weighted_pred_flag));
+ u(2, vpic_field(weighted_bipred_idc));
+
+ se(vpic->pic_init_qp - 26, pic_init_qp_minus26);
+ se(mseq_var(pic_init_qs_minus26));
+ se(vpic_var(chroma_qp_index_offset));
+
+ u(1, vpic_field(deblocking_filter_control_present_flag));
+ u(1, vpic_field(constrained_intra_pred_flag));
+ u(1, vpic_field(redundant_pic_cnt_present_flag));
+ u(1, vpic_field(transform_8x8_mode_flag));
+
+ u(1, vpic_field(pic_scaling_matrix_present_flag));
+ if (vpic->pic_fields.bits.pic_scaling_matrix_present_flag) {
+ av_assert0(0 && "scaling matrices not supported");
+ }
+
+ se(vpic_var(second_chroma_qp_index_offset));
+
+ vaapi_encode_h264_write_trailing_rbsp(pbc);
+}
+
+static void vaapi_encode_h264_write_slice_header2(PutBitContext *pbc,
+ VAAPIEncodeContext *ctx,
+ VAAPIEncodePicture *pic,
+ VAAPIEncodeSlice *slice)
+{
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
+ VAEncSliceParameterBufferH264 *vslice = slice->codec_slice_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+ VAAPIEncodeH264Slice *pslice = slice->priv_data;
+ VAAPIEncodeH264MiscSliceParams *mslice = &pslice->misc_slice_params;
+
+ vaapi_encode_h264_write_nal_header(pbc, mslice->nal_unit_type,
+ mslice->nal_ref_idc);
+
+ ue(vslice->macroblock_address, first_mb_in_slice);
+ ue(vslice_var(slice_type));
+ ue(vpic_var(pic_parameter_set_id));
+
+ if (mseq->separate_colour_plane_flag) {
+ u(2, mslice_var(colour_plane_id));
+ }
+
+ u(4 + vseq->seq_fields.bits.log2_max_frame_num_minus4,
+ (vpic->frame_num &
+ ((1 << (4 + vseq->seq_fields.bits.log2_max_frame_num_minus4)) - 1)),
+ frame_num);
+
+ if (!vseq->seq_fields.bits.frame_mbs_only_flag) {
+ u(1, mslice_var(field_pic_flag));
+ if (mslice->field_pic_flag)
+ u(1, mslice_var(bottom_field_flag));
+ }
+
+ if (vpic->pic_fields.bits.idr_pic_flag) {
+ ue(vslice_var(idr_pic_id));
+ }
+
+ if (vseq->seq_fields.bits.pic_order_cnt_type == 0) {
+ u(4 + vseq->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4,
+ vslice_var(pic_order_cnt_lsb));
+ if (mseq->bottom_field_pic_order_in_frame_present_flag &&
+ !mslice->field_pic_flag) {
+ se(vslice_var(delta_pic_order_cnt_bottom));
+ }
+ }
+
+ if (vseq->seq_fields.bits.pic_order_cnt_type == 1 &&
+ !vseq->seq_fields.bits.delta_pic_order_always_zero_flag) {
+ se(vslice_var(delta_pic_order_cnt[0]));
+ if (mseq->bottom_field_pic_order_in_frame_present_flag &&
+ !mslice->field_pic_flag) {
+ se(vslice_var(delta_pic_order_cnt[1]));
+ }
+ }
+
+ if (vpic->pic_fields.bits.redundant_pic_cnt_present_flag) {
+ ue(mslice_var(redundant_pic_cnt));
+ }
+
+ if (vslice->slice_type == SLICE_TYPE_B) {
+ u(1, vslice_var(direct_spatial_mv_pred_flag));
+ }
+
+ if (vslice->slice_type == SLICE_TYPE_P ||
+ vslice->slice_type == SLICE_TYPE_SP ||
+ vslice->slice_type == SLICE_TYPE_B) {
+ u(1, vslice_var(num_ref_idx_active_override_flag));
+ if (vslice->num_ref_idx_active_override_flag) {
+ ue(vslice_var(num_ref_idx_l0_active_minus1));
+ if (vslice->slice_type == SLICE_TYPE_B)
+ ue(vslice_var(num_ref_idx_l1_active_minus1));
+ }
+ }
+
+ if (mslice->nal_unit_type == 20 || mslice->nal_unit_type == 21) {
+ av_assert0(0 && "no MVC support");
+ } else {
+ if (vslice->slice_type % 5 != 2 && vslice->slice_type % 5 != 4) {
+ u(1, mslice_var(ref_pic_list_modification_flag_l0));
+ if (mslice->ref_pic_list_modification_flag_l0) {
+ av_assert0(0 && "ref pic list modification");
+ }
+ }
+ if (vslice->slice_type % 5 == 1) {
+ u(1, mslice_var(ref_pic_list_modification_flag_l1));
+ if (mslice->ref_pic_list_modification_flag_l1) {
+ av_assert0(0 && "ref pic list modification");
+ }
+ }
+ }
+
+ if ((vpic->pic_fields.bits.weighted_pred_flag &&
+ (vslice->slice_type == SLICE_TYPE_P ||
+ vslice->slice_type == SLICE_TYPE_SP)) ||
+ (vpic->pic_fields.bits.weighted_bipred_idc == 1 &&
+ vslice->slice_type == SLICE_TYPE_B)) {
+ av_assert0(0 && "prediction weights not supported");
+ }
+
+ av_assert0(mslice->nal_ref_idc > 0 ==
+ vpic->pic_fields.bits.reference_pic_flag);
+ if (mslice->nal_ref_idc != 0) {
+ if (vpic->pic_fields.bits.idr_pic_flag) {
+ u(1, mslice_var(no_output_of_prior_pics_flag));
+ u(1, mslice_var(long_term_reference_flag));
+ } else {
+ u(1, mslice_var(adaptive_ref_pic_marking_mode_flag));
+ if (mslice->adaptive_ref_pic_marking_mode_flag) {
+ av_assert0(0 && "MMCOs not supported");
+ }
+ }
+ }
+
+ if (vpic->pic_fields.bits.entropy_coding_mode_flag &&
+ vslice->slice_type != SLICE_TYPE_I &&
+ vslice->slice_type != SLICE_TYPE_SI) {
+ ue(vslice_var(cabac_init_idc));
+ }
+
+ se(vslice_var(slice_qp_delta));
+ if (vslice->slice_type == SLICE_TYPE_SP ||
+ vslice->slice_type == SLICE_TYPE_SI) {
+ if (vslice->slice_type == SLICE_TYPE_SP)
+ u(1, mslice_var(sp_for_switch_flag));
+ se(mslice_var(slice_qs_delta));
+ }
+
+ if (vpic->pic_fields.bits.deblocking_filter_control_present_flag) {
+ ue(vslice_var(disable_deblocking_filter_idc));
+ if (vslice->disable_deblocking_filter_idc != 1) {
+ se(vslice_var(slice_alpha_c0_offset_div2));
+ se(vslice_var(slice_beta_offset_div2));
+ }
+ }
+
+ if (mseq->num_slice_groups_minus1 > 0 &&
+ mseq->slice_group_map_type >= 3 && mseq->slice_group_map_type <= 5) {
+ av_assert0(0 && "slice groups not supported");
+ }
+
+ // No alignment - this need not be a byte boundary.
+}
+
+static int vaapi_encode_h264_write_sequence_header(AVCodecContext *avctx,
+ char *data, size_t *data_len)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ PutBitContext pbc;
+ char tmp[256];
+ int err;
+ size_t nal_len, bit_len, bit_pos, next_len;
+
+ bit_len = *data_len;
+ bit_pos = 0;
+
+ init_put_bits(&pbc, tmp, sizeof(tmp));
+ vaapi_encode_h264_write_sps(&pbc, ctx);
+ nal_len = put_bits_count(&pbc);
+ flush_put_bits(&pbc);
+
+ next_len = bit_len - bit_pos;
+ err = ff_vaapi_encode_h26x_nal_unit_to_byte_stream(data + bit_pos / 8,
+ &next_len,
+ tmp, nal_len);
+ if (err < 0)
+ return err;
+ bit_pos += next_len;
+
+ init_put_bits(&pbc, tmp, sizeof(tmp));
+ vaapi_encode_h264_write_pps(&pbc, ctx);
+ nal_len = put_bits_count(&pbc);
+ flush_put_bits(&pbc);
+
+ next_len = bit_len - bit_pos;
+ err = ff_vaapi_encode_h26x_nal_unit_to_byte_stream(data + bit_pos / 8,
+ &next_len,
+ tmp, nal_len);
+ if (err < 0)
+ return err;
+ bit_pos += next_len;
+
+ *data_len = bit_pos;
+ return 0;
+}
+
+static int vaapi_encode_h264_write_slice_header(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic,
+ VAAPIEncodeSlice *slice,
+ char *data, size_t *data_len)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ PutBitContext pbc;
+ char tmp[256];
+ size_t header_len;
+
+ init_put_bits(&pbc, tmp, sizeof(tmp));
+ vaapi_encode_h264_write_slice_header2(&pbc, ctx, pic, slice);
+ header_len = put_bits_count(&pbc);
+ flush_put_bits(&pbc);
+
+ return ff_vaapi_encode_h26x_nal_unit_to_byte_stream(data, data_len,
+ tmp, header_len);
+}
+
+static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+ int i;
+
+ {
+ vseq->seq_parameter_set_id = 0;
+
+ vseq->level_idc = avctx->level;
+
+ vseq->max_num_ref_frames = 2;
+
+ vseq->picture_width_in_mbs = priv->mb_width;
+ vseq->picture_height_in_mbs = priv->mb_height;
+
+ vseq->seq_fields.bits.chroma_format_idc = 1;
+ vseq->seq_fields.bits.frame_mbs_only_flag = 1;
+ vseq->seq_fields.bits.direct_8x8_inference_flag = 1;
+ vseq->seq_fields.bits.log2_max_frame_num_minus4 = 4;
+ vseq->seq_fields.bits.pic_order_cnt_type = 0;
+
+ if (ctx->input_width != ctx->aligned_width ||
+ ctx->input_height != ctx->aligned_height) {
+ vseq->frame_cropping_flag = 1;
+
+ vseq->frame_crop_left_offset = 0;
+ vseq->frame_crop_right_offset =
+ (ctx->aligned_width - ctx->input_width) / 2;
+ vseq->frame_crop_top_offset = 0;
+ vseq->frame_crop_bottom_offset =
+ (ctx->aligned_height - ctx->input_height) / 2;
+ } else {
+ vseq->frame_cropping_flag = 0;
+ }
+ }
+
+ {
+ vpic->CurrPic.picture_id = VA_INVALID_ID;
+ vpic->CurrPic.flags = VA_PICTURE_H264_INVALID;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(vpic->ReferenceFrames); i++) {
+ vpic->ReferenceFrames[i].picture_id = VA_INVALID_ID;
+ vpic->ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ vpic->coded_buf = VA_INVALID_ID;
+
+ vpic->pic_parameter_set_id = 0;
+ vpic->seq_parameter_set_id = 0;
+
+ vpic->num_ref_idx_l0_active_minus1 = 0;
+ vpic->num_ref_idx_l1_active_minus1 = 0;
+
+ vpic->pic_fields.bits.entropy_coding_mode_flag =
+ ((avctx->profile & 0xff) != 66);
+ vpic->pic_fields.bits.weighted_pred_flag = 0;
+ vpic->pic_fields.bits.weighted_bipred_idc = 0;
+ vpic->pic_fields.bits.transform_8x8_mode_flag =
+ ((avctx->profile & 0xff) >= 100);
+
+ vpic->pic_init_qp = priv->fixed_qp_idr;
+ }
+
+ {
+ mseq->profile_idc = avctx->profile & 0xff;
+
+ if (avctx->profile & FF_PROFILE_H264_CONSTRAINED)
+ mseq->constraint_set1_flag = 1;
+ if (avctx->profile & FF_PROFILE_H264_INTRA)
+ mseq->constraint_set3_flag = 1;
+ }
+
+ return 0;
+}
+
+static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ int i;
+
+ if (pic->type == PICTURE_TYPE_IDR) {
+ av_assert0(pic->display_order == pic->encode_order);
+ priv->last_idr_frame = pic->display_order;
+ } else {
+ av_assert0(pic->display_order > priv->last_idr_frame);
+ }
+
+ vpic->frame_num = (pic->encode_order - priv->last_idr_frame) &
+ ((1 << (4 + vseq->seq_fields.bits.log2_max_frame_num_minus4)) - 1);
+
+ vpic->CurrPic.picture_id = pic->recon_surface;
+ vpic->CurrPic.frame_idx = vpic->frame_num;
+ vpic->CurrPic.flags = 0;
+ vpic->CurrPic.TopFieldOrderCnt = pic->display_order;
+ vpic->CurrPic.BottomFieldOrderCnt = pic->display_order;
+
+ for (i = 0; i < pic->nb_refs; i++) {
+ VAAPIEncodePicture *ref = pic->refs[i];
+ av_assert0(ref && ref->encode_order >= priv->last_idr_frame);
+ vpic->ReferenceFrames[i].picture_id = ref->recon_surface;
+ vpic->ReferenceFrames[i].frame_idx =
+ ref->encode_order - priv->last_idr_frame;
+ vpic->ReferenceFrames[i].flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
+ vpic->ReferenceFrames[i].TopFieldOrderCnt = ref->display_order;
+ vpic->ReferenceFrames[i].BottomFieldOrderCnt = ref->display_order;
+ }
+ for (; i < FF_ARRAY_ELEMS(vpic->ReferenceFrames); i++) {
+ vpic->ReferenceFrames[i].picture_id = VA_INVALID_ID;
+ vpic->ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ vpic->coded_buf = pic->output_buffer;
+
+ vpic->pic_fields.bits.idr_pic_flag = (pic->type == PICTURE_TYPE_IDR);
+ vpic->pic_fields.bits.reference_pic_flag = (pic->type != PICTURE_TYPE_B);
+
+ pic->nb_slices = 1;
+
+ return 0;
+}
+
+static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic,
+ VAAPIEncodeSlice *slice)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
+ VAEncSliceParameterBufferH264 *vslice = slice->codec_slice_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264Slice *pslice;
+ VAAPIEncodeH264MiscSliceParams *mslice;
+ int i;
+
+ slice->priv_data = av_mallocz(sizeof(*pslice));
+ if (!slice->priv_data)
+ return AVERROR(ENOMEM);
+ pslice = slice->priv_data;
+ mslice = &pslice->misc_slice_params;
+
+ if (pic->type == PICTURE_TYPE_IDR)
+ mslice->nal_unit_type = NAL_IDR_SLICE;
+ else
+ mslice->nal_unit_type = NAL_SLICE;
+
+ switch (pic->type) {
+ case PICTURE_TYPE_IDR:
+ vslice->slice_type = SLICE_TYPE_I;
+ mslice->nal_ref_idc = 3;
+ break;
+ case PICTURE_TYPE_I:
+ vslice->slice_type = SLICE_TYPE_I;
+ mslice->nal_ref_idc = 2;
+ break;
+ case PICTURE_TYPE_P:
+ vslice->slice_type = SLICE_TYPE_P;
+ mslice->nal_ref_idc = 1;
+ break;
+ case PICTURE_TYPE_B:
+ vslice->slice_type = SLICE_TYPE_B;
+ mslice->nal_ref_idc = 0;
+ break;
+ default:
+ av_assert0(0 && "invalid picture type");
+ }
+
+ // Only one slice per frame.
+ vslice->macroblock_address = 0;
+ vslice->num_macroblocks = priv->mb_width * priv->mb_height;
+
+ vslice->macroblock_info = VA_INVALID_ID;
+
+ vslice->pic_parameter_set_id = vpic->pic_parameter_set_id;
+ vslice->idr_pic_id = priv->idr_pic_count++;
+
+ vslice->pic_order_cnt_lsb = pic->display_order &
+ ((1 << (4 + vseq->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4)) - 1);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(vslice->RefPicList0); i++) {
+ vslice->RefPicList0[i].picture_id = VA_INVALID_ID;
+ vslice->RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ vslice->RefPicList1[i].picture_id = VA_INVALID_ID;
+ vslice->RefPicList1[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ av_assert0(pic->nb_refs <= 2);
+ if (pic->nb_refs >= 1) {
+ // Backward reference for P or B frame.
+ av_assert0(pic->type == PICTURE_TYPE_P ||
+ pic->type == PICTURE_TYPE_B);
+
+ vslice->num_ref_idx_l0_active_minus1 = 0;
+ vslice->RefPicList0[0] = vpic->ReferenceFrames[0];
+ }
+ if (pic->nb_refs >= 2) {
+ // Forward reference for B frame.
+ av_assert0(pic->type == PICTURE_TYPE_B);
+
+ vslice->num_ref_idx_l1_active_minus1 = 0;
+ vslice->RefPicList1[0] = vpic->ReferenceFrames[1];
+ }
+
+ if (pic->type == PICTURE_TYPE_B)
+ vslice->slice_qp_delta = priv->fixed_qp_b - vpic->pic_init_qp;
+ else if (pic->type == PICTURE_TYPE_P)
+ vslice->slice_qp_delta = priv->fixed_qp_p - vpic->pic_init_qp;
+ else
+ vslice->slice_qp_delta = priv->fixed_qp_idr - vpic->pic_init_qp;
+
+ vslice->direct_spatial_mv_pred_flag = 1;
+
+ return 0;
+}
+
+static VAConfigAttrib vaapi_encode_h264_config_attributes[] = {
+ { .type = VAConfigAttribRTFormat,
+ .value = VA_RT_FORMAT_YUV420 },
+ { .type = VAConfigAttribRateControl,
+ .value = VA_RC_CQP },
+ { .type = VAConfigAttribEncPackedHeaders,
+ .value = (VA_ENC_PACKED_HEADER_SEQUENCE |
+ VA_ENC_PACKED_HEADER_SLICE) },
+};
+
+static av_cold int vaapi_encode_h264_init_internal(AVCodecContext *avctx)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+
+ switch (avctx->profile) {
+ case FF_PROFILE_H264_CONSTRAINED_BASELINE:
+ ctx->va_profile = VAProfileH264ConstrainedBaseline;
+ break;
+ case FF_PROFILE_H264_BASELINE:
+ ctx->va_profile = VAProfileH264Baseline;
+ break;
+ case FF_PROFILE_H264_MAIN:
+ ctx->va_profile = VAProfileH264Main;
+ break;
+ case FF_PROFILE_H264_EXTENDED:
+ av_log(avctx, AV_LOG_ERROR, "H.264 extended profile "
+ "is not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ case FF_PROFILE_UNKNOWN:
+ case FF_PROFILE_H264_HIGH:
+ ctx->va_profile = VAProfileH264High;
+ break;
+ case FF_PROFILE_H264_HIGH_10:
+ case FF_PROFILE_H264_HIGH_10_INTRA:
+ av_log(avctx, AV_LOG_ERROR, "H.264 10-bit profiles "
+ "are not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ case FF_PROFILE_H264_HIGH_422:
+ case FF_PROFILE_H264_HIGH_422_INTRA:
+ case FF_PROFILE_H264_HIGH_444:
+ case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
+ case FF_PROFILE_H264_HIGH_444_INTRA:
+ case FF_PROFILE_H264_CAVLC_444:
+ av_log(avctx, AV_LOG_ERROR, "H.264 non-4:2:0 profiles "
+ "are not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Unknown H.264 profile %d.\n",
+ avctx->profile);
+ return AVERROR(EINVAL);
+ }
+ ctx->va_entrypoint = VAEntrypointEncSlice;
+
+ ctx->va_rc_mode = VA_RC_CQP;
+
+ ctx->input_width = avctx->width;
+ ctx->input_height = avctx->height;
+ ctx->aligned_width = FFALIGN(ctx->input_width, 16);
+ ctx->aligned_height = FFALIGN(ctx->input_height, 16);
+ priv->mb_width = ctx->aligned_width / 16;
+ priv->mb_height = ctx->aligned_height / 16;
+
+ if (avctx->bit_rate > 0) {
+ av_log(avctx, AV_LOG_ERROR, "Constant bitrate encoding is not "
+ "supported!\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ priv->fixed_qp_p = avctx->global_quality;
+ if (avctx->i_quant_factor > 0.0)
+ priv->fixed_qp_idr = (int)((priv->fixed_qp_p * avctx->i_quant_factor +
+ avctx->i_quant_offset) + 0.5);
+ else
+ priv->fixed_qp_idr = priv->fixed_qp_p;
+ if (avctx->b_quant_factor > 0.0)
+ priv->fixed_qp_b = (int)((priv->fixed_qp_p * avctx->b_quant_factor +
+ avctx->b_quant_offset) + 0.5);
+ else
+ priv->fixed_qp_b = priv->fixed_qp_p;
+ av_log(avctx, AV_LOG_DEBUG, "QP = %d / %d / %d for IDR / P / B frames.\n",
+ priv->fixed_qp_idr, priv->fixed_qp_p, priv->fixed_qp_b);
+
+ ctx->config_attributes = vaapi_encode_h264_config_attributes;
+ ctx->nb_config_attributes =
+ FF_ARRAY_ELEMS(vaapi_encode_h264_config_attributes);
+
+ ctx->nb_recon_frames = 20;
+
+ return 0;
+}
+
+static VAAPIEncodeType vaapi_encode_type_h264 = {
+ .priv_data_size = sizeof(VAAPIEncodeH264Context),
+
+ .init = &vaapi_encode_h264_init_internal,
+
+ .sequence_params_size = sizeof(VAEncSequenceParameterBufferH264),
+ .init_sequence_params = &vaapi_encode_h264_init_sequence_params,
+
+ .picture_params_size = sizeof(VAEncPictureParameterBufferH264),
+ .init_picture_params = &vaapi_encode_h264_init_picture_params,
+
+ .slice_params_size = sizeof(VAEncSliceParameterBufferH264),
+ .init_slice_params = &vaapi_encode_h264_init_slice_params,
+
+ .sequence_header_type = VAEncPackedHeaderSequence,
+ .write_sequence_header = &vaapi_encode_h264_write_sequence_header,
+
+ .slice_header_type = VAEncPackedHeaderH264_Slice,
+ .write_slice_header = &vaapi_encode_h264_write_slice_header,
+};
+
+static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)
+{
+ return ff_vaapi_encode_init(avctx, &vaapi_encode_type_h264);
+}
+
+static const AVCodecDefault vaapi_encode_h264_defaults[] = {
+ { "profile", "100" },
+ { "level", "51" },
+ { "b", "0" },
+ { "bf", "2" },
+ { "g", "120" },
+ { "global_quality", "20" },
+ { "i_qfactor", "1.0" },
+ { "i_qoffset", "0.0" },
+ { "b_qfactor", "1.2" },
+ { "b_qoffset", "0.0" },
+ { NULL },
+};
+
+static const AVClass vaapi_encode_h264_class = {
+ .class_name = "h264_vaapi",
+ .item_name = av_default_item_name,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_h264_vaapi_encoder = {
+ .name = "h264_vaapi",
+ .long_name = NULL_IF_CONFIG_SMALL("H.264/AVC (VAAPI)"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_H264,
+ .priv_data_size = sizeof(VAAPIEncodeContext),
+ .init = &vaapi_encode_h264_init,
+ .encode2 = &ff_vaapi_encode2,
+ .close = &ff_vaapi_encode_close,
+ .priv_class = &vaapi_encode_h264_class,
+ .capabilities = AV_CODEC_CAP_DELAY,
+ .defaults = vaapi_encode_h264_defaults,
+ .pix_fmts = (const enum AVPixelFormat[]) {
+ AV_PIX_FMT_VAAPI,
+ AV_PIX_FMT_NONE,
+ },
+};
diff --git a/libavcodec/vaapi_encode_h26x.c b/libavcodec/vaapi_encode_h26x.c
new file mode 100644
index 0000000..d806f9b
--- /dev/null
+++ b/libavcodec/vaapi_encode_h26x.c
@@ -0,0 +1,68 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "vaapi_encode_h26x.h"
+
+int ff_vaapi_encode_h26x_nal_unit_to_byte_stream(uint8_t *dst, size_t *dst_bit_len,
+ uint8_t *src, size_t src_bit_len)
+{
+ size_t dp, sp;
+ int zero_run = 0;
+ size_t dst_len = *dst_bit_len / 8;
+ size_t src_len = (src_bit_len + 7) / 8;
+ int trailing_zeroes = src_len * 8 - src_bit_len;
+
+ if (dst_len < src_len + 4) {
+ // Definitely doesn't fit.
+ goto fail;
+ }
+
+ // Start code.
+ dst[0] = dst[1] = dst[2] = 0;
+ dst[3] = 1;
+ dp = 4;
+
+ for (sp = 0; sp < src_len; sp++) {
+ if (dp >= dst_len)
+ goto fail;
+ if (zero_run < 2) {
+ if (src[sp] == 0)
+ ++zero_run;
+ else
+ zero_run = 0;
+ } else {
+ if ((src[sp] & ~3) == 0) {
+ // emulation_prevention_three_byte
+ dst[dp++] = 3;
+ if (dp >= dst_len)
+ goto fail;
+ }
+ zero_run = src[sp] == 0;
+ }
+ dst[dp++] = src[sp];
+ }
+
+ *dst_bit_len = 8 * dp - trailing_zeroes;
+ return 0;
+
+fail:
+ *dst_bit_len = 0;
+ return AVERROR(ENOSPC);
+}
diff --git a/libavcodec/vaapi_encode_h26x.h b/libavcodec/vaapi_encode_h26x.h
new file mode 100644
index 0000000..f8c6e13
--- /dev/null
+++ b/libavcodec/vaapi_encode_h26x.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_ENCODE_H26X_H
+#define AVCODEC_VAAPI_ENCODE_H26X_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "golomb.h"
+#include "put_bits.h"
+
+
+// Debug code may be interested in the name of the syntax element being
+// for tracing purposes. Here, it is just discarded.
+
+#define write_u(pbc, width, value, name) put_bits(pbc, width, value)
+#define write_ue(pbc, value, name) set_ue_golomb(pbc, value)
+#define write_se(pbc, value, name) set_se_golomb(pbc, value)
+
+#define u(width, ...) write_u(pbc, width, __VA_ARGS__)
+#define ue(...) write_ue(pbc, __VA_ARGS__)
+#define se(...) write_se(pbc, __VA_ARGS__)
+
+
+// Copy from src to dst, applying emulation prevention.
+int ff_vaapi_encode_h26x_nal_unit_to_byte_stream(uint8_t *dst, size_t *dst_len,
+ uint8_t *src, size_t src_len);
+
+#endif /* AVCODEC_VAAPI_ENCODE_H26X_H */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5840cf6..ec74bdd 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 39
+#define LIBAVCODEC_VERSION_MINOR 40
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
======================================================================
diff --cc Changelog
index bc4512d,76ac32a..50a6043
--- a/Changelog
+++ b/Changelog
@@@ -2,200 -2,17 +2,201 @@@ Entries are sorted chronologically fro
releases are sorted from youngest to oldest.
version <next>:
-- aliases and defaults for Ogg subtypes (opus, spx)
-- HEVC/H.265 RTP payload format (draft v6) packetizer and depacketizer
-- avplay now exits by default at the end of playback
-- XCB-based screen-grabber
-- creating DASH compatible fragmented MP4, MPEG-DASH segmenting muxer
-- H.261 RTP payload format (RFC 4587) depacketizer and experimental packetizer
+- DXVA2-accelerated HEVC Main10 decoding
+- fieldhint filter
+- loop video filter and aloop audio filter
+- Bob Weaver deinterlacing filter
+- firequalizer filter
+- datascope filter
+- bench and abench filters
+- ciescope filter
+- protocol blacklisting API
+- MediaCodec H264 decoding
+- VC-2 HQ RTP payload format (draft v1) depacketizer and packetizer
+- AudioToolbox audio decoders
+- AudioToolbox audio encoders
+- coreimage filter (GPU based image filtering on OSX)
+- libdcadec removed
+- bitstream filter for extracting DTS core
+- ADPCM IMA DAT4 decoder
+- musx demuxer
+- aix demuxer
+- remap filter
+- hash and framehash muxers
+- colorspace filter
+- hdcd filter
+- readvitc filter
+- VAAPI-accelerated format conversion and scaling
+- libnpp/CUDA-accelerated format conversion and scaling
+- Duck TrueMotion 2.0 Real Time decoder
+- Wideband Single-bit Data (WSD) demuxer
++- VAAPI-accelerate H.264 encoding
+
+version 3.0:
+- Common Encryption (CENC) MP4 encoding and decoding support
+- DXV decoding
+- extrastereo filter
+- ocr filter
+- alimiter filter
+- stereowiden filter
+- stereotools filter
+- rubberband filter
+- tremolo filter
+- agate filter
+- chromakey filter
+- maskedmerge filter
+- Screenpresso SPV1 decoding
+- chromaprint fingerprinting muxer
+- ffplay dynamic volume control
+- displace filter
+- selectivecolor filter
+- extensive native AAC encoder improvements and removal of experimental flag
+- ADPCM PSX decoder
+- 3dostr, dcstr, fsb, genh, vag, xvag, ads, msf, svag & vpk demuxer
+- zscale filter
+- wve demuxer
+- zero-copy Intel QSV transcoding in ffmpeg
+- shuffleframes filter
+- SDX2 DPCM decoder
+- vibrato filter
+- innoHeim/Rsupport Screen Capture Codec decoder
+- ADPCM AICA decoder
+- Interplay ACM demuxer and audio decoder
+- XMA1 & XMA2 decoder
+- realtime filter
+- anoisesrc audio filter source
+- IVR demuxer
+- compensationdelay filter
+- acompressor filter
+- support encoding 16-bit RLE SGI images
+- apulsator filter
+- sidechaingate audio filter
+- mipsdspr1 option has been renamed to mipsdsp
+- aemphasis filter
+- mips32r5 option has been removed
+- mips64r6 option has been removed
+- DXVA2-accelerated VP9 decoding
+- SOFAlizer: virtual binaural acoustics filter
+- VAAPI VP9 hwaccel
+- audio high-order multiband parametric equalizer
+- automatic bitstream filtering
+- showspectrumpic filter
+- libstagefright support removed
+- spectrumsynth filter
+- ahistogram filter
+- only seek with the right mouse button in ffplay
+- toggle full screen when double-clicking with the left mouse button in ffplay
+- afftfilt filter
+- convolution filter
+- libquvi support removed
+- support for dvaudio in wav and avi
+- libaacplus and libvo-aacenc support removed
+- Cineform HD decoder
+- new DCA decoder with full support for DTS-HD extensions
+- significant performance improvements in Windows Television (WTV) demuxer
+- nnedi deinterlacer
+- streamselect video and astreamselect audio filter
+- swaprect filter
+- metadata video and ametadata audio filter
+- SMPTE VC-2 HQ profile support for the Dirac decoder
+- SMPTE VC-2 native encoder supporting the HQ profile
+
+
+version 2.8:
+- colorkey video filter
+- BFSTM/BCSTM demuxer
+- little-endian ADPCM_THP decoder
+- Hap decoder and encoder
+- DirectDraw Surface image/texture decoder
+- ssim filter
+- optional new ASF demuxer
+- showvolume filter
+- Many improvements to the JPEG 2000 decoder
+- Go2Meeting decoding support
+- adrawgraph audio and drawgraph video filter
+- removegrain video filter
+- Intel QSV-accelerated MPEG-2 video and HEVC encoding
+- Intel QSV-accelerated MPEG-2 video and HEVC decoding
+- Intel QSV-accelerated VC-1 video decoding
+- libkvazaar HEVC encoder
+- erosion, dilation, deflate and inflate video filters
+- Dynamic Audio Normalizer as dynaudnorm filter
+- Reverse video and areverse audio filter
+- Random filter
+- deband filter
+- AAC fixed-point decoding
+- sidechaincompress audio filter
+- bitstream filter for converting HEVC from MP4 to Annex B
+- acrossfade audio filter
+- allyuv and allrgb video sources
+- atadenoise video filter
+- OS X VideoToolbox support
+- aphasemeter filter
+- showfreqs filter
+- vectorscope filter
+- waveform filter
+- hstack and vstack filter
+- Support DNx100 (1440x1080 at 8)
+- VAAPI hevc hwaccel
+- VDPAU hevc hwaccel
+- framerate filter
+- Switched default encoders for webm to VP9 and Opus
+- Removed experimental flag from the JPEG 2000 encoder
+
+
+version 2.7:
+- FFT video filter
+- TDSC decoder
+- DTS lossless extension (XLL) decoding (not lossless, disabled by default)
+- showwavespic filter
+- DTS decoding through libdcadec
+- Drop support for nvenc API before 5.0
+- nvenc HEVC encoder
+- Detelecine filter
+- Intel QSV-accelerated H.264 encoding
+- MMAL-accelerated H.264 decoding
+- basic APNG encoder and muxer with default extension "apng"
+- unpack DivX-style packed B-frames in MPEG-4 bitstream filter
+- WebM Live Chunk Muxer
+- nvenc level and tier options
+- chorus filter
+- Canopus HQ/HQA decoder
+- Automatically rotate videos based on metadata in ffmpeg
+- improved Quickdraw compatibility
+- VP9 high bit-depth and extended colorspaces decoding support
+- WebPAnimEncoder API when available for encoding and muxing WebP
+- Direct3D11-accelerated decoding
+- Support Secure Transport
+- Multipart JPEG demuxer
+
+
+version 2.6:
+- nvenc encoder
+- 10bit spp filter
+- colorlevels filter
+- RIFX format for *.wav files
- RTP/mpegts muxer
-- VP8 in Ogg demuxing
+- non continuous cache protocol support
+- tblend filter
+- cropdetect support for non 8bpp, absolute (if limit >= 1) and relative (if limit < 1.0) threshold
+- Camellia symmetric block cipher
- OpenH264 encoder wrapper
+- VOC seeking support
+- Closed caption Decoder
+- fspp, uspp, pp7 MPlayer postprocessing filters ported to native filters
+- showpalette filter
+- Twofish symmetric block cipher
- Support DNx100 (960x720 at 8)
-- Direct3D11-accelerated decoding
+- eq2 filter ported from libmpcodecs as eq filter
+- removed libmpcodecs
+- Changed default DNxHD colour range in QuickTime .mov derivatives to mpeg range
+- ported softpulldown filter from libmpcodecs as repeatfields filter
+- dcshift filter
+- RTP depacketizer for loss tolerant payload format for MP3 audio (RFC 5219)
+- RTP depacketizer for AC3 payload format (RFC 4184)
+- palettegen and paletteuse filters
+- VP9 RTP payload format (draft 0) experimental depacketizer
+- RTP depacketizer for DV (RFC 6469)
- DXVA2-accelerated HEVC decoding
- AAC ELD 480 decoding
- Intel QSV-accelerated H.264 decoding
diff --cc configure
index d995926,46f34e4..32b9892
--- a/configure
+++ b/configure
@@@ -5463,14 -4465,11 +5465,15 @@@ check_lib "CoreServices/CoreServices.h
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
+check_type "windows.h dxva.h" "DXVA_PicParams_VP9" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
+check_type "windows.h d3d11.h" "ID3D11VideoContext"
check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
+check_type "va/va.h" "VAPictureParameterBufferHEVC"
+check_type "va/va.h" "VADecPictureParameterBufferVP9"
check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
+ check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
diff --cc libavcodec/Makefile
index 69b5364,1562339..11d399e
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -312,11 -255,11 +312,12 @@@ OBJS-$(CONFIG_H264_DECODER)
h264_refs.o h264_sei.o \
h264_slice.o h264data.o h264_parse.o \
h2645_parse.o
+OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec_h264.o
OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o
-OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o
+OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o
OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h2645.o
OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
+ OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x.o
OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o
OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o
OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
diff --cc libavcodec/allcodecs.c
index fe882de,4d3eaa1..4bceac6
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -186,16 -162,11 +186,17 @@@ void avcodec_register_all(void
REGISTER_ENCDEC (H261, h261);
REGISTER_ENCDEC (H263, h263);
REGISTER_DECODER(H263I, h263i);
- REGISTER_ENCODER(H263P, h263p);
+ REGISTER_ENCDEC (H263P, h263p);
REGISTER_DECODER(H264, h264);
+ REGISTER_DECODER(H264_CRYSTALHD, h264_crystalhd);
+ REGISTER_DECODER(H264_MEDIACODEC, h264_mediacodec);
REGISTER_DECODER(H264_MMAL, h264_mmal);
REGISTER_DECODER(H264_QSV, h264_qsv);
+ REGISTER_DECODER(H264_VDA, h264_vda);
+#if FF_API_VDPAU
+ REGISTER_DECODER(H264_VDPAU, h264_vdpau);
+#endif
+ REGISTER_ENCODER(H264_VAAPI, h264_vaapi);
REGISTER_ENCDEC (HAP, hap);
REGISTER_DECODER(HEVC, hevc);
REGISTER_DECODER(HEVC_QSV, hevc_qsv);
diff --cc libavcodec/vaapi_encode_h264.c
index 0000000,12a0ec2..12bd71d
mode 000000,100644..100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@@ -1,0 -1,847 +1,847 @@@
+ /*
- * This file is part of Libav.
++ * This file is part of FFmpeg.
+ *
- * Libav is free software; you can redistribute it and/or
++ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
- * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
++ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #include <va/va.h>
+ #include <va/va_enc_h264.h>
+
+ #include "libavutil/avassert.h"
+ #include "libavutil/internal.h"
+ #include "libavutil/opt.h"
+ #include "libavutil/pixfmt.h"
+
+ #include "avcodec.h"
+ #include "h264.h"
+ #include "internal.h"
+ #include "vaapi_encode.h"
+ #include "vaapi_encode_h26x.h"
+
+ enum {
+ SLICE_TYPE_P = 0,
+ SLICE_TYPE_B = 1,
+ SLICE_TYPE_I = 2,
+ SLICE_TYPE_SP = 3,
+ SLICE_TYPE_SI = 4,
+ };
+
+ // This structure contains all possibly-useful per-sequence syntax elements
+ // which are not already contained in the various VAAPI structures.
+ typedef struct VAAPIEncodeH264MiscSequenceParams {
+ unsigned int profile_idc;
+ char constraint_set0_flag;
+ char constraint_set1_flag;
+ char constraint_set2_flag;
+ char constraint_set3_flag;
+ char constraint_set4_flag;
+ char constraint_set5_flag;
+
+ char separate_colour_plane_flag;
+ char qpprime_y_zero_transform_bypass_flag;
+
+ char gaps_in_frame_num_allowed_flag;
+ char delta_pic_order_always_zero_flag;
+ char bottom_field_pic_order_in_frame_present_flag;
+
+ unsigned int num_slice_groups_minus1;
+ unsigned int slice_group_map_type;
+
+ int pic_init_qs_minus26;
+
+ char vui_parameters_present_flag;
+ } VAAPIEncodeH264MiscSequenceParams;
+
+ // This structure contains all possibly-useful per-slice syntax elements
+ // which are not already contained in the various VAAPI structures.
+ typedef struct VAAPIEncodeH264MiscSliceParams {
+ unsigned int nal_unit_type;
+ unsigned int nal_ref_idc;
+
+ unsigned int colour_plane_id;
+ char field_pic_flag;
+ char bottom_field_flag;
+
+ unsigned int redundant_pic_cnt;
+
+ char sp_for_switch_flag;
+ int slice_qs_delta;
+
+ char ref_pic_list_modification_flag_l0;
+ char ref_pic_list_modification_flag_l1;
+
+ char no_output_of_prior_pics_flag;
+ char long_term_reference_flag;
+ char adaptive_ref_pic_marking_mode_flag;
+ } VAAPIEncodeH264MiscSliceParams;
+
+ typedef struct VAAPIEncodeH264Slice {
+ VAAPIEncodeH264MiscSliceParams misc_slice_params;
+ } VAAPIEncodeH264Slice;
+
+ typedef struct VAAPIEncodeH264Context {
+ VAAPIEncodeH264MiscSequenceParams misc_sequence_params;
+
+ int mb_width;
+ int mb_height;
+
+ int fixed_qp_idr;
+ int fixed_qp_p;
+ int fixed_qp_b;
+
+ int64_t idr_pic_count;
+ int64_t last_idr_frame;
+
+ // RefPicList management.
+ } VAAPIEncodeH264Context;
+
+
+ #define vseq_var(name) vseq->name, name
+ #define vseq_field(name) vseq->seq_fields.bits.name, name
+ #define vpic_var(name) vpic->name, name
+ #define vpic_field(name) vpic->pic_fields.bits.name, name
+ #define vslice_var(name) vslice->name, name
+ #define vslice_field(name) vslice->slice_fields.bits.name, name
+ #define mseq_var(name) mseq->name, name
+ #define mslice_var(name) mslice->name, name
+
+ static void vaapi_encode_h264_write_nal_header(PutBitContext *pbc,
+ int nal_unit_type, int nal_ref_idc)
+ {
+ u(1, 0, forbidden_zero_bit);
+ u(2, nal_ref_idc, nal_ref_idc);
+ u(5, nal_unit_type, nal_unit_type);
+ }
+
+ static void vaapi_encode_h264_write_trailing_rbsp(PutBitContext *pbc)
+ {
+ u(1, 1, rbsp_stop_one_bit);
+ while (put_bits_count(pbc) & 7)
+ u(1, 0, rbsp_alignment_zero_bit);
+ }
+
+ static void vaapi_encode_h264_write_sps(PutBitContext *pbc,
+ VAAPIEncodeContext *ctx)
+ {
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+ int i;
+
+ vaapi_encode_h264_write_nal_header(pbc, NAL_SPS, 3);
+
+ u(8, mseq_var(profile_idc));
+ u(1, mseq_var(constraint_set0_flag));
+ u(1, mseq_var(constraint_set1_flag));
+ u(1, mseq_var(constraint_set2_flag));
+ u(1, mseq_var(constraint_set3_flag));
+ u(1, mseq_var(constraint_set4_flag));
+ u(1, mseq_var(constraint_set5_flag));
+ u(2, 0, reserved_zero_2bits);
+
+ u(8, vseq_var(level_idc));
+
+ ue(vseq_var(seq_parameter_set_id));
+
+ if (mseq->profile_idc == 100 || mseq->profile_idc == 110 ||
+ mseq->profile_idc == 122 || mseq->profile_idc == 244 ||
+ mseq->profile_idc == 44 || mseq->profile_idc == 83 ||
+ mseq->profile_idc == 86 || mseq->profile_idc == 118 ||
+ mseq->profile_idc == 128 || mseq->profile_idc == 138) {
+ ue(vseq_field(chroma_format_idc));
+
+ if (vseq->seq_fields.bits.chroma_format_idc == 3)
+ u(1, mseq_var(separate_colour_plane_flag));
+
+ ue(vseq_var(bit_depth_luma_minus8));
+ ue(vseq_var(bit_depth_chroma_minus8));
+
+ u(1, mseq_var(qpprime_y_zero_transform_bypass_flag));
+
+ u(1, vseq_field(seq_scaling_matrix_present_flag));
+ if (vseq->seq_fields.bits.seq_scaling_matrix_present_flag) {
+ av_assert0(0 && "scaling matrices not supported");
+ }
+ }
+
+ ue(vseq_field(log2_max_frame_num_minus4));
+ ue(vseq_field(pic_order_cnt_type));
+
+ if (vseq->seq_fields.bits.pic_order_cnt_type == 0) {
+ ue(vseq_field(log2_max_pic_order_cnt_lsb_minus4));
+ } else if (vseq->seq_fields.bits.pic_order_cnt_type == 1) {
+ u(1, mseq_var(delta_pic_order_always_zero_flag));
+ se(vseq_var(offset_for_non_ref_pic));
+ se(vseq_var(offset_for_top_to_bottom_field));
+ ue(vseq_var(num_ref_frames_in_pic_order_cnt_cycle));
+
+ for (i = 0; i < vseq->num_ref_frames_in_pic_order_cnt_cycle; i++)
+ se(vseq_var(offset_for_ref_frame[i]));
+ }
+
+ ue(vseq_var(max_num_ref_frames));
+ u(1, mseq_var(gaps_in_frame_num_allowed_flag));
+
+ ue(vseq->picture_width_in_mbs - 1, pic_width_in_mbs_minus1);
+ ue(vseq->picture_height_in_mbs - 1, pic_height_in_mbs_minus1);
+
+ u(1, vseq_field(frame_mbs_only_flag));
+ if (!vseq->seq_fields.bits.frame_mbs_only_flag)
+ u(1, vseq_field(mb_adaptive_frame_field_flag));
+
+ u(1, vseq_field(direct_8x8_inference_flag));
+
+ u(1, vseq_var(frame_cropping_flag));
+ if (vseq->frame_cropping_flag) {
+ ue(vseq_var(frame_crop_left_offset));
+ ue(vseq_var(frame_crop_right_offset));
+ ue(vseq_var(frame_crop_top_offset));
+ ue(vseq_var(frame_crop_bottom_offset));
+ }
+
+ u(1, mseq_var(vui_parameters_present_flag));
+
+ vaapi_encode_h264_write_trailing_rbsp(pbc);
+ }
+
+ static void vaapi_encode_h264_write_pps(PutBitContext *pbc,
+ VAAPIEncodeContext *ctx)
+ {
+ VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+
+ vaapi_encode_h264_write_nal_header(pbc, NAL_PPS, 3);
+
+ ue(vpic_var(pic_parameter_set_id));
+ ue(vpic_var(seq_parameter_set_id));
+
+ u(1, vpic_field(entropy_coding_mode_flag));
+ u(1, mseq_var(bottom_field_pic_order_in_frame_present_flag));
+
+ ue(mseq_var(num_slice_groups_minus1));
+ if (mseq->num_slice_groups_minus1 > 0) {
+ ue(mseq_var(slice_group_map_type));
+ av_assert0(0 && "slice groups not supported");
+ }
+
+ ue(vpic_var(num_ref_idx_l0_active_minus1));
+ ue(vpic_var(num_ref_idx_l1_active_minus1));
+
+ u(1, vpic_field(weighted_pred_flag));
+ u(2, vpic_field(weighted_bipred_idc));
+
+ se(vpic->pic_init_qp - 26, pic_init_qp_minus26);
+ se(mseq_var(pic_init_qs_minus26));
+ se(vpic_var(chroma_qp_index_offset));
+
+ u(1, vpic_field(deblocking_filter_control_present_flag));
+ u(1, vpic_field(constrained_intra_pred_flag));
+ u(1, vpic_field(redundant_pic_cnt_present_flag));
+ u(1, vpic_field(transform_8x8_mode_flag));
+
+ u(1, vpic_field(pic_scaling_matrix_present_flag));
+ if (vpic->pic_fields.bits.pic_scaling_matrix_present_flag) {
+ av_assert0(0 && "scaling matrices not supported");
+ }
+
+ se(vpic_var(second_chroma_qp_index_offset));
+
+ vaapi_encode_h264_write_trailing_rbsp(pbc);
+ }
+
+ static void vaapi_encode_h264_write_slice_header2(PutBitContext *pbc,
+ VAAPIEncodeContext *ctx,
+ VAAPIEncodePicture *pic,
+ VAAPIEncodeSlice *slice)
+ {
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
+ VAEncSliceParameterBufferH264 *vslice = slice->codec_slice_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+ VAAPIEncodeH264Slice *pslice = slice->priv_data;
+ VAAPIEncodeH264MiscSliceParams *mslice = &pslice->misc_slice_params;
+
+ vaapi_encode_h264_write_nal_header(pbc, mslice->nal_unit_type,
+ mslice->nal_ref_idc);
+
+ ue(vslice->macroblock_address, first_mb_in_slice);
+ ue(vslice_var(slice_type));
+ ue(vpic_var(pic_parameter_set_id));
+
+ if (mseq->separate_colour_plane_flag) {
+ u(2, mslice_var(colour_plane_id));
+ }
+
+ u(4 + vseq->seq_fields.bits.log2_max_frame_num_minus4,
+ (vpic->frame_num &
+ ((1 << (4 + vseq->seq_fields.bits.log2_max_frame_num_minus4)) - 1)),
+ frame_num);
+
+ if (!vseq->seq_fields.bits.frame_mbs_only_flag) {
+ u(1, mslice_var(field_pic_flag));
+ if (mslice->field_pic_flag)
+ u(1, mslice_var(bottom_field_flag));
+ }
+
+ if (vpic->pic_fields.bits.idr_pic_flag) {
+ ue(vslice_var(idr_pic_id));
+ }
+
+ if (vseq->seq_fields.bits.pic_order_cnt_type == 0) {
+ u(4 + vseq->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4,
+ vslice_var(pic_order_cnt_lsb));
+ if (mseq->bottom_field_pic_order_in_frame_present_flag &&
+ !mslice->field_pic_flag) {
+ se(vslice_var(delta_pic_order_cnt_bottom));
+ }
+ }
+
+ if (vseq->seq_fields.bits.pic_order_cnt_type == 1 &&
+ !vseq->seq_fields.bits.delta_pic_order_always_zero_flag) {
+ se(vslice_var(delta_pic_order_cnt[0]));
+ if (mseq->bottom_field_pic_order_in_frame_present_flag &&
+ !mslice->field_pic_flag) {
+ se(vslice_var(delta_pic_order_cnt[1]));
+ }
+ }
+
+ if (vpic->pic_fields.bits.redundant_pic_cnt_present_flag) {
+ ue(mslice_var(redundant_pic_cnt));
+ }
+
+ if (vslice->slice_type == SLICE_TYPE_B) {
+ u(1, vslice_var(direct_spatial_mv_pred_flag));
+ }
+
+ if (vslice->slice_type == SLICE_TYPE_P ||
+ vslice->slice_type == SLICE_TYPE_SP ||
+ vslice->slice_type == SLICE_TYPE_B) {
+ u(1, vslice_var(num_ref_idx_active_override_flag));
+ if (vslice->num_ref_idx_active_override_flag) {
+ ue(vslice_var(num_ref_idx_l0_active_minus1));
+ if (vslice->slice_type == SLICE_TYPE_B)
+ ue(vslice_var(num_ref_idx_l1_active_minus1));
+ }
+ }
+
+ if (mslice->nal_unit_type == 20 || mslice->nal_unit_type == 21) {
+ av_assert0(0 && "no MVC support");
+ } else {
+ if (vslice->slice_type % 5 != 2 && vslice->slice_type % 5 != 4) {
+ u(1, mslice_var(ref_pic_list_modification_flag_l0));
+ if (mslice->ref_pic_list_modification_flag_l0) {
+ av_assert0(0 && "ref pic list modification");
+ }
+ }
+ if (vslice->slice_type % 5 == 1) {
+ u(1, mslice_var(ref_pic_list_modification_flag_l1));
+ if (mslice->ref_pic_list_modification_flag_l1) {
+ av_assert0(0 && "ref pic list modification");
+ }
+ }
+ }
+
+ if ((vpic->pic_fields.bits.weighted_pred_flag &&
+ (vslice->slice_type == SLICE_TYPE_P ||
+ vslice->slice_type == SLICE_TYPE_SP)) ||
+ (vpic->pic_fields.bits.weighted_bipred_idc == 1 &&
+ vslice->slice_type == SLICE_TYPE_B)) {
+ av_assert0(0 && "prediction weights not supported");
+ }
+
+ av_assert0(mslice->nal_ref_idc > 0 ==
+ vpic->pic_fields.bits.reference_pic_flag);
+ if (mslice->nal_ref_idc != 0) {
+ if (vpic->pic_fields.bits.idr_pic_flag) {
+ u(1, mslice_var(no_output_of_prior_pics_flag));
+ u(1, mslice_var(long_term_reference_flag));
+ } else {
+ u(1, mslice_var(adaptive_ref_pic_marking_mode_flag));
+ if (mslice->adaptive_ref_pic_marking_mode_flag) {
+ av_assert0(0 && "MMCOs not supported");
+ }
+ }
+ }
+
+ if (vpic->pic_fields.bits.entropy_coding_mode_flag &&
+ vslice->slice_type != SLICE_TYPE_I &&
+ vslice->slice_type != SLICE_TYPE_SI) {
+ ue(vslice_var(cabac_init_idc));
+ }
+
+ se(vslice_var(slice_qp_delta));
+ if (vslice->slice_type == SLICE_TYPE_SP ||
+ vslice->slice_type == SLICE_TYPE_SI) {
+ if (vslice->slice_type == SLICE_TYPE_SP)
+ u(1, mslice_var(sp_for_switch_flag));
+ se(mslice_var(slice_qs_delta));
+ }
+
+ if (vpic->pic_fields.bits.deblocking_filter_control_present_flag) {
+ ue(vslice_var(disable_deblocking_filter_idc));
+ if (vslice->disable_deblocking_filter_idc != 1) {
+ se(vslice_var(slice_alpha_c0_offset_div2));
+ se(vslice_var(slice_beta_offset_div2));
+ }
+ }
+
+ if (mseq->num_slice_groups_minus1 > 0 &&
+ mseq->slice_group_map_type >= 3 && mseq->slice_group_map_type <= 5) {
+ av_assert0(0 && "slice groups not supported");
+ }
+
+ // No alignment - this need not be a byte boundary.
+ }
+
+ static int vaapi_encode_h264_write_sequence_header(AVCodecContext *avctx,
+ char *data, size_t *data_len)
+ {
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ PutBitContext pbc;
+ char tmp[256];
+ int err;
+ size_t nal_len, bit_len, bit_pos, next_len;
+
+ bit_len = *data_len;
+ bit_pos = 0;
+
+ init_put_bits(&pbc, tmp, sizeof(tmp));
+ vaapi_encode_h264_write_sps(&pbc, ctx);
+ nal_len = put_bits_count(&pbc);
+ flush_put_bits(&pbc);
+
+ next_len = bit_len - bit_pos;
+ err = ff_vaapi_encode_h26x_nal_unit_to_byte_stream(data + bit_pos / 8,
+ &next_len,
+ tmp, nal_len);
+ if (err < 0)
+ return err;
+ bit_pos += next_len;
+
+ init_put_bits(&pbc, tmp, sizeof(tmp));
+ vaapi_encode_h264_write_pps(&pbc, ctx);
+ nal_len = put_bits_count(&pbc);
+ flush_put_bits(&pbc);
+
+ next_len = bit_len - bit_pos;
+ err = ff_vaapi_encode_h26x_nal_unit_to_byte_stream(data + bit_pos / 8,
+ &next_len,
+ tmp, nal_len);
+ if (err < 0)
+ return err;
+ bit_pos += next_len;
+
+ *data_len = bit_pos;
+ return 0;
+ }
+
+ static int vaapi_encode_h264_write_slice_header(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic,
+ VAAPIEncodeSlice *slice,
+ char *data, size_t *data_len)
+ {
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ PutBitContext pbc;
+ char tmp[256];
+ size_t header_len;
+
+ init_put_bits(&pbc, tmp, sizeof(tmp));
+ vaapi_encode_h264_write_slice_header2(&pbc, ctx, pic, slice);
+ header_len = put_bits_count(&pbc);
+ flush_put_bits(&pbc);
+
+ return ff_vaapi_encode_h26x_nal_unit_to_byte_stream(data, data_len,
+ tmp, header_len);
+ }
+
+ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
+ {
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
+ int i;
+
+ {
+ vseq->seq_parameter_set_id = 0;
+
+ vseq->level_idc = avctx->level;
+
+ vseq->max_num_ref_frames = 2;
+
+ vseq->picture_width_in_mbs = priv->mb_width;
+ vseq->picture_height_in_mbs = priv->mb_height;
+
+ vseq->seq_fields.bits.chroma_format_idc = 1;
+ vseq->seq_fields.bits.frame_mbs_only_flag = 1;
+ vseq->seq_fields.bits.direct_8x8_inference_flag = 1;
+ vseq->seq_fields.bits.log2_max_frame_num_minus4 = 4;
+ vseq->seq_fields.bits.pic_order_cnt_type = 0;
+
+ if (ctx->input_width != ctx->aligned_width ||
+ ctx->input_height != ctx->aligned_height) {
+ vseq->frame_cropping_flag = 1;
+
+ vseq->frame_crop_left_offset = 0;
+ vseq->frame_crop_right_offset =
+ (ctx->aligned_width - ctx->input_width) / 2;
+ vseq->frame_crop_top_offset = 0;
+ vseq->frame_crop_bottom_offset =
+ (ctx->aligned_height - ctx->input_height) / 2;
+ } else {
+ vseq->frame_cropping_flag = 0;
+ }
+ }
+
+ {
+ vpic->CurrPic.picture_id = VA_INVALID_ID;
+ vpic->CurrPic.flags = VA_PICTURE_H264_INVALID;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(vpic->ReferenceFrames); i++) {
+ vpic->ReferenceFrames[i].picture_id = VA_INVALID_ID;
+ vpic->ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ vpic->coded_buf = VA_INVALID_ID;
+
+ vpic->pic_parameter_set_id = 0;
+ vpic->seq_parameter_set_id = 0;
+
+ vpic->num_ref_idx_l0_active_minus1 = 0;
+ vpic->num_ref_idx_l1_active_minus1 = 0;
+
+ vpic->pic_fields.bits.entropy_coding_mode_flag =
+ ((avctx->profile & 0xff) != 66);
+ vpic->pic_fields.bits.weighted_pred_flag = 0;
+ vpic->pic_fields.bits.weighted_bipred_idc = 0;
+ vpic->pic_fields.bits.transform_8x8_mode_flag =
+ ((avctx->profile & 0xff) >= 100);
+
+ vpic->pic_init_qp = priv->fixed_qp_idr;
+ }
+
+ {
+ mseq->profile_idc = avctx->profile & 0xff;
+
+ if (avctx->profile & FF_PROFILE_H264_CONSTRAINED)
+ mseq->constraint_set1_flag = 1;
+ if (avctx->profile & FF_PROFILE_H264_INTRA)
+ mseq->constraint_set3_flag = 1;
+ }
+
+ return 0;
+ }
+
+ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic)
+ {
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ int i;
+
+ if (pic->type == PICTURE_TYPE_IDR) {
+ av_assert0(pic->display_order == pic->encode_order);
+ priv->last_idr_frame = pic->display_order;
+ } else {
+ av_assert0(pic->display_order > priv->last_idr_frame);
+ }
+
+ vpic->frame_num = (pic->encode_order - priv->last_idr_frame) &
+ ((1 << (4 + vseq->seq_fields.bits.log2_max_frame_num_minus4)) - 1);
+
+ vpic->CurrPic.picture_id = pic->recon_surface;
+ vpic->CurrPic.frame_idx = vpic->frame_num;
+ vpic->CurrPic.flags = 0;
+ vpic->CurrPic.TopFieldOrderCnt = pic->display_order;
+ vpic->CurrPic.BottomFieldOrderCnt = pic->display_order;
+
+ for (i = 0; i < pic->nb_refs; i++) {
+ VAAPIEncodePicture *ref = pic->refs[i];
+ av_assert0(ref && ref->encode_order >= priv->last_idr_frame);
+ vpic->ReferenceFrames[i].picture_id = ref->recon_surface;
+ vpic->ReferenceFrames[i].frame_idx =
+ ref->encode_order - priv->last_idr_frame;
+ vpic->ReferenceFrames[i].flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
+ vpic->ReferenceFrames[i].TopFieldOrderCnt = ref->display_order;
+ vpic->ReferenceFrames[i].BottomFieldOrderCnt = ref->display_order;
+ }
+ for (; i < FF_ARRAY_ELEMS(vpic->ReferenceFrames); i++) {
+ vpic->ReferenceFrames[i].picture_id = VA_INVALID_ID;
+ vpic->ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ vpic->coded_buf = pic->output_buffer;
+
+ vpic->pic_fields.bits.idr_pic_flag = (pic->type == PICTURE_TYPE_IDR);
+ vpic->pic_fields.bits.reference_pic_flag = (pic->type != PICTURE_TYPE_B);
+
+ pic->nb_slices = 1;
+
+ return 0;
+ }
+
+ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic,
+ VAAPIEncodeSlice *slice)
+ {
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params;
+ VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
+ VAEncSliceParameterBufferH264 *vslice = slice->codec_slice_params;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+ VAAPIEncodeH264Slice *pslice;
+ VAAPIEncodeH264MiscSliceParams *mslice;
+ int i;
+
+ slice->priv_data = av_mallocz(sizeof(*pslice));
+ if (!slice->priv_data)
+ return AVERROR(ENOMEM);
+ pslice = slice->priv_data;
+ mslice = &pslice->misc_slice_params;
+
+ if (pic->type == PICTURE_TYPE_IDR)
+ mslice->nal_unit_type = NAL_IDR_SLICE;
+ else
+ mslice->nal_unit_type = NAL_SLICE;
+
+ switch (pic->type) {
+ case PICTURE_TYPE_IDR:
+ vslice->slice_type = SLICE_TYPE_I;
+ mslice->nal_ref_idc = 3;
+ break;
+ case PICTURE_TYPE_I:
+ vslice->slice_type = SLICE_TYPE_I;
+ mslice->nal_ref_idc = 2;
+ break;
+ case PICTURE_TYPE_P:
+ vslice->slice_type = SLICE_TYPE_P;
+ mslice->nal_ref_idc = 1;
+ break;
+ case PICTURE_TYPE_B:
+ vslice->slice_type = SLICE_TYPE_B;
+ mslice->nal_ref_idc = 0;
+ break;
+ default:
+ av_assert0(0 && "invalid picture type");
+ }
+
+ // Only one slice per frame.
+ vslice->macroblock_address = 0;
+ vslice->num_macroblocks = priv->mb_width * priv->mb_height;
+
+ vslice->macroblock_info = VA_INVALID_ID;
+
+ vslice->pic_parameter_set_id = vpic->pic_parameter_set_id;
+ vslice->idr_pic_id = priv->idr_pic_count++;
+
+ vslice->pic_order_cnt_lsb = pic->display_order &
+ ((1 << (4 + vseq->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4)) - 1);
+
+ for (i = 0; i < FF_ARRAY_ELEMS(vslice->RefPicList0); i++) {
+ vslice->RefPicList0[i].picture_id = VA_INVALID_ID;
+ vslice->RefPicList0[i].flags = VA_PICTURE_H264_INVALID;
+ vslice->RefPicList1[i].picture_id = VA_INVALID_ID;
+ vslice->RefPicList1[i].flags = VA_PICTURE_H264_INVALID;
+ }
+
+ av_assert0(pic->nb_refs <= 2);
+ if (pic->nb_refs >= 1) {
+ // Backward reference for P or B frame.
+ av_assert0(pic->type == PICTURE_TYPE_P ||
+ pic->type == PICTURE_TYPE_B);
+
+ vslice->num_ref_idx_l0_active_minus1 = 0;
+ vslice->RefPicList0[0] = vpic->ReferenceFrames[0];
+ }
+ if (pic->nb_refs >= 2) {
+ // Forward reference for B frame.
+ av_assert0(pic->type == PICTURE_TYPE_B);
+
+ vslice->num_ref_idx_l1_active_minus1 = 0;
+ vslice->RefPicList1[0] = vpic->ReferenceFrames[1];
+ }
+
+ if (pic->type == PICTURE_TYPE_B)
+ vslice->slice_qp_delta = priv->fixed_qp_b - vpic->pic_init_qp;
+ else if (pic->type == PICTURE_TYPE_P)
+ vslice->slice_qp_delta = priv->fixed_qp_p - vpic->pic_init_qp;
+ else
+ vslice->slice_qp_delta = priv->fixed_qp_idr - vpic->pic_init_qp;
+
+ vslice->direct_spatial_mv_pred_flag = 1;
+
+ return 0;
+ }
+
+ static VAConfigAttrib vaapi_encode_h264_config_attributes[] = {
+ { .type = VAConfigAttribRTFormat,
+ .value = VA_RT_FORMAT_YUV420 },
+ { .type = VAConfigAttribRateControl,
+ .value = VA_RC_CQP },
+ { .type = VAConfigAttribEncPackedHeaders,
+ .value = (VA_ENC_PACKED_HEADER_SEQUENCE |
+ VA_ENC_PACKED_HEADER_SLICE) },
+ };
+
+ static av_cold int vaapi_encode_h264_init_internal(AVCodecContext *avctx)
+ {
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeH264Context *priv = ctx->priv_data;
+
+ switch (avctx->profile) {
+ case FF_PROFILE_H264_CONSTRAINED_BASELINE:
+ ctx->va_profile = VAProfileH264ConstrainedBaseline;
+ break;
+ case FF_PROFILE_H264_BASELINE:
+ ctx->va_profile = VAProfileH264Baseline;
+ break;
+ case FF_PROFILE_H264_MAIN:
+ ctx->va_profile = VAProfileH264Main;
+ break;
+ case FF_PROFILE_H264_EXTENDED:
+ av_log(avctx, AV_LOG_ERROR, "H.264 extended profile "
+ "is not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ case FF_PROFILE_UNKNOWN:
+ case FF_PROFILE_H264_HIGH:
+ ctx->va_profile = VAProfileH264High;
+ break;
+ case FF_PROFILE_H264_HIGH_10:
+ case FF_PROFILE_H264_HIGH_10_INTRA:
+ av_log(avctx, AV_LOG_ERROR, "H.264 10-bit profiles "
+ "are not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ case FF_PROFILE_H264_HIGH_422:
+ case FF_PROFILE_H264_HIGH_422_INTRA:
+ case FF_PROFILE_H264_HIGH_444:
+ case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
+ case FF_PROFILE_H264_HIGH_444_INTRA:
+ case FF_PROFILE_H264_CAVLC_444:
+ av_log(avctx, AV_LOG_ERROR, "H.264 non-4:2:0 profiles "
+ "are not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Unknown H.264 profile %d.\n",
+ avctx->profile);
+ return AVERROR(EINVAL);
+ }
+ ctx->va_entrypoint = VAEntrypointEncSlice;
+
+ ctx->va_rc_mode = VA_RC_CQP;
+
+ ctx->input_width = avctx->width;
+ ctx->input_height = avctx->height;
+ ctx->aligned_width = FFALIGN(ctx->input_width, 16);
+ ctx->aligned_height = FFALIGN(ctx->input_height, 16);
+ priv->mb_width = ctx->aligned_width / 16;
+ priv->mb_height = ctx->aligned_height / 16;
+
+ if (avctx->bit_rate > 0) {
+ av_log(avctx, AV_LOG_ERROR, "Constant bitrate encoding is not "
+ "supported!\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ priv->fixed_qp_p = avctx->global_quality;
+ if (avctx->i_quant_factor > 0.0)
+ priv->fixed_qp_idr = (int)((priv->fixed_qp_p * avctx->i_quant_factor +
+ avctx->i_quant_offset) + 0.5);
+ else
+ priv->fixed_qp_idr = priv->fixed_qp_p;
+ if (avctx->b_quant_factor > 0.0)
+ priv->fixed_qp_b = (int)((priv->fixed_qp_p * avctx->b_quant_factor +
+ avctx->b_quant_offset) + 0.5);
+ else
+ priv->fixed_qp_b = priv->fixed_qp_p;
+ av_log(avctx, AV_LOG_DEBUG, "QP = %d / %d / %d for IDR / P / B frames.\n",
+ priv->fixed_qp_idr, priv->fixed_qp_p, priv->fixed_qp_b);
+
+ ctx->config_attributes = vaapi_encode_h264_config_attributes;
+ ctx->nb_config_attributes =
+ FF_ARRAY_ELEMS(vaapi_encode_h264_config_attributes);
+
+ ctx->nb_recon_frames = 20;
+
+ return 0;
+ }
+
+ static VAAPIEncodeType vaapi_encode_type_h264 = {
+ .priv_data_size = sizeof(VAAPIEncodeH264Context),
+
+ .init = &vaapi_encode_h264_init_internal,
+
+ .sequence_params_size = sizeof(VAEncSequenceParameterBufferH264),
+ .init_sequence_params = &vaapi_encode_h264_init_sequence_params,
+
+ .picture_params_size = sizeof(VAEncPictureParameterBufferH264),
+ .init_picture_params = &vaapi_encode_h264_init_picture_params,
+
+ .slice_params_size = sizeof(VAEncSliceParameterBufferH264),
+ .init_slice_params = &vaapi_encode_h264_init_slice_params,
+
+ .sequence_header_type = VAEncPackedHeaderSequence,
+ .write_sequence_header = &vaapi_encode_h264_write_sequence_header,
+
+ .slice_header_type = VAEncPackedHeaderH264_Slice,
+ .write_slice_header = &vaapi_encode_h264_write_slice_header,
+ };
+
+ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)
+ {
+ return ff_vaapi_encode_init(avctx, &vaapi_encode_type_h264);
+ }
+
+ static const AVCodecDefault vaapi_encode_h264_defaults[] = {
+ { "profile", "100" },
+ { "level", "51" },
+ { "b", "0" },
+ { "bf", "2" },
+ { "g", "120" },
+ { "global_quality", "20" },
+ { "i_qfactor", "1.0" },
+ { "i_qoffset", "0.0" },
+ { "b_qfactor", "1.2" },
+ { "b_qoffset", "0.0" },
+ { NULL },
+ };
+
+ static const AVClass vaapi_encode_h264_class = {
+ .class_name = "h264_vaapi",
+ .item_name = av_default_item_name,
+ .version = LIBAVUTIL_VERSION_INT,
+ };
+
+ AVCodec ff_h264_vaapi_encoder = {
+ .name = "h264_vaapi",
+ .long_name = NULL_IF_CONFIG_SMALL("H.264/AVC (VAAPI)"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_H264,
+ .priv_data_size = sizeof(VAAPIEncodeContext),
+ .init = &vaapi_encode_h264_init,
+ .encode2 = &ff_vaapi_encode2,
+ .close = &ff_vaapi_encode_close,
+ .priv_class = &vaapi_encode_h264_class,
+ .capabilities = AV_CODEC_CAP_DELAY,
+ .defaults = vaapi_encode_h264_defaults,
+ .pix_fmts = (const enum AVPixelFormat[]) {
+ AV_PIX_FMT_VAAPI,
+ AV_PIX_FMT_NONE,
+ },
+ };
diff --cc libavcodec/vaapi_encode_h26x.c
index 0000000,bf9eb92..d806f9b
mode 000000,100644..100644
--- a/libavcodec/vaapi_encode_h26x.c
+++ b/libavcodec/vaapi_encode_h26x.c
@@@ -1,0 -1,68 +1,68 @@@
+ /*
- * This file is part of Libav.
++ * This file is part of FFmpeg.
+ *
- * Libav is free software; you can redistribute it and/or
++ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
- * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
++ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #include <stdint.h>
+
+ #include "vaapi_encode_h26x.h"
+
+ int ff_vaapi_encode_h26x_nal_unit_to_byte_stream(uint8_t *dst, size_t *dst_bit_len,
+ uint8_t *src, size_t src_bit_len)
+ {
+ size_t dp, sp;
+ int zero_run = 0;
+ size_t dst_len = *dst_bit_len / 8;
+ size_t src_len = (src_bit_len + 7) / 8;
+ int trailing_zeroes = src_len * 8 - src_bit_len;
+
+ if (dst_len < src_len + 4) {
+ // Definitely doesn't fit.
+ goto fail;
+ }
+
+ // Start code.
+ dst[0] = dst[1] = dst[2] = 0;
+ dst[3] = 1;
+ dp = 4;
+
+ for (sp = 0; sp < src_len; sp++) {
+ if (dp >= dst_len)
+ goto fail;
+ if (zero_run < 2) {
+ if (src[sp] == 0)
+ ++zero_run;
+ else
+ zero_run = 0;
+ } else {
+ if ((src[sp] & ~3) == 0) {
+ // emulation_prevention_three_byte
+ dst[dp++] = 3;
+ if (dp >= dst_len)
+ goto fail;
+ }
+ zero_run = src[sp] == 0;
+ }
+ dst[dp++] = src[sp];
+ }
+
+ *dst_bit_len = 8 * dp - trailing_zeroes;
+ return 0;
+
+ fail:
+ *dst_bit_len = 0;
+ return AVERROR(ENOSPC);
+ }
diff --cc libavcodec/vaapi_encode_h26x.h
index 0000000,d6db69a..f8c6e13
mode 000000,100644..100644
--- a/libavcodec/vaapi_encode_h26x.h
+++ b/libavcodec/vaapi_encode_h26x.h
@@@ -1,0 -1,45 +1,45 @@@
+ /*
- * This file is part of Libav.
++ * This file is part of FFmpeg.
+ *
- * Libav is free software; you can redistribute it and/or
++ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
- * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
++ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ #ifndef AVCODEC_VAAPI_ENCODE_H26X_H
+ #define AVCODEC_VAAPI_ENCODE_H26X_H
+
+ #include <stddef.h>
+ #include <stdint.h>
+
+ #include "golomb.h"
+ #include "put_bits.h"
+
+
+ // Debug code may be interested in the name of the syntax element being
+ // for tracing purposes. Here, it is just discarded.
+
+ #define write_u(pbc, width, value, name) put_bits(pbc, width, value)
+ #define write_ue(pbc, value, name) set_ue_golomb(pbc, value)
+ #define write_se(pbc, value, name) set_se_golomb(pbc, value)
+
+ #define u(width, ...) write_u(pbc, width, __VA_ARGS__)
+ #define ue(...) write_ue(pbc, __VA_ARGS__)
+ #define se(...) write_se(pbc, __VA_ARGS__)
+
+
+ // Copy from src to dst, applying emulation prevention.
+ int ff_vaapi_encode_h26x_nal_unit_to_byte_stream(uint8_t *dst, size_t *dst_len,
+ uint8_t *src, size_t src_len);
+
+ #endif /* AVCODEC_VAAPI_ENCODE_H26X_H */
diff --cc libavcodec/version.h
index 5840cf6,c7a5193..ec74bdd
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -27,9 -27,9 +27,9 @@@
#include "libavutil/version.h"
-#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 17
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MAJOR 57
- #define LIBAVCODEC_VERSION_MINOR 39
++#define LIBAVCODEC_VERSION_MINOR 40
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list