August 2016 - ffmpeg-cvslog - lists.ffmpeg.org

h264: move the parameter set definitions to a new header file
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed May 18 09:40:33 2016 +0200| [f638b67e5790735f34620bf82025c9b9d6fc7216] | committer: Anton Khirnov h264: move the parameter set definitions to a new header file The PS parsing code is independent from the decoder, so it makes more sense for it to have its own separate header. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f638b67e5790735f3… --- libavcodec/dxva2_h264.c | 1 + libavcodec/h264.h | 2 + libavcodec/h264_direct.c | 1 + libavcodec/h264_loopfilter.c | 1 + libavcodec/h264_mb.c | 1 + libavcodec/h264_parse.c | 1 + libavcodec/h264_parse.h | 15 ++--- libavcodec/h264_parser.c | 1 + libavcodec/h264_ps.c | 4 +- libavcodec/h264_ps.h | 154 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/h264_slice.c | 1 + libavcodec/h264dec.c | 1 + libavcodec/h264dec.h | 122 +--------------------------------- libavcodec/vaapi_h264.c | 1 + libavcodec/vdpau_h264.c | 1 + 15 files changed, 176 insertions(+), 131 deletions(-) diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index c2ff15b..52c59fb 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -22,6 +22,7 @@ #include "h264dec.h" #include "h264data.h" +#include "h264_ps.h" #include "mpegutils.h" // The headers above may include w32threads.h, which uses the original diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 650371f..6a9b496 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -24,6 +24,8 @@ #ifndef AVCODEC_H264_H #define AVCODEC_H264_H +#define QP_MAX_NUM (51 + 2 * 6) // The maximum supported qp + /* NAL unit types */ enum { NAL_SLICE = 1, diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index d0d16e9..85a4760 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -28,6 +28,7 @@ #include "internal.h" #include "avcodec.h" #include "h264dec.h" +#include "h264_ps.h" #include "mpegutils.h" #include "rectangle.h" #include "thread.h" diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 71334e9..5004074 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -30,6 +30,7 @@ #include "internal.h" #include "avcodec.h" #include "h264dec.h" +#include "h264_ps.h" #include "mathops.h" #include "mpegutils.h" #include "rectangle.h" diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 55bf1c3..f037bd5 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -32,6 +32,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "h264dec.h" +#include "h264_ps.h" #include "qpeldsp.h" #include "thread.h" diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index ba67f4e..0aa6f09 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -22,6 +22,7 @@ #include "h264.h" #include "h264dec.h" #include "h264_parse.h" +#include "h264_ps.h" int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos, diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index fde1a45..5c6024d 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -25,6 +25,7 @@ #define AVCODEC_H264_PARSE_H #include "get_bits.h" +#include "h264_ps.h" typedef struct H264PredWeightTable { int use_weight; @@ -52,11 +53,7 @@ typedef struct H264POCContext { int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 } H264POCContext; -struct SPS; -struct PPS; -struct H264ParamSets; - -int ff_h264_pred_weight_table(GetBitContext *gb, const struct SPS *sps, +int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos, H264PredWeightTable *pwt); @@ -76,20 +73,20 @@ int ff_h264_check_intra_pred_mode(void *logctx, int top_samples_available, int mode, int is_chroma); int ff_h264_parse_ref_count(int *plist_count, int ref_count[2], - GetBitContext *gb, const struct PPS *pps, + GetBitContext *gb, const PPS *pps, int slice_type_nos, int picture_structure); int ff_h264_init_poc(int pic_field_poc[2], int *pic_poc, - const struct SPS *sps, H264POCContext *poc, + const SPS *sps, H264POCContext *poc, int picture_structure, int nal_ref_idc); -int ff_h264_decode_extradata(const uint8_t *data, int size, struct H264ParamSets *ps, +int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, int *is_avc, int *nal_length_size, int err_recognition, void *logctx); /** * compute profile from sps */ -int ff_h264_get_profile(const struct SPS *sps); +int ff_h264_get_profile(const SPS *sps); #endif /* AVCODEC_H264_PARSE_H */ diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 9e36118..9233cec 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -39,6 +39,7 @@ #include "h264.h" #include "h264dec.h" #include "h264_sei.h" +#include "h264_ps.h" #include "h264data.h" #include "internal.h" #include "mpegutils.h" diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 9b39992..46457a8 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -31,13 +31,15 @@ #include "internal.h" #include "mathops.h" #include "avcodec.h" -#include "h264dec.h" #include "h264data.h" +#include "h264_ps.h" #include "golomb.h" #define MAX_LOG2_MAX_FRAME_NUM (12 + 4) #define MIN_LOG2_MAX_FRAME_NUM 4 +#define EXTENDED_SAR 255 + static const AVRational pixel_aspect[17] = { { 0, 1 }, { 1, 1 }, diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h new file mode 100644 index 0000000..2835b87 --- /dev/null +++ b/libavcodec/h264_ps.h @@ -0,0 +1,154 @@ +/* + * This file is part of Libav. + * + * Libav 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * H.264 parameter set handling + */ + +#ifndef AVCODEC_H264_PS_H +#define AVCODEC_H264_PS_H + +#include <stdint.h> + +#include "libavutil/buffer.h" +#include "libavutil/pixfmt.h" +#include "libavutil/rational.h" + +#include "avcodec.h" +#include "get_bits.h" +#include "h264.h" + +#define MAX_SPS_COUNT 32 +#define MAX_PPS_COUNT 256 + +/** + * Sequence parameter set + */ +typedef struct SPS { + unsigned int sps_id; + int profile_idc; + int level_idc; + int chroma_format_idc; + int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag + int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 + int poc_type; ///< pic_order_cnt_type + int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 + int delta_pic_order_always_zero_flag; + int offset_for_non_ref_pic; + int offset_for_top_to_bottom_field; + int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle + int ref_frame_count; ///< num_ref_frames + int gaps_in_frame_num_allowed_flag; + int mb_width; ///< pic_width_in_mbs_minus1 + 1 + int mb_height; ///< pic_height_in_map_units_minus1 + 1 + int frame_mbs_only_flag; + int mb_aff; ///< mb_adaptive_frame_field_flag + int direct_8x8_inference_flag; + int crop; ///< frame_cropping_flag + + /* those 4 are already in luma samples */ + unsigned int crop_left; ///< frame_cropping_rect_left_offset + unsigned int crop_right; ///< frame_cropping_rect_right_offset + unsigned int crop_top; ///< frame_cropping_rect_top_offset + unsigned int crop_bottom; ///< frame_cropping_rect_bottom_offset + int vui_parameters_present_flag; + AVRational sar; + int video_signal_type_present_flag; + int full_range; + int colour_description_present_flag; + enum AVColorPrimaries color_primaries; + enum AVColorTransferCharacteristic color_trc; + enum AVColorSpace colorspace; + int timing_info_present_flag; + uint32_t num_units_in_tick; + uint32_t time_scale; + int fixed_frame_rate_flag; + short offset_for_ref_frame[256]; // FIXME dyn aloc? + int bitstream_restriction_flag; + int num_reorder_frames; + int scaling_matrix_present; + uint8_t scaling_matrix4[6][16]; + uint8_t scaling_matrix8[6][64]; + int nal_hrd_parameters_present_flag; + int vcl_hrd_parameters_present_flag; + int pic_struct_present_flag; + int time_offset_length; + int cpb_cnt; ///< See H.264 E.1.2 + int initial_cpb_removal_delay_length; ///< initial_cpb_removal_delay_length_minus1 + 1 + int cpb_removal_delay_length; ///< cpb_removal_delay_length_minus1 + 1 + int dpb_output_delay_length; ///< dpb_output_delay_length_minus1 + 1 + int bit_depth_luma; ///< bit_depth_luma_minus8 + 8 + int bit_depth_chroma; ///< bit_depth_chroma_minus8 + 8 + int residual_color_transform_flag; ///< residual_colour_transform_flag + int constraint_set_flags; ///< constraint_set[0-3]_flag +} SPS; + +/** + * Picture parameter set + */ +typedef struct PPS { + unsigned int sps_id; + int cabac; ///< entropy_coding_mode_flag + int pic_order_present; ///< pic_order_present_flag + int slice_group_count; ///< num_slice_groups_minus1 + 1 + int mb_slice_group_map_type; + unsigned int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 + int weighted_pred; ///< weighted_pred_flag + int weighted_bipred_idc; + int init_qp; ///< pic_init_qp_minus26 + 26 + int init_qs; ///< pic_init_qs_minus26 + 26 + int chroma_qp_index_offset[2]; + int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag + int constrained_intra_pred; ///< constrained_intra_pred_flag + int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag + int transform_8x8_mode; ///< transform_8x8_mode_flag + uint8_t scaling_matrix4[6][16]; + uint8_t scaling_matrix8[6][64]; + uint8_t chroma_qp_table[2][64]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table + int chroma_qp_diff; + + uint32_t dequant4_buffer[6][QP_MAX_NUM + 1][16]; + uint32_t dequant8_buffer[6][QP_MAX_NUM + 1][64]; + uint32_t(*dequant4_coeff[6])[16]; + uint32_t(*dequant8_coeff[6])[64]; +} PPS; + +typedef struct H264ParamSets { + AVBufferRef *sps_list[MAX_SPS_COUNT]; + AVBufferRef *pps_list[MAX_PPS_COUNT]; + + /* currently active parameters sets */ + const PPS *pps; + // FIXME this should properly be const + SPS *sps; +} H264ParamSets; + +/** + * Decode SPS + */ +int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, + H264ParamSets *ps); + +/** + * Decode PPS + */ +int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avctx, + H264ParamSets *ps, int bit_length); + +#endif /* AVCODEC_H264_PS_H */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1c4cf33..f07f37e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -40,6 +40,7 @@ #include "h264data.h" #include "h264chroma.h" #include "h264_mvpred.h" +#include "h264_ps.h" #include "golomb.h" #include "mathops.h" #include "mpegutils.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 94229fe..b4b78bd 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -42,6 +42,7 @@ #include "h264data.h" #include "h264chroma.h" #include "h264_mvpred.h" +#include "h264_ps.h" #include "golomb.h" #include "mathops.h" #include "me_cmp.h" diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index e79257e..fbe68c1 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -35,6 +35,7 @@ #include "cabac.h" #include "error_resilience.h" #include "h264_parse.h" +#include "h264_ps.h" #include "h264_sei.h" #include "h2645_parse.h" #include "h264chroma.h" @@ -50,9 +51,6 @@ #define H264_MAX_PICTURE_COUNT 32 -#define MAX_SPS_COUNT 32 -#define MAX_PPS_COUNT 256 - #define MAX_MMCO_COUNT 66 #define MAX_DELAYED_PIC_COUNT 16 @@ -99,117 +97,11 @@ #define CHROMA422(h) (h->ps.sps->chroma_format_idc == 2) #define CHROMA444(h) (h->ps.sps->chroma_format_idc == 3) -#define EXTENDED_SAR 255 - #define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit #define MB_TYPE_8x8DCT 0x01000000 #define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) -#define QP_MAX_NUM (51 + 2 * 6) // The maximum supported qp - -/** - * Sequence parameter set - */ -typedef struct SPS { - unsigned int sps_id; - int profile_idc; - int level_idc; - int chroma_format_idc; - int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag - int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 - int poc_type; ///< pic_order_cnt_type - int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 - int delta_pic_order_always_zero_flag; - int offset_for_non_ref_pic; - int offset_for_top_to_bottom_field; - int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle - int ref_frame_count; ///< num_ref_frames - int gaps_in_frame_num_allowed_flag; - int mb_width; ///< pic_width_in_mbs_minus1 + 1 - int mb_height; ///< pic_height_in_map_units_minus1 + 1 - int frame_mbs_only_flag; - int mb_aff; ///< mb_adaptive_frame_field_flag - int direct_8x8_inference_flag; - int crop; ///< frame_cropping_flag - - /* those 4 are already in luma samples */ - unsigned int crop_left; ///< frame_cropping_rect_left_offset - unsigned int crop_right; ///< frame_cropping_rect_right_offset - unsigned int crop_top; ///< frame_cropping_rect_top_offset - unsigned int crop_bottom; ///< frame_cropping_rect_bottom_offset - int vui_parameters_present_flag; - AVRational sar; - int video_signal_type_present_flag; - int full_range; - int colour_description_present_flag; - enum AVColorPrimaries color_primaries; - enum AVColorTransferCharacteristic color_trc; - enum AVColorSpace colorspace; - int timing_info_present_flag; - uint32_t num_units_in_tick; - uint32_t time_scale; - int fixed_frame_rate_flag; - short offset_for_ref_frame[256]; // FIXME dyn aloc? - int bitstream_restriction_flag; - int num_reorder_frames; - int scaling_matrix_present; - uint8_t scaling_matrix4[6][16]; - uint8_t scaling_matrix8[6][64]; - int nal_hrd_parameters_present_flag; - int vcl_hrd_parameters_present_flag; - int pic_struct_present_flag; - int time_offset_length; - int cpb_cnt; ///< See H.264 E.1.2 - int initial_cpb_removal_delay_length; ///< initial_cpb_removal_delay_length_minus1 + 1 - int cpb_removal_delay_length; ///< cpb_removal_delay_length_minus1 + 1 - int dpb_output_delay_length; ///< dpb_output_delay_length_minus1 + 1 - int bit_depth_luma; ///< bit_depth_luma_minus8 + 8 - int bit_depth_chroma; ///< bit_depth_chroma_minus8 + 8 - int residual_color_transform_flag; ///< residual_colour_transform_flag - int constraint_set_flags; ///< constraint_set[0-3]_flag -} SPS; - -/** - * Picture parameter set - */ -typedef struct PPS { - unsigned int sps_id; - int cabac; ///< entropy_coding_mode_flag - int pic_order_present; ///< pic_order_present_flag - int slice_group_count; ///< num_slice_groups_minus1 + 1 - int mb_slice_group_map_type; - unsigned int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 - int weighted_pred; ///< weighted_pred_flag - int weighted_bipred_idc; - int init_qp; ///< pic_init_qp_minus26 + 26 - int init_qs; ///< pic_init_qs_minus26 + 26 - int chroma_qp_index_offset[2]; - int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag - int constrained_intra_pred; ///< constrained_intra_pred_flag - int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag - int transform_8x8_mode; ///< transform_8x8_mode_flag - uint8_t scaling_matrix4[6][16]; - uint8_t scaling_matrix8[6][64]; - uint8_t chroma_qp_table[2][64]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table - int chroma_qp_diff; - - uint32_t dequant4_buffer[6][QP_MAX_NUM + 1][16]; - uint32_t dequant8_buffer[6][QP_MAX_NUM + 1][64]; - uint32_t(*dequant4_coeff[6])[16]; - uint32_t(*dequant8_coeff[6])[64]; -} PPS; - -typedef struct H264ParamSets { - AVBufferRef *sps_list[MAX_SPS_COUNT]; - AVBufferRef *pps_list[MAX_PPS_COUNT]; - - /* currently active parameters sets */ - const PPS *pps; - // FIXME this should properly be const - SPS *sps; -} H264ParamSets; - /** * Memory management control operation opcode. */ @@ -626,18 +518,6 @@ typedef struct H264Context { extern const uint16_t ff_h264_mb_sizes[4]; /** - * Decode SPS - */ -int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, - H264ParamSets *ps); - -/** - * Decode PPS - */ -int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avctx, - H264ParamSets *ps, int bit_length); - -/** * Reconstruct bitstream slice_type. */ int ff_h264_get_slice_type(const H264SliceContext *sl); diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index cd32bbb..931357a 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -22,6 +22,7 @@ #include "vaapi_internal.h" #include "h264dec.h" +#include "h264_ps.h" #include "mpegutils.h" /** diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 34dc630..3e13b76 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "internal.h" #include "h264dec.h" +#include "h264_ps.h" #include "mpegutils.h" #include "vdpau.h" #include "vdpau_internal.h"

1 0

avcodec/vp9_parser: Check the input frame sizes for being consistent
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Aug 1 13:50:21 2016 +0200| [8f6a95a103b4586bf79034c5c9e9764f7eb19b57] | committer: Michael Niedermayer avcodec/vp9_parser: Check the input frame sizes for being consistent Suggested-by: BBB Fixed-by: BBB Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 77b0f3f26d33d4f46f274896e0583ad1f5936b7c) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f6a95a103b4586bf… --- libavcodec/vp9_parser.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavcodec/vp9_parser.c b/libavcodec/vp9_parser.c index 2e9235e..9900e7a 100644 --- a/libavcodec/vp9_parser.c +++ b/libavcodec/vp9_parser.c @@ -28,6 +28,7 @@ typedef struct VP9ParseContext { int n_frames; // 1-8 int size[8]; + int marker_size; int64_t pts; } VP9ParseContext; @@ -89,6 +90,21 @@ static int parse(AVCodecParserContext *ctx, } if (s->n_frames > 0) { + int i; + int size_sum = 0; + + for (i = 0; i < s->n_frames ;i++) + size_sum += s->size[i]; + size_sum += s->marker_size; + + if (size_sum != size) { + av_log(avctx, AV_LOG_ERROR, "Inconsistent input frame sizes %d %d\n", + size_sum, size); + s->n_frames = 0; + } + } + + if (s->n_frames > 0) { *out_data = data; *out_size = s->size[--s->n_frames]; parse_frame(ctx, *out_data, *out_size); @@ -131,6 +147,7 @@ static int parse(AVCodecParserContext *ctx, data += sz; \ size -= sz; \ } \ + s->marker_size = size; \ parse_frame(ctx, *out_data, *out_size); \ return s->n_frames > 0 ? *out_size : full_size

1 0

libavformat/rtpdec_asf: zero initialize the AVIOContext struct
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Kacper Michajłow <kasper93(a)gmail.com> | Sat Jul 23 23:47:39 2016 +0200| [87d5146fb7b996a8bb0449ae19339015e02963b3] | committer: Michael Niedermayer libavformat/rtpdec_asf: zero initialize the AVIOContext struct This fixes crash in avformat_open_input() when accessing protocol_whitelist field. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit e947b75b1c76ef6793209c2c445b8c224a28717a) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87d5146fb7b996a8b… --- libavformat/rtpdec_asf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 8459a51..2c09fda 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -101,7 +101,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) { int ret = 0; if (av_strstart(p, "pgmpu:data:application/vnd.ms.wms-hdr.asfv1;base64,", &p)) { - AVIOContext pb; + AVIOContext pb = { 0 }; RTSPState *rt = s->priv_data; AVDictionary *opts = NULL; int len = strlen(p) * 6 / 8;

1 0

avformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index() when stream created or keyframe parsed
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Xinzheng Zhang <zhangxzheng(a)gmail.com> | Wed Jul 27 12:21:25 2016 +0800| [b4922daeadd22fd4fe825747ab2acc9574daf99d] | committer: Michael Niedermayer avformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index() when stream created or keyframe parsed Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit ad14aab3b4f88cdb6c2a3f8877c578e5a8042f1d) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4922daeadd22fd4f… --- libavformat/flvdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 633cad0..0afeba5 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -128,6 +128,7 @@ static void add_keyframes_index(AVFormatContext *s) static AVStream *create_stream(AVFormatContext *s, int codec_type) { + FLVContext *flv = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); if (!st) return NULL; @@ -138,6 +139,8 @@ static AVStream *create_stream(AVFormatContext *s, int codec_type) s->ctx_flags &= ~AVFMTCTX_NOHEADER; avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + flv->last_keyframe_stream_index = s->nb_streams - 1; + add_keyframes_index(s); return st; } @@ -413,7 +416,6 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m flv->keyframe_count = timeslen; times = NULL; filepositions = NULL; - add_keyframes_index(s); } else { invalid: av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); @@ -455,12 +457,14 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, } break; case AMF_DATA_TYPE_OBJECT: - if ((vstream || astream) && key && + if (key && ioc->seekable && !strcmp(KEYFRAMES_TAG, key) && depth == 1) if (parse_keyframes_index(s, ioc, max_pos) < 0) av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n"); + else + add_keyframes_index(s); while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) if (amf_parse_object(s, astream, vstream, str_val, max_pos,

1 0

avformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index()
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Xinzheng Zhang <zhangxzheng(a)gmail.com> | Wed Jul 27 12:21:24 2016 +0800| [88e3e6b94305839ca101e8bf2c4dd96700166c2f] | committer: Michael Niedermayer avformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit cd141e71bd3441ac9b7b720b934b7d4d85a75355) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88e3e6b94305839ca… --- libavformat/flvdec.c | 76 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 16 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 2bf1e05..633cad0 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -61,6 +61,11 @@ typedef struct FLVContext { int broken_sizes; int sum_flv_tag_size; + + int last_keyframe_stream_index; + int keyframe_count; + int64_t *keyframe_times; + int64_t *keyframe_filepositions; } FLVContext; static int probe(AVProbeData *p, int live) @@ -92,6 +97,35 @@ static int live_flv_probe(AVProbeData *p) return probe(p, 1); } +static void add_keyframes_index(AVFormatContext *s) +{ + FLVContext *flv = s->priv_data; + AVStream *stream = NULL; + unsigned int i = 0; + + if (flv->last_keyframe_stream_index < 0) { + av_log(s, AV_LOG_DEBUG, "keyframe stream hasn't been created\n"); + return; + } + + av_assert0(flv->last_keyframe_stream_index <= s->nb_streams); + stream = s->streams[flv->last_keyframe_stream_index]; + + if (stream->nb_index_entries == 0) { + for (i = 0; i < flv->keyframe_count; i++) { + av_add_index_entry(stream, flv->keyframe_filepositions[i], + flv->keyframe_times[i] * 1000, 0, 0, AVINDEX_KEYFRAME); + } + } else + av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n"); + + if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { + av_freep(&flv->keyframe_times); + av_freep(&flv->keyframe_filepositions); + flv->keyframe_count = 0; + } +} + static AVStream *create_stream(AVFormatContext *s, int codec_type) { AVStream *st = avformat_new_stream(s, NULL); @@ -305,8 +339,7 @@ static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize) return length; } -static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, - AVStream *vstream, int64_t max_pos) +static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t max_pos) { FLVContext *flv = s->priv_data; unsigned int timeslen = 0, fileposlen = 0, i; @@ -316,10 +349,12 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int ret = AVERROR(ENOSYS); int64_t initial_pos = avio_tell(ioc); - if (vstream->nb_index_entries>0) { - av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n"); + if (flv->keyframe_count > 0) { + av_log(s, AV_LOG_DEBUG, "keyframes have been paresed\n"); return 0; } + av_assert0(!flv->keyframe_times); + av_assert0(!flv->keyframe_filepositions); if (s->flags & AVFMT_FLAG_IGNIDX) return 0; @@ -368,15 +403,17 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, } if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) { - for (i = 0; i < fileposlen; i++) { - av_add_index_entry(vstream, filepositions[i], times[i] * 1000, - 0, 0, AVINDEX_KEYFRAME); - if (i < 2) { - flv->validate_index[i].pos = filepositions[i]; - flv->validate_index[i].dts = times[i] * 1000; - flv->validate_count = i + 1; - } + for (i = 0; i < FFMIN(2,fileposlen); i++) { + flv->validate_index[i].pos = filepositions[i]; + flv->validate_index[i].dts = times[i] * 1000; + flv->validate_count = i + 1; } + flv->keyframe_times = times; + flv->keyframe_filepositions = filepositions; + flv->keyframe_count = timeslen; + times = NULL; + filepositions = NULL; + add_keyframes_index(s); } else { invalid: av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); @@ -421,10 +458,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, if ((vstream || astream) && key && ioc->seekable && !strcmp(KEYFRAMES_TAG, key) && depth == 1) - if (parse_keyframes_index(s, ioc, vstream ? vstream : astream, + if (parse_keyframes_index(s, ioc, max_pos) < 0) av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n"); - while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) if (amf_parse_object(s, astream, vstream, str_val, max_pos, @@ -574,6 +610,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { + FLVContext *flv = s->priv_data; AMFDataType type; AVStream *stream, *astream, *vstream; AVStream av_unused *dstream; @@ -612,10 +649,14 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) // the lookup every time it is called. for (i = 0; i < s->nb_streams; i++) { stream = s->streams[i]; - if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) + if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { vstream = stream; - else if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) + flv->last_keyframe_stream_index = i; + } else if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { astream = stream; + if (flv->last_keyframe_stream_index == -1) + flv->last_keyframe_stream_index = i; + } else if (stream->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) dstream = stream; } @@ -643,6 +684,7 @@ static int flv_read_header(AVFormatContext *s) s->start_time = 0; flv->sum_flv_tag_size = 0; + flv->last_keyframe_stream_index = -1; return 0; } @@ -653,6 +695,8 @@ static int flv_read_close(AVFormatContext *s) FLVContext *flv = s->priv_data; for (i=0; i<FLV_STREAM_TYPE_NB; i++) av_freep(&flv->new_extradata[i]); + av_freep(&flv->keyframe_times); + av_freep(&flv->keyframe_filepositions); return 0; }

1 0

libavutil/opt: Small bugfix in example.
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Kacper Michajłow <kasper93(a)gmail.com> | Sat Jul 23 21:43:06 2016 +0200| [caf32880fdf9a06c03c65a6abef648d12ba99a1d] | committer: Michael Niedermayer libavutil/opt: Small bugfix in example. Fix const corectness and zero init the struct. This example code would actually crash when initializing string. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 69630f4d304a4e35d90957d6a170744af87cbf93) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=caf32880fdf9a06c0… --- libavutil/opt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.h b/libavutil/opt.h index 9a76a47..9430b98 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -58,7 +58,7 @@ * The following example illustrates an AVOptions-enabled struct: * @code * typedef struct test_struct { - * AVClass *class; + * const AVClass *class; * int int_opt; * char *str_opt; * uint8_t *bin_opt; @@ -96,7 +96,7 @@ * @code * test_struct *alloc_test_struct(void) * { - * test_struct *ret = av_malloc(sizeof(*ret)); + * test_struct *ret = av_mallocz(sizeof(*ret)); * ret->class = &test_class; * av_opt_set_defaults(ret); * return ret;

1 0

libx264: Increase x264 opts character limit to 4096
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Sasi Inguva <isasi-at-google.com(a)ffmpeg.org> | Thu Jul 21 18:52:41 2016 -0700| [7c01fa962e7fb08754f191a3840af56654fa0841] | committer: Michael Niedermayer libx264: Increase x264 opts character limit to 4096 Signed-off-by: Sasi Inguva <isasi(a)google.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 282477bf4534439ecb06f14d46446a4f1ab82284) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c01fa962e7fb0875… --- libavcodec/libx264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index c8f2380..b730c91 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -777,8 +777,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if(x4->x264opts){ const char *p= x4->x264opts; while(p){ - char param[256]={0}, val[256]={0}; - if(sscanf(p, "%255[^:=]=%255[^:]", param, val) == 1){ + char param[4096]={0}, val[4096]={0}; + if(sscanf(p, "%4095[^:=]=%4095[^:]", param, val) == 1){ OPT_STR(param, "1"); }else OPT_STR(param, val);

1 0

avcodec/h264_parser: Set sps/pps_ref
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: release/3.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Jul 2 03:06:27 2016 +0200| [e4eab67a0aed7c8962f7be2f482399048062e8a4] | committer: Michael Niedermayer avcodec/h264_parser: Set sps/pps_ref Fixes use of freed memory Should fix valgrind failures of fate-h264-skip-nointra Found-by: logan Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit febc862b53c090e530b943ebd873747addf5f913) Conflicts: libavcodec/h264_parser.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4eab67a0aed7c896… --- libavcodec/h264_parser.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index ce4bab2..52c1d41 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -367,13 +367,26 @@ static inline int parse_nal_units(AVCodecParserContext *s, "non-existing PPS %u referenced\n", pps_id); goto fail; } - p->ps.pps = (const PPS*)p->ps.pps_list[pps_id]->data; + + av_buffer_unref(&p->ps.pps_ref); + av_buffer_unref(&p->ps.sps_ref); + p->ps.pps = NULL; + p->ps.sps = NULL; + p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); + if (!p->ps.pps_ref) + goto fail; + p->ps.pps = (const PPS*)p->ps.pps_ref->data; + if (!p->ps.sps_list[p->ps.pps->sps_id]) { av_log(avctx, AV_LOG_ERROR, "non-existing SPS %u referenced\n", p->ps.pps->sps_id); goto fail; } - p->ps.sps = (SPS*)p->ps.sps_list[p->ps.pps->sps_id]->data; + + p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]); + if (!p->ps.sps_ref) + goto fail; + p->ps.sps = (SPS*)p->ps.sps_ref->data; sps = p->ps.sps;

1 0

avcodec/vp9_parser: Check the input frame sizes for being consistent
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Aug 1 13:50:21 2016 +0200| [77b0f3f26d33d4f46f274896e0583ad1f5936b7c] | committer: Michael Niedermayer avcodec/vp9_parser: Check the input frame sizes for being consistent Suggested-by: BBB Fixed-by: BBB Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77b0f3f26d33d4f46… --- libavcodec/vp9_parser.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavcodec/vp9_parser.c b/libavcodec/vp9_parser.c index 2e9235e..9900e7a 100644 --- a/libavcodec/vp9_parser.c +++ b/libavcodec/vp9_parser.c @@ -28,6 +28,7 @@ typedef struct VP9ParseContext { int n_frames; // 1-8 int size[8]; + int marker_size; int64_t pts; } VP9ParseContext; @@ -89,6 +90,21 @@ static int parse(AVCodecParserContext *ctx, } if (s->n_frames > 0) { + int i; + int size_sum = 0; + + for (i = 0; i < s->n_frames ;i++) + size_sum += s->size[i]; + size_sum += s->marker_size; + + if (size_sum != size) { + av_log(avctx, AV_LOG_ERROR, "Inconsistent input frame sizes %d %d\n", + size_sum, size); + s->n_frames = 0; + } + } + + if (s->n_frames > 0) { *out_data = data; *out_size = s->size[--s->n_frames]; parse_frame(ctx, *out_data, *out_size); @@ -131,6 +147,7 @@ static int parse(AVCodecParserContext *ctx, data += sz; \ size -= sz; \ } \ + s->marker_size = size; \ parse_frame(ctx, *out_data, *out_size); \ return s->n_frames > 0 ? *out_size : full_size

1 0

Doxygen: Re-enable JAVADOC_AUTOBRIEF
by git＠videolan.org 01 Aug '16

01 Aug '16

ffmpeg | branch: master | Timothy Gu <timothygu99(a)gmail.com> | Sun Jul 31 20:56:23 2016 -0700| [fd2cde02346c823b72377b74a5b52b1527ce02e2] | committer: Timothy Gu Doxygen: Re-enable JAVADOC_AUTOBRIEF > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd2cde02346c823b7… --- doc/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index c65d9ee..20f88f5 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -177,7 +177,7 @@ SHORT_NAMES = NO # description.) # The default value is: NO. -JAVADOC_AUTOBRIEF = NO +JAVADOC_AUTOBRIEF = YES # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first # line (until the first dot) of a Qt-style comment as the brief description. If

1 0