[FFmpeg-cvslog] avformat/rtpdec_rfc4175: add support for TCS
ffmpeg | branch: master | Limin Wang | Tue Oct 12 00:08:42 2021 +0800| [ca56fedab50b63b81ee62637df3d0c3eed64d7fe] | committer: Limin Wang avformat/rtpdec_rfc4175: add support for TCS Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca56fedab50b63b81ee62637df3d0c3eed64d7fe --- libavformat/rtpdec_rfc4175.c | 13 + 1 file changed, 13 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 060f725d3c..d45530e228 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -94,6 +94,19 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, else if (!strncmp(attr, "exactframerate", 14)) { if (av_parse_video_rate(>framerate, value) < 0) return AVERROR(EINVAL); +} else if (!strncmp(attr, "TCS", 3)) { +if (!strncmp(value, "SDR", 3)) +stream->codecpar->color_trc = AVCOL_TRC_BT709; +else if (!strncmp(value, "PQ", 2)) +stream->codecpar->color_trc = AVCOL_TRC_SMPTE2084; +else if (!strncmp(value, "HLG", 3)) +stream->codecpar->color_trc = AVCOL_TRC_ARIB_STD_B67; +else if (!strncmp(value, "LINEAR", 6)) +stream->codecpar->color_trc = AVCOL_TRC_LINEAR; +else if (!strncmp(value, "ST428-1", 7)) +stream->codecpar->color_trc = AVCOL_TRC_SMPTEST428_1; +else +stream->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; } return 0; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/rtpdec_rfc4175: add support for exactframerate
ffmpeg | branch: master | Limin Wang | Mon Oct 11 23:37:17 2021 +0800| [b07437f956f911dd76abb2ab0d5f3204a85e34da] | committer: Limin Wang avformat/rtpdec_rfc4175: add support for exactframerate Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b07437f956f911dd76abb2ab0d5f3204a85e34da --- libavformat/rtpdec_rfc4175.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 712c6830f9..060f725d3c 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -25,9 +25,11 @@ #include "rtpdec_formats.h" #include "libavutil/avstring.h" #include "libavutil/pixdesc.h" +#include "libavutil/parseutils.h" struct PayloadContext { char *sampling; +AVRational framerate; int depth; int width; int height; @@ -69,6 +71,11 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) stream->codecpar->bits_per_coded_sample = av_get_bits_per_pixel(desc); data->frame_size = data->width * data->height * data->pgroup / data->xinc; +if (data->framerate.den > 0) { +stream->avg_frame_rate = data->framerate; +stream->codecpar->bit_rate = data->frame_size * av_q2d(data->framerate) * 8; +} + return 0; } @@ -84,6 +91,10 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->sampling = av_strdup(value); else if (!strncmp(attr, "depth", 5)) data->depth = atoi(value); +else if (!strncmp(attr, "exactframerate", 14)) { +if (av_parse_video_rate(>framerate, value) < 0) +return AVERROR(EINVAL); +} return 0; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/rtpdec_rfc4175: add support for colorimetry
ffmpeg | branch: master | Limin Wang | Tue Oct 12 00:13:28 2021 +0800| [bad48dfe9ae345966a94852b45d4deb327895372] | committer: Limin Wang avformat/rtpdec_rfc4175: add support for colorimetry Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bad48dfe9ae345966a94852b45d4deb327895372 --- libavformat/rtpdec_rfc4175.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index d45530e228..93607d74e0 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -107,6 +107,17 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, stream->codecpar->color_trc = AVCOL_TRC_SMPTEST428_1; else stream->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; +} else if (!strncmp(attr, "colorimetry", 11)) { +if (!strncmp(value, "BT601", 5)) { +stream->codecpar->color_primaries = AVCOL_PRI_BT470BG; +stream->codecpar->color_space = AVCOL_SPC_BT470BG; +} else if (!strncmp(value, "BT709", 5)) { +stream->codecpar->color_primaries = AVCOL_PRI_BT709; +stream->codecpar->color_space = AVCOL_SPC_BT709; +} else if (!strncmp(value, "BT2020", 6)) { +stream->codecpar->color_primaries = AVCOL_PRI_BT2020; +stream->codecpar->color_space = AVCOL_SPC_BT2020_NCL; +} } return 0; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/rtpdec_rfc4175: add support for RANGE
ffmpeg | branch: master | Limin Wang | Tue Oct 12 00:17:14 2021 +0800| [fb4f9a204399e48d1567164ff7e7b348095cc37a] | committer: Limin Wang avformat/rtpdec_rfc4175: add support for RANGE Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb4f9a204399e48d1567164ff7e7b348095cc37a --- libavformat/rtpdec_rfc4175.c | 5 + 1 file changed, 5 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 93607d74e0..f50cad76d2 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -118,6 +118,11 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, stream->codecpar->color_primaries = AVCOL_PRI_BT2020; stream->codecpar->color_space = AVCOL_SPC_BT2020_NCL; } +} else if (!strncmp(attr, "RANGE", 5)) { +if (!strncmp(value, "NARROW", 6)) +stream->codecpar->color_range = AVCOL_RANGE_MPEG; +else if (!strncmp(value, "FULL", 4)) +stream->codecpar->color_range = AVCOL_RANGE_JPEG; } return 0; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/hevcdec: remove unused code
ffmpeg | branch: master | Limin Wang | Sat Oct 9 22:17:54 2021 +0800| [06548e6045e9785cf441c20a1fdc3414731d9080] | committer: Limin Wang avcodec/hevcdec: remove unused code Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06548e6045e9785cf441c20a1fdc3414731d9080 --- libavcodec/hevcdec.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 8963aa83ae..77fdf90da1 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -46,9 +46,6 @@ #define SHIFT_CTB_WPP 2 -//TODO: check if this is really the maximum -#define MAX_TRANSFORM_DEPTH 5 - #define MAX_TB_SIZE 32 #define MAX_QP 51 #define DEFAULT_INTRA_TC_OFFSET 2 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/hevc_filter: remove unneeded headers
ffmpeg | branch: master | Limin Wang | Sat Oct 9 22:00:50 2021 +0800| [5a91850b61d4546a6b5cce9bcd9d0891d4829528] | committer: Limin Wang avcodec/hevc_filter: remove unneeded headers Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a91850b61d4546a6b5cce9bcd9d0891d4829528 --- libavcodec/hevc_filter.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 6b9824088c..7e9478cd09 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -25,11 +25,8 @@ #include "libavutil/common.h" #include "libavutil/internal.h" -#include "cabac_functions.h" #include "hevcdec.h" -#include "bit_depth_template.c" - #define LUMA 0 #define CB 1 #define CR 2 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/hevc_filter: Correct indention
ffmpeg | branch: master | Limin Wang | Sat Oct 9 09:22:18 2021 +0800| [77970abb71d349bb9efea1b01619b8ec95411b94] | committer: Limin Wang avcodec/hevc_filter: Correct indention Signed-off-by: Limin Wang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77970abb71d349bb9efea1b01619b8ec95411b94 --- libavcodec/hevc_filter.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 7e9478cd09..3c45b5a39e 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -138,7 +138,7 @@ static int get_qPy(HEVCContext *s, int xC, int yC) static void copy_CTB(uint8_t *dst, const uint8_t *src, int width, int height, ptrdiff_t stride_dst, ptrdiff_t stride_src) { -int i, j; +int i, j; if (((intptr_t)dst | (intptr_t)src | stride_dst | stride_src) & 15) { for (i = 0; i < height; i++) { @@ -319,18 +319,18 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) x_ctb, y_ctb); if (s->ps.pps->transquant_bypass_enable_flag || (s->ps.sps->pcm.loop_filter_disable_flag && s->ps.sps->pcm_enabled_flag)) { -dst = lc->edge_emu_buffer; -stride_dst = 2*MAX_PB_SIZE; -copy_CTB(dst, src, width << s->ps.sps->pixel_shift, height, stride_dst, stride_src); -s->hevcdsp.sao_band_filter[tab](src, dst, stride_src, stride_dst, -sao->offset_val[c_idx], sao->band_position[c_idx], -width, height); -restore_tqb_pixels(s, src, dst, stride_src, stride_dst, - x, y, width, height, c_idx); +dst = lc->edge_emu_buffer; +stride_dst = 2*MAX_PB_SIZE; +copy_CTB(dst, src, width << s->ps.sps->pixel_shift, height, stride_dst, stride_src); +s->hevcdsp.sao_band_filter[tab](src, dst, stride_src, stride_dst, +sao->offset_val[c_idx], sao->band_position[c_idx], +width, height); +restore_tqb_pixels(s, src, dst, stride_src, stride_dst, + x, y, width, height, c_idx); } else { -s->hevcdsp.sao_band_filter[tab](src, src, stride_src, stride_src, -sao->offset_val[c_idx], sao->band_position[c_idx], -width, height); +s->hevcdsp.sao_band_filter[tab](src, src, stride_src, stride_src, +sao->offset_val[c_idx], sao->band_position[c_idx], +width, height); } sao->type_idx[c_idx] = SAO_APPLIED; break; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/speexdec: Seed should be unsigned otherwise the operations done on it are undefined
ffmpeg | branch: master | Michael Niedermayer | Tue Oct 12 14:50:41 2021 +0200| [85c169f6a62ad4e357ab139a4511854525938323] | committer: Michael Niedermayer avcodec/speexdec: Seed should be unsigned otherwise the operations done on it are undefined Fixes: signed integer overflow: 1664525000 + 1013904223 cannot be represented in type 'int' Fixes: 39865/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-4979694508834816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85c169f6a62ad4e357ab139a4511854525938323 --- libavcodec/speexdec.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index fccceab74c..4c50f54f27 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -140,7 +140,7 @@ typedef void (*innovation_quant_func)(float *, float *, /** Innovation unquantization function */ typedef void (*innovation_unquant_func)(float *, const void *, int, -GetBitContext *, int32_t *); +GetBitContext *, uint32_t *); typedef struct SpeexSubmode { int lbr_pitch; /**< Set to -1 for "normal" modes, otherwise encode pitch using @@ -191,7 +191,7 @@ typedef struct DecoderState { /* This is used in packet loss concealment */ int last_pitch; /**< Pitch of last correctly decoded frame */ float last_pitch_gain; /**< Pitch gain of last correctly decoded frame */ -int32_t seed; /** Seed used for random number generation */ +uint32_t seed; /** Seed used for random number generation */ int encode_submode; const SpeexSubmode *const *submodes; /**< Sub-mode data */ @@ -293,7 +293,7 @@ static void forced_pitch_unquant(float *exc, float *exc_out, int start, int end, gain_val[1] = pitch_coef; } -static inline float speex_rand(float std, int32_t *seed) +static inline float speex_rand(float std, uint32_t *seed) { const uint32_t jflone = 0x3f80; const uint32_t jflmsk = 0x007f; @@ -308,14 +308,14 @@ static inline float speex_rand(float std, int32_t *seed) } static void noise_codebook_unquant(float *exc, const void *par, int nsf, - GetBitContext *gb, int32_t *seed) + GetBitContext *gb, uint32_t *seed) { for (int i = 0; i < nsf; i++) exc[i] = speex_rand(1.f, seed); } static void split_cb_shape_sign_unquant(float *exc, const void *par, int nsf, -GetBitContext *gb, int32_t *seed) +GetBitContext *gb, uint32_t *seed) { int subvect_size, nb_subvect, have_sign, shape_bits; const SplitCodebookParams *params; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 4406903 web/download: Add FFmpeg 4.1.8
The branch, master has been updated via 4406903b534a0f60da807d2771d4ab2e55fcedc0 (commit) from 19467e4d46fbdcbc8b20e1e07424f361ee3f89ae (commit) - Log - commit 4406903b534a0f60da807d2771d4ab2e55fcedc0 Author: Michael Niedermayer AuthorDate: Sun Oct 17 20:02:08 2021 +0200 Commit: Michael Niedermayer CommitDate: Sun Oct 17 20:02:08 2021 +0200 web/download: Add FFmpeg 4.1.8 diff --git a/src/download b/src/download index 03e74b6..21eeb0b 100644 --- a/src/download +++ b/src/download @@ -413,10 +413,10 @@ libpostproc55. 5.100 - FFmpeg 4.1.7 "al-Khwarizmi" + FFmpeg 4.1.8 "al-Khwarizmi" -4.1.7 was released on 2021-09-11. It is the latest stable FFmpeg release +4.1.8 was released on 2021-10-17. It is the latest stable FFmpeg release from the 4.1 release branch, which was cut from master on 2018-11-02. It includes the following library versions: @@ -433,19 +433,19 @@ libpostproc55. 3.100 - Download xz tarball - PGP signature + Download xz tarball + PGP signature - Download bzip2 tarball - PGP signature + Download bzip2 tarball + PGP signature - Download gzip tarball - PGP signature + Download gzip tarball + PGP signature - https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1.7;>Changelog + https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1.8;>Changelog https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.1:/RELEASE_NOTES;>Release Notes --- Summary of changes: src/download | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Tag n4.1.8 : FFmpeg 4.1.8 release
[ffmpeg] [branch: refs/tags/n4.1.8] Tag:29d0aa36c4eb59b617d2c2270ad613cb02ec7e43 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=29d0aa36c4eb59b617d2c2270ad613cb02ec7e43 Tagger: Michael Niedermayer Date: Sun Oct 17 19:42:56 2021 +0200 FFmpeg 4.1.8 release ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Changelog: update
ffmpeg | branch: release/4.1 | Michael Niedermayer | Sun Oct 17 19:42:14 2021 +0200| [a5d2008e2a2360d351798e9abe883d603e231442] | committer: Michael Niedermayer Changelog: update Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5d2008e2a2360d351798e9abe883d603e231442 --- Changelog | 9 + 1 file changed, 9 insertions(+) diff --git a/Changelog b/Changelog index 2a25eb2c68..ba5a49d133 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,15 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version 4.1.8: +- configure: update copyright year +- avformat/wavdec: Check smv_block_size +- avformat/rmdec: Check for multiple audio_stream_info +- avcodec/apedec: Use 64bit to avoid overflow +- avcodec/apedec: Fix undefined integer overflow in long_filter_ehigh_3830() +- oavformat/avidec: Check offset in odml +- avformat/mpegts: use actually read packet size in mpegts_resync special case +- avfilter/scale_npp: fix non-aligned output frame dimensions +- Update for 4.1.8 - swscale/alphablend: Fix slice handling - avcodec/mxpegdec: Check for AVDISCARD_ALL - avcodec/flicvideo: Check remaining bytes in FLI*COPY ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".