June 2016 - ffmpeg-cvslog - lists.ffmpeg.org

vaapi_h264: Add source version identifier as unregistered SEI
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Wed May 18 10:19:07 2016 +0100| [02fa1ad9266f9b1ea11565ac2f93f45853e351e8] | committer: Mark Thompson vaapi_h264: Add source version identifier as unregistered SEI Contains the libavcodec version, the VAAPI version and the libva driver vendor string. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02fa1ad9266f9b1ea… --- libavcodec/vaapi_encode_h264.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index d991469..a288980 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -606,6 +606,30 @@ static void vaapi_encode_h264_write_pic_timing(PutBitContext *pbc, } } +static void vaapi_encode_h264_write_identifier(PutBitContext *pbc, + VAAPIEncodeContext *ctx, + VAAPIEncodePicture *pic) +{ + const char *lavc = LIBAVCODEC_IDENT; + const char *vaapi = VA_VERSION_S; + const char *driver = vaQueryVendorString(ctx->hwctx->display); + char tmp[256]; + int i; + + // Random (version 4) ISO 11578 UUID. + uint8_t uuid[16] = { + 0x59, 0x94, 0x8b, 0x28, 0x11, 0xec, 0x45, 0xaf, + 0x96, 0x75, 0x19, 0xd4, 0x1f, 0xea, 0xa9, 0x4d, + }; + + for (i = 0; i < 16; i++) + u(8, uuid[i], uuid_iso_iec_11578); + + snprintf(tmp, sizeof(tmp), "%s / VAAPI %s / %s", lavc, vaapi, driver); + for (i = 0; i < sizeof(tmp) && tmp[i]; i++) + u(8, tmp[i], user_data_payload_byte); +} + static void vaapi_encode_h264_write_sei(PutBitContext *pbc, VAAPIEncodeContext *ctx, VAAPIEncodePicture *pic) @@ -633,6 +657,11 @@ static void vaapi_encode_h264_write_sei(PutBitContext *pbc, continue; write_payload = &vaapi_encode_h264_write_pic_timing; break; + case SEI_TYPE_USER_DATA_UNREGISTERED: + if (pic->encode_order != 0) + continue; + write_payload = &vaapi_encode_h264_write_identifier; + break; default: continue; }

1 0

vaapi_h264: Add support for SEI messages
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Tue May 17 15:52:58 2016 +0100| [48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8] | committer: Mark Thompson vaapi_h264: Add support for SEI messages Send buffering_period and pic_timing messages when in modes targetting bitrate. Also adds NAL HRD parameters to VUI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48e2967cd50c2e1a2… --- libavcodec/vaapi_encode_h264.c | 207 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 139e6e9..d991469 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "h264.h" +#include "h264_sei.h" #include "internal.h" #include "vaapi_encode.h" #include "vaapi_encode_h26x.h" @@ -84,6 +85,22 @@ typedef struct VAAPIEncodeH264MiscSequenceParams { char low_delay_hrd_flag; char pic_struct_present_flag; char bitstream_restriction_flag; + + unsigned int cpb_cnt_minus1; + unsigned int bit_rate_scale; + unsigned int cpb_size_scale; + unsigned int bit_rate_value_minus1[32]; + unsigned int cpb_size_value_minus1[32]; + char cbr_flag[32]; + unsigned int initial_cpb_removal_delay_length_minus1; + unsigned int cpb_removal_delay_length_minus1; + unsigned int dpb_output_delay_length_minus1; + unsigned int time_offset_length; + + unsigned int initial_cpb_removal_delay; + unsigned int initial_cpb_removal_delay_offset; + + unsigned int pic_struct; } VAAPIEncodeH264MiscSequenceParams; // This structure contains all possibly-useful per-slice syntax elements @@ -126,7 +143,11 @@ typedef struct VAAPIEncodeH264Context { int next_frame_num; int64_t idr_pic_count; + int cpb_delay; + int dpb_delay; + // Rate control configuration. + int send_timing_sei; struct { VAEncMiscParameterBuffer misc; VAEncMiscParameterRateControl rc; @@ -183,6 +204,7 @@ static void vaapi_encode_h264_write_vui(PutBitContext *pbc, VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params; VAAPIEncodeH264Context *priv = ctx->priv_data; VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params; + int i; u(1, vvui_field(aspect_ratio_info_present_flag)); if (vseq->vui_fields.bits.aspect_ratio_info_present_flag) { @@ -224,7 +246,18 @@ static void vaapi_encode_h264_write_vui(PutBitContext *pbc, u(1, mseq_var(nal_hrd_parameters_present_flag)); if (mseq->nal_hrd_parameters_present_flag) { - av_assert0(0 && "nal hrd parameters not supported"); + ue(mseq_var(cpb_cnt_minus1)); + u(4, mseq_var(bit_rate_scale)); + u(4, mseq_var(cpb_size_scale)); + for (i = 0; i <= mseq->cpb_cnt_minus1; i++) { + ue(mseq_var(bit_rate_value_minus1[i])); + ue(mseq_var(cpb_size_value_minus1[i])); + u(1, mseq_var(cbr_flag[i])); + } + u(5, mseq_var(initial_cpb_removal_delay_length_minus1)); + u(5, mseq_var(cpb_removal_delay_length_minus1)); + u(5, mseq_var(dpb_output_delay_length_minus1)); + u(5, mseq_var(time_offset_length)); } u(1, mseq_var(vcl_hrd_parameters_present_flag)); if (mseq->vcl_hrd_parameters_present_flag) { @@ -519,6 +552,110 @@ static void vaapi_encode_h264_write_slice_header2(PutBitContext *pbc, // No alignment - this need not be a byte boundary. } +static void vaapi_encode_h264_write_buffering_period(PutBitContext *pbc, + VAAPIEncodeContext *ctx, + VAAPIEncodePicture *pic) +{ + VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params; + VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params; + int i; + + ue(vpic_var(seq_parameter_set_id)); + + if (mseq->nal_hrd_parameters_present_flag) { + for (i = 0; i <= mseq->cpb_cnt_minus1; i++) { + u(mseq->initial_cpb_removal_delay_length_minus1 + 1, + mseq_var(initial_cpb_removal_delay)); + u(mseq->initial_cpb_removal_delay_length_minus1 + 1, + mseq_var(initial_cpb_removal_delay_offset)); + } + } + if (mseq->vcl_hrd_parameters_present_flag) { + av_assert0(0 && "vcl hrd parameters not supported"); + } +} + +static void vaapi_encode_h264_write_pic_timing(PutBitContext *pbc, + VAAPIEncodeContext *ctx, + VAAPIEncodePicture *pic) +{ + VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params; + VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params; + int i, num_clock_ts; + + if (mseq->nal_hrd_parameters_present_flag || + mseq->vcl_hrd_parameters_present_flag) { + u(mseq->cpb_removal_delay_length_minus1 + 1, + 2 * vseq->num_units_in_tick * priv->cpb_delay, + cpb_removal_delay); + u(mseq->dpb_output_delay_length_minus1 + 1, + 2 * vseq->num_units_in_tick * priv->dpb_delay, + dpb_output_delay); + } + if (mseq->pic_struct_present_flag) { + u(4, mseq_var(pic_struct)); + num_clock_ts = (mseq->pic_struct <= 2 ? 1 : + mseq->pic_struct <= 4 ? 2 : + mseq->pic_struct <= 8 ? 3 : 0); + for (i = 0; i < num_clock_ts; i++) { + u(1, 0, clock_timestamp_flag[i]); + // No full timestamp information. + } + } +} + +static void vaapi_encode_h264_write_sei(PutBitContext *pbc, + VAAPIEncodeContext *ctx, + VAAPIEncodePicture *pic) +{ + VAAPIEncodeH264Context *priv = ctx->priv_data; + PutBitContext payload_bits; + char payload[256]; + int payload_type, payload_size, i; + void (*write_payload)(PutBitContext *pbc, + VAAPIEncodeContext *ctx, + VAAPIEncodePicture *pic) = NULL; + + vaapi_encode_h264_write_nal_header(pbc, NAL_SEI, 0); + + for (payload_type = 0; payload_type < 64; payload_type++) { + switch (payload_type) { + case SEI_TYPE_BUFFERING_PERIOD: + if (!priv->send_timing_sei || + pic->type != PICTURE_TYPE_IDR) + continue; + write_payload = &vaapi_encode_h264_write_buffering_period; + break; + case SEI_TYPE_PIC_TIMING: + if (!priv->send_timing_sei) + continue; + write_payload = &vaapi_encode_h264_write_pic_timing; + break; + default: + continue; + } + + init_put_bits(&payload_bits, payload, sizeof(payload)); + write_payload(&payload_bits, ctx, pic); + if (put_bits_count(&payload_bits) & 7) { + write_u(&payload_bits, 1, 1, bit_equal_to_one); + while (put_bits_count(&payload_bits) & 7) + write_u(&payload_bits, 1, 0, bit_equal_to_zero); + } + payload_size = put_bits_count(&payload_bits) / 8; + flush_put_bits(&payload_bits); + + u(8, payload_type, last_payload_type_byte); + u(8, payload_size, last_payload_size_byte); + for (i = 0; i < payload_size; i++) + u(8, payload[i] & 0xff, sei_payload); + } + + vaapi_encode_h264_write_trailing_rbsp(pbc); +} + static int vaapi_encode_h264_write_sequence_header(AVCodecContext *avctx, char *data, size_t *data_len) { @@ -580,6 +717,32 @@ static int vaapi_encode_h264_write_slice_header(AVCodecContext *avctx, tmp, header_len); } +static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + int index, int *type, + char *data, size_t *data_len) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + PutBitContext pbc; + char tmp[256]; + size_t header_len; + + if (index == 0 && ctx->va_rc_mode == VA_RC_CBR) { + *type = VAEncPackedHeaderH264_SEI; + + init_put_bits(&pbc, tmp, sizeof(tmp)); + vaapi_encode_h264_write_sei(&pbc, ctx, pic); + 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); + + } else { + return AVERROR_EOF; + } +} + static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -660,6 +823,43 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) mseq->fixed_frame_rate_flag = 0; } + if (ctx->va_rc_mode == VA_RC_CBR) { + priv->send_timing_sei = 1; + mseq->nal_hrd_parameters_present_flag = 1; + + mseq->cpb_cnt_minus1 = 0; + + // Try to scale these to a sensible range so that the + // golomb encode of the value is not overlong. + mseq->bit_rate_scale = + av_clip(av_log2(avctx->bit_rate) - 15, 0, 15); + mseq->bit_rate_value_minus1[0] = + (avctx->bit_rate >> mseq->bit_rate_scale) - 1; + + mseq->cpb_size_scale = + av_clip(av_log2(priv->hrd_params.hrd.buffer_size) - 15, 0, 15); + mseq->cpb_size_value_minus1[0] = + (priv->hrd_params.hrd.buffer_size >> mseq->cpb_size_scale) - 1; + + // CBR mode isn't actually available here, despite naming. + mseq->cbr_flag[0] = 0; + + mseq->initial_cpb_removal_delay_length_minus1 = 23; + mseq->cpb_removal_delay_length_minus1 = 23; + mseq->dpb_output_delay_length_minus1 = 7; + mseq->time_offset_length = 0; + + // This calculation can easily overflow 32 bits. + mseq->initial_cpb_removal_delay = 90000 * + (uint64_t)priv->hrd_params.hrd.initial_buffer_fullness / + priv->hrd_params.hrd.buffer_size; + + mseq->initial_cpb_removal_delay_offset = 0; + } else { + priv->send_timing_sei = 0; + mseq->nal_hrd_parameters_present_flag = 0; + } + vseq->intra_period = ctx->p_per_i * (ctx->b_per_p + 1); vseq->intra_idr_period = vseq->intra_period; vseq->ip_period = ctx->b_per_p + 1; @@ -717,13 +917,16 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, av_assert0(pic->display_order == pic->encode_order); vpic->frame_num = 0; priv->next_frame_num = 1; + priv->cpb_delay = 0; } else { vpic->frame_num = priv->next_frame_num; if (pic->type != PICTURE_TYPE_B) { // nal_ref_idc != 0 ++priv->next_frame_num; } + ++priv->cpb_delay; } + priv->dpb_delay = pic->display_order - pic->encode_order + 1; vpic->frame_num = vpic->frame_num & ((1 << (4 + vseq->seq_fields.bits.log2_max_frame_num_minus4)) - 1); @@ -1056,6 +1259,8 @@ static VAAPIEncodeType vaapi_encode_type_h264 = { .slice_header_type = VAEncPackedHeaderH264_Slice, .write_slice_header = &vaapi_encode_h264_write_slice_header, + + .write_extra_header = &vaapi_encode_h264_write_extra_header, }; static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)

1 0

vaapi_encode: Add support for writing arbitrary additional packed headers
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Sat Apr 9 16:48:27 2016 +0100| [19d7667a81499d4357ec8e0851701e17c238e584] | committer: Mark Thompson vaapi_encode: Add support for writing arbitrary additional packed headers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19d7667a81499d435… --- libavcodec/vaapi_encode.c | 21 +++++++++++++++++++++ libavcodec/vaapi_encode.h | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 9da55c9..45f5e57 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -293,6 +293,27 @@ static int vaapi_encode_issue(AVCodecContext *avctx, } } + if (ctx->codec->write_extra_header) { + for (i = 0;; i++) { + int type; + bit_len = 8 * sizeof(data); + err = ctx->codec->write_extra_header(avctx, pic, i, &type, + data, &bit_len); + if (err == AVERROR_EOF) + break; + if (err < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to write extra " + "header %d: %d.\n", i, err); + goto fail; + } + + err = vaapi_encode_make_packed_header(avctx, pic, type, + data, bit_len); + if (err < 0) + goto fail; + } + } + av_assert0(pic->nb_slices <= MAX_PICTURE_SLICES); for (i = 0; i < pic->nb_slices; i++) { slice = av_mallocz(sizeof(*slice)); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index ec552da..85f3a0c 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -215,6 +215,10 @@ typedef struct VAAPIEncodeType { VAAPIEncodePicture *pic, int index, int *type, char *data, size_t *data_len); + int (*write_extra_header)(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + int index, int *type, + char *data, size_t *data_len); } VAAPIEncodeType;

1 0

vaapi_h264: Add support for VUI parameters
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Tue May 17 15:14:57 2016 +0100| [081961f819c0b16c7a860d7da7d39f1fd91bd2f0] | committer: Mark Thompson vaapi_h264: Add support for VUI parameters Supports aspect ratio, colour format and timing information. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=081961f819c0b16c7… --- libavcodec/vaapi_encode_h264.c | 126 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 2341b12..139e6e9 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -61,7 +61,29 @@ typedef struct VAAPIEncodeH264MiscSequenceParams { int pic_init_qs_minus26; - char vui_parameters_present_flag; + char overscan_info_present_flag; + char overscan_appropriate_flag; + + char video_signal_type_present_flag; + unsigned int video_format; + char video_full_range_flag; + char colour_description_present_flag; + unsigned int colour_primaries; + unsigned int transfer_characteristics; + unsigned int matrix_coefficients; + + char chroma_loc_info_present_flag; + unsigned int chroma_sample_loc_type_top_field; + unsigned int chroma_sample_loc_type_bottom_field; + + // Some timing elements are in VAEncSequenceParameterBufferH264. + char fixed_frame_rate_flag; + + char nal_hrd_parameters_present_flag; + char vcl_hrd_parameters_present_flag; + char low_delay_hrd_flag; + char pic_struct_present_flag; + char bitstream_restriction_flag; } VAAPIEncodeH264MiscSequenceParams; // This structure contains all possibly-useful per-slice syntax elements @@ -132,6 +154,7 @@ typedef struct VAAPIEncodeH264Options { #define vseq_var(name) vseq->name, name #define vseq_field(name) vseq->seq_fields.bits.name, name +#define vvui_field(name) vseq->vui_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 @@ -154,6 +177,71 @@ static void vaapi_encode_h264_write_trailing_rbsp(PutBitContext *pbc) u(1, 0, rbsp_alignment_zero_bit); } +static void vaapi_encode_h264_write_vui(PutBitContext *pbc, + VAAPIEncodeContext *ctx) +{ + VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params; + VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params; + + u(1, vvui_field(aspect_ratio_info_present_flag)); + if (vseq->vui_fields.bits.aspect_ratio_info_present_flag) { + u(8, vseq_var(aspect_ratio_idc)); + if (vseq->aspect_ratio_idc == 255) { + u(16, vseq_var(sar_width)); + u(16, vseq_var(sar_height)); + } + } + + u(1, mseq_var(overscan_info_present_flag)); + if (mseq->overscan_info_present_flag) + u(1, mseq_var(overscan_appropriate_flag)); + + u(1, mseq_var(video_signal_type_present_flag)); + if (mseq->video_signal_type_present_flag) { + u(3, mseq_var(video_format)); + u(1, mseq_var(video_full_range_flag)); + u(1, mseq_var(colour_description_present_flag)); + if (mseq->colour_description_present_flag) { + u(8, mseq_var(colour_primaries)); + u(8, mseq_var(transfer_characteristics)); + u(8, mseq_var(matrix_coefficients)); + } + } + + u(1, mseq_var(chroma_loc_info_present_flag)); + if (mseq->chroma_loc_info_present_flag) { + ue(mseq_var(chroma_sample_loc_type_top_field)); + ue(mseq_var(chroma_sample_loc_type_bottom_field)); + } + + u(1, vvui_field(timing_info_present_flag)); + if (vseq->vui_fields.bits.timing_info_present_flag) { + u(32, vseq_var(num_units_in_tick)); + u(32, vseq_var(time_scale)); + u(1, mseq_var(fixed_frame_rate_flag)); + } + + u(1, mseq_var(nal_hrd_parameters_present_flag)); + if (mseq->nal_hrd_parameters_present_flag) { + av_assert0(0 && "nal hrd parameters not supported"); + } + u(1, mseq_var(vcl_hrd_parameters_present_flag)); + if (mseq->vcl_hrd_parameters_present_flag) { + av_assert0(0 && "vcl hrd parameters not supported"); + } + + if (mseq->nal_hrd_parameters_present_flag || + mseq->vcl_hrd_parameters_present_flag) + u(1, mseq_var(low_delay_hrd_flag)); + u(1, mseq_var(pic_struct_present_flag)); + + u(1, vvui_field(bitstream_restriction_flag)); + if (vseq->vui_fields.bits.bitstream_restriction_flag) { + av_assert0(0 && "bitstream restrictions not supported"); + } +} + static void vaapi_encode_h264_write_sps(PutBitContext *pbc, VAAPIEncodeContext *ctx) { @@ -233,7 +321,9 @@ static void vaapi_encode_h264_write_sps(PutBitContext *pbc, ue(vseq_var(frame_crop_bottom_offset)); } - u(1, mseq_var(vui_parameters_present_flag)); + u(1, vseq_var(vui_parameters_present_flag)); + if (vseq->vui_parameters_present_flag) + vaapi_encode_h264_write_vui(pbc, ctx); vaapi_encode_h264_write_trailing_rbsp(pbc); } @@ -529,13 +619,45 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) vseq->frame_cropping_flag = 0; } + vseq->vui_parameters_present_flag = 1; + if (avctx->sample_aspect_ratio.num != 0) { + vseq->vui_fields.bits.aspect_ratio_info_present_flag = 1; + // There is a large enum of these which we could support + // individually rather than using the generic X/Y form? + if (avctx->sample_aspect_ratio.num == + avctx->sample_aspect_ratio.den) { + vseq->aspect_ratio_idc = 1; + } else { + vseq->aspect_ratio_idc = 255; // Extended SAR. + vseq->sar_width = avctx->sample_aspect_ratio.num; + vseq->sar_height = avctx->sample_aspect_ratio.den; + } + } + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || + avctx->color_trc != AVCOL_TRC_UNSPECIFIED || + avctx->colorspace != AVCOL_SPC_UNSPECIFIED) { + mseq->video_signal_type_present_flag = 1; + mseq->video_format = 5; // Unspecified. + mseq->video_full_range_flag = 0; + mseq->colour_description_present_flag = 1; + // These enums are derived from the standard and hence + // we can just use the values directly. + mseq->colour_primaries = avctx->color_primaries; + mseq->transfer_characteristics = avctx->color_trc; + mseq->matrix_coefficients = avctx->colorspace; + } + vseq->bits_per_second = avctx->bit_rate; + + vseq->vui_fields.bits.timing_info_present_flag = 1; if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { vseq->num_units_in_tick = avctx->framerate.num; vseq->time_scale = 2 * avctx->framerate.den; + mseq->fixed_frame_rate_flag = 1; } else { vseq->num_units_in_tick = avctx->time_base.num; vseq->time_scale = 2 * avctx->time_base.den; + mseq->fixed_frame_rate_flag = 0; } vseq->intra_period = ctx->p_per_i * (ctx->b_per_p + 1);

1 0

Merge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072'
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 11:56:57 2016 +0200| [fc0eafb7f8b289aa6dcef0c26b3f615f551925ab] | committer: Clément Bœsch Merge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072' * commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072': h264: drop unused H264Context.gb Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc0eafb7f8b289aa6… --- libavcodec/h264.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index efe3555..f91e5be 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -31,9 +31,9 @@ #include "libavutil/buffer.h" #include "libavutil/intreadwrite.h" #include "libavutil/thread.h" + #include "cabac.h" #include "error_resilience.h" -#include "get_bits.h" #include "h264_parse.h" #include "h264_sei.h" #include "h2645_parse.h" @@ -460,7 +460,6 @@ typedef struct H264Context { H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; - GetBitContext gb; H264Picture DPB[H264_MAX_PICTURE_COUNT]; H264Picture *cur_pic_ptr; ======================================================================

1 0

h264: drop unused H264Context.gb
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jun 9 10:29:55 2016 +0200| [2e4a7bd553ec7c805b4a3b90733405a14ba69072] | committer: Diego Biurrun h264: drop unused H264Context.gb Signed-off-by: Diego Biurrun <diego(a)biurrun.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e4a7bd553ec7c805… --- libavcodec/h264.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index bfbcc81..41ff1f9 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -31,9 +31,9 @@ #include "libavutil/buffer.h" #include "libavutil/intreadwrite.h" #include "libavutil/thread.h" + #include "cabac.h" #include "error_resilience.h" -#include "get_bits.h" #include "h264_parse.h" #include "h264_sei.h" #include "h2645_parse.h" @@ -445,7 +445,6 @@ typedef struct H264Context { H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; - GetBitContext gb; H264Picture DPB[H264_MAX_PICTURE_COUNT]; H264Picture *cur_pic_ptr;

1 0

Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 11:54:54 2016 +0200| [bef74ef367057b26fa3e5bb37db6dbdb8bfce159] | committer: Clément Bœsch Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352' * commit '4f81f8dba735c212efae077c4fec8ad4fe53b352': Drop unnecessary golomb.h #includes Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bef74ef367057b26f… --- libavcodec/ffv1.c | 1 - libavcodec/h264_cabac.c | 1 - libavcodec/h264_picture.c | 1 - libavcodec/hevc_filter.c | 1 - libavcodec/on2avc.c | 1 - 5 files changed, 5 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 60eb523..80a9434 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -36,7 +36,6 @@ #include "avcodec.h" #include "internal.h" #include "rangecoder.h" -#include "golomb.h" #include "mathops.h" #include "ffv1.h" diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 68d7282..eec1aa1 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -40,7 +40,6 @@ #include "h264.h" #include "h264data.h" #include "h264_mvpred.h" -#include "golomb.h" #include "mpegutils.h" #if ARCH_X86 diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 3e9b79a..7e2adda 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -37,7 +37,6 @@ #include "h264data.h" #include "h264chroma.h" #include "h264_mvpred.h" -#include "golomb.h" #include "mathops.h" #include "mpegutils.h" #include "rectangle.h" diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 1f33b0c..6918a55 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -26,7 +26,6 @@ #include "libavutil/internal.h" #include "cabac_functions.h" -#include "golomb.h" #include "hevc.h" #include "bit_depth_template.c" diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 5c816f4..d545fea 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -27,7 +27,6 @@ #include "bytestream.h" #include "fft.h" #include "get_bits.h" -#include "golomb.h" #include "internal.h" #include "on2avcdata.h" ====================================================================== diff --cc libavcodec/ffv1.c index 60eb523,89d27bb..80a9434 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@@ -26,17 -26,10 +26,16 @@@ */ #include "libavutil/attributes.h" +#include "libavutil/avassert.h" +#include "libavutil/crc.h" +#include "libavutil/opt.h" +#include "libavutil/imgutils.h" +#include "libavutil/pixdesc.h" +#include "libavutil/timer.h" #include "avcodec.h" -#include "put_bits.h" +#include "internal.h" #include "rangecoder.h" - #include "golomb.h" #include "mathops.h" #include "ffv1.h" diff --cc libavcodec/hevc_filter.c index 1f33b0c,39ac4ee..6918a55 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@@ -26,11 -26,8 +26,10 @@@ #include "libavutil/internal.h" #include "cabac_functions.h" - #include "golomb.h" #include "hevc.h" +#include "bit_depth_template.c" + #define LUMA 0 #define CB 1 #define CR 2

1 0

Merge commit '197ae68e78784524a7ccf97a3c301092715305d3'
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Wed Jun 29 11:52:34 2016 +0200| [4b9574b275c24404093061b35b910b8ce1fa86b9] | committer: Clément Bœsch Merge commit '197ae68e78784524a7ccf97a3c301092715305d3' * commit '197ae68e78784524a7ccf97a3c301092715305d3': Drop unnecessary unary.h #includes Merged-by: Clément Bœsch <clement(a)stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b9574b275c244040… --- libavcodec/h263.c | 1 - libavcodec/ituh263enc.c | 1 - libavcodec/on2avc.c | 1 - 3 files changed, 3 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 4720c56..0855ee7 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -35,7 +35,6 @@ #include "h263data.h" #include "mathops.h" #include "mpegutils.h" -#include "unary.h" #include "flv.h" #include "mpeg4video.h" diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index a8bfe91..ee09f29 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -37,7 +37,6 @@ #include "h263data.h" #include "mathops.h" #include "mpegutils.h" -#include "unary.h" #include "flv.h" #include "mpeg4video.h" #include "internal.h" diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 3064c6f..5c816f4 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -29,7 +29,6 @@ #include "get_bits.h" #include "golomb.h" #include "internal.h" -#include "unary.h" #include "on2avcdata.h" ======================================================================

1 0

Drop unnecessary golomb.h #includes
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Tue Jun 7 18:02:34 2016 +0200| [4f81f8dba735c212efae077c4fec8ad4fe53b352] | committer: Diego Biurrun Drop unnecessary golomb.h #includes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f81f8dba735c212e… --- libavcodec/ffv1.c | 1 - libavcodec/h264_cabac.c | 1 - libavcodec/h264_picture.c | 1 - libavcodec/hevc_filter.c | 1 - libavcodec/on2avc.c | 1 - 5 files changed, 5 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 05d3ad1..89d27bb 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -30,7 +30,6 @@ #include "avcodec.h" #include "put_bits.h" #include "rangecoder.h" -#include "golomb.h" #include "mathops.h" #include "ffv1.h" diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 5e7f3e7..80e4389 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -38,7 +38,6 @@ #include "h264.h" #include "h264data.h" #include "h264_mvpred.h" -#include "golomb.h" #include "mpegutils.h" #if ARCH_X86 diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index fb71fae..6c617a2 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -37,7 +37,6 @@ #include "h264data.h" #include "h264chroma.h" #include "h264_mvpred.h" -#include "golomb.h" #include "mathops.h" #include "mpegutils.h" #include "rectangle.h" diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 769977b..39ac4ee 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -26,7 +26,6 @@ #include "libavutil/internal.h" #include "cabac_functions.h" -#include "golomb.h" #include "hevc.h" #define LUMA 0 diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index a620bbf..2a528c6 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -26,7 +26,6 @@ #include "bytestream.h" #include "fft.h" #include "get_bits.h" -#include "golomb.h" #include "internal.h" #include "on2avcdata.h"

1 0

Drop unnecessary unary.h #includes
by git＠videolan.org 29 Jun '16

29 Jun '16

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Tue Jun 7 17:18:14 2016 +0200| [197ae68e78784524a7ccf97a3c301092715305d3] | committer: Diego Biurrun Drop unnecessary unary.h #includes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=197ae68e78784524a… --- libavcodec/h263.c | 1 - libavcodec/ituh263enc.c | 1 - libavcodec/on2avc.c | 1 - 3 files changed, 3 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 85d58cc..f3a7dab 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -35,7 +35,6 @@ #include "h263data.h" #include "mathops.h" #include "mpegutils.h" -#include "unary.h" #include "flv.h" #include "mpeg4video.h" diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index a62d202..313f5f3 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -37,7 +37,6 @@ #include "h263data.h" #include "mathops.h" #include "mpegutils.h" -#include "unary.h" #include "flv.h" #include "mpeg4video.h" #include "internal.h" diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 3918365..a620bbf 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -28,7 +28,6 @@ #include "get_bits.h" #include "golomb.h" #include "internal.h" -#include "unary.h" #include "on2avcdata.h"

1 0