September 2016 - ffmpeg-cvslog

swr: Update version & APIChanges for swr_build_matrix()
by git＠videolan.org 27 Sep '16

27 Sep '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Sep 27 15:26:13 2016 +0200| [fd902510ac927c0a252c931f5fb29719a8f56e9c] | committer: Michael Niedermayer swr: Update version & APIChanges for swr_build_matrix() Found-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd902510ac927c0a2… --- doc/APIchanges | 3 +++ libswresample/version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5d577e4..b5072cf 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-09-27 - 23c0779 - lswr 2.2.100 - swresample.h + Add swr_build_matrix(). + 2016-09-xx - xxxxxxx - lavc 57.58.100 - avcodec.h Add AV_CODEC_CAP_AVOID_PROBING codec capability flag. diff --git a/libswresample/version.h b/libswresample/version.h index b8e32c0..1f91402 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBSWRESAMPLE_VERSION_MAJOR 2 -#define LIBSWRESAMPLE_VERSION_MINOR 1 +#define LIBSWRESAMPLE_VERSION_MINOR 2 #define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \

1 0

[ffmpeg-web] branch master updated. 9bbd8f0 web/security: Add CVE-2016-6881 and CVE-2016-6164
by ffmpeg-git＠ffmpeg.org 27 Sep '16

27 Sep '16

The branch, master has been updated via 9bbd8f0e2a3f0ff0a05af02de19f88504f753939 (commit) from 23b62771473fc1bac6eb953d8cb211ec43464374 (commit) - Log ----------------------------------------------------------------- commit 9bbd8f0e2a3f0ff0a05af02de19f88504f753939 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Sep 27 14:01:41 2016 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Tue Sep 27 14:08:47 2016 +0200 web/security: Add CVE-2016-6881 and CVE-2016-6164 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/src/security b/src/security index 63c8376..3fbe965 100644 --- a/src/security +++ b/src/security @@ -8,6 +8,7 @@ Fixes following vulnerabilities: </p> <pre> CVE-2016-6920, 79f52a0dbd484aad111e4bf4a4f7047c7ceb6137 / 01aee8148d4fa439cce678a11f5110656c98de1f +CVE-2016-6881, 4770eac663da306fc8298ff8b73ebeabdc23489c / a453bbb68f3eec202673728988bba3bc76071761 </pre> <h3>3.1.2</h3> @@ -18,9 +19,38 @@ Fixes following vulnerabilities: CVE-2016-6671, 19d2921bbfec13c7a843bdbdb5687cf821b02cff / 6aa39080ccea2b60433e920417844c3a3c0da50b </pre> +<h3>3.1.1</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2016-6164, 3e730278f5a8e5ec3f9593700488a940f38dfac1 / 8a3221cc67a516dfc1700bdae3566ec52c7ee823 +</pre> + + +<h2>FFmpeg 3.0</h2> + +<h3>3.0.3</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2016-6164, a5680d83af26d4e6cfb9fe2eb8f51247bf36a41f / 8a3221cc67a516dfc1700bdae3566ec52c7ee823 +CVE-2016-6881, ca92adafb0effac6c51a12f90a593ba7e8b3ee90 / a453bbb68f3eec202673728988bba3bc76071761 +</pre> + <h2>FFmpeg 2.8</h2> +<h3>2.8.8</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2016-6164, 054db631200c9940bc72e4dec2cb3c75e613abaf / 8a3221cc67a516dfc1700bdae3566ec52c7ee823 +CVE-2016-6881, e965fedf7e94b7e50cd11be00fa729ee8faeb21b / a453bbb68f3eec202673728988bba3bc76071761 +</pre> + <h3>2.8.6</h3> <p> Fixes following vulnerabilities: ----------------------------------------------------------------------- Summary of changes: src/security | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) hooks/post-receive --

1 0

swresample: Add swr_build_matrix()
by git＠videolan.org 27 Sep '16

27 Sep '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Aug 18 01:08:50 2016 +0200| [23c0779cda8cedfa5e722677aecba18801a31278] | committer: Michael Niedermayer swresample: Add swr_build_matrix() API and Doxy documentation is taken from avresample_build_matrix() Fixes: Ticket5780 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23c0779cda8cedfa5… --- libswresample/rematrix.c | 157 +++++++++++++++++++++++++-------------------- libswresample/swresample.h | 31 +++++++++ 2 files changed, 117 insertions(+), 71 deletions(-) diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 0d6138d..1af2498 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -88,7 +88,7 @@ static int even(int64_t layout){ return 0; } -static int clean_layout(SwrContext *s, int64_t layout){ +static int clean_layout(void *s, int64_t layout){ if(layout && layout != AV_CH_FRONT_CENTER && !(layout&(layout-1))) { char buf[128]; av_get_channel_layout_string(buf, sizeof(buf), -1, layout); @@ -116,18 +116,20 @@ static int sane_layout(int64_t layout){ return 1; } -av_cold static int auto_matrix(SwrContext *s) +av_cold int swr_build_matrix(uint64_t in_ch_layout_param, uint64_t out_ch_layout_param, + double center_mix_level, double surround_mix_level, + double lfe_mix_level, double maxval, + double rematrix_volume, double *matrix_param, + int stride, enum AVMatrixEncoding matrix_encoding, void *log_context) { int i, j, out_i; double matrix[NUM_NAMED_CHANNELS][NUM_NAMED_CHANNELS]={{0}}; int64_t unaccounted, in_ch_layout, out_ch_layout; double maxcoef=0; char buf[128]; - const int matrix_encoding = s->matrix_encoding; - float maxval; - in_ch_layout = clean_layout(s, s->in_ch_layout); - out_ch_layout = clean_layout(s, s->out_ch_layout); + in_ch_layout = clean_layout(log_context, in_ch_layout_param); + out_ch_layout = clean_layout(log_context, out_ch_layout_param); if( out_ch_layout == AV_CH_LAYOUT_STEREO_DOWNMIX && (in_ch_layout & AV_CH_LAYOUT_STEREO_DOWNMIX) == 0 @@ -140,18 +142,17 @@ av_cold static int auto_matrix(SwrContext *s) in_ch_layout = AV_CH_LAYOUT_STEREO; if(!sane_layout(in_ch_layout)){ - av_get_channel_layout_string(buf, sizeof(buf), -1, s->in_ch_layout); - av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf); + av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout_param); + av_log(log_context, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf); return AVERROR(EINVAL); } if(!sane_layout(out_ch_layout)){ - av_get_channel_layout_string(buf, sizeof(buf), -1, s->out_ch_layout); - av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf); + av_get_channel_layout_string(buf, sizeof(buf), -1, out_ch_layout_param); + av_log(log_context, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf); return AVERROR(EINVAL); } - memset(s->matrix, 0, sizeof(s->matrix)); for(i=0; i<FF_ARRAY_ELEMS(matrix); i++){ if(in_ch_layout & out_ch_layout & (1ULL<<i)) matrix[i][i]= 1.0; @@ -166,8 +167,8 @@ av_cold static int auto_matrix(SwrContext *s) if(unaccounted & AV_CH_FRONT_CENTER){ if((out_ch_layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO){ if(in_ch_layout & AV_CH_LAYOUT_STEREO) { - matrix[ FRONT_LEFT][FRONT_CENTER]+= s->clev; - matrix[FRONT_RIGHT][FRONT_CENTER]+= s->clev; + matrix[ FRONT_LEFT][FRONT_CENTER]+= center_mix_level; + matrix[FRONT_RIGHT][FRONT_CENTER]+= center_mix_level; } else { matrix[ FRONT_LEFT][FRONT_CENTER]+= M_SQRT1_2; matrix[FRONT_RIGHT][FRONT_CENTER]+= M_SQRT1_2; @@ -180,7 +181,7 @@ av_cold static int auto_matrix(SwrContext *s) matrix[FRONT_CENTER][ FRONT_LEFT]+= M_SQRT1_2; matrix[FRONT_CENTER][FRONT_RIGHT]+= M_SQRT1_2; if(in_ch_layout & AV_CH_FRONT_CENTER) - matrix[FRONT_CENTER][ FRONT_CENTER] = s->clev*sqrt(2); + matrix[FRONT_CENTER][ FRONT_CENTER] = center_mix_level*sqrt(2); }else av_assert0(0); } @@ -196,18 +197,18 @@ av_cold static int auto_matrix(SwrContext *s) if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY || matrix_encoding == AV_MATRIX_ENCODING_DPLII) { if (unaccounted & (AV_CH_BACK_LEFT | AV_CH_SIDE_LEFT)) { - matrix[FRONT_LEFT ][BACK_CENTER] -= s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][BACK_CENTER] += s->slev * M_SQRT1_2; + matrix[FRONT_LEFT ][BACK_CENTER] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][BACK_CENTER] += surround_mix_level * M_SQRT1_2; } else { - matrix[FRONT_LEFT ][BACK_CENTER] -= s->slev; - matrix[FRONT_RIGHT][BACK_CENTER] += s->slev; + matrix[FRONT_LEFT ][BACK_CENTER] -= surround_mix_level; + matrix[FRONT_RIGHT][BACK_CENTER] += surround_mix_level; } } else { - matrix[ FRONT_LEFT][BACK_CENTER]+= s->slev*M_SQRT1_2; - matrix[FRONT_RIGHT][BACK_CENTER]+= s->slev*M_SQRT1_2; + matrix[ FRONT_LEFT][BACK_CENTER]+= surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][BACK_CENTER]+= surround_mix_level * M_SQRT1_2; } }else if(out_ch_layout & AV_CH_FRONT_CENTER){ - matrix[ FRONT_CENTER][BACK_CENTER]+= s->slev*M_SQRT1_2; + matrix[ FRONT_CENTER][BACK_CENTER]+= surround_mix_level * M_SQRT1_2; }else av_assert0(0); } @@ -225,22 +226,22 @@ av_cold static int auto_matrix(SwrContext *s) } }else if(out_ch_layout & AV_CH_FRONT_LEFT){ if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY) { - matrix[FRONT_LEFT ][BACK_LEFT ] -= s->slev * M_SQRT1_2; - matrix[FRONT_LEFT ][BACK_RIGHT] -= s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][BACK_LEFT ] += s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][BACK_RIGHT] += s->slev * M_SQRT1_2; + matrix[FRONT_LEFT ][BACK_LEFT ] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_LEFT ][BACK_RIGHT] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][BACK_LEFT ] += surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][BACK_RIGHT] += surround_mix_level * M_SQRT1_2; } else if (matrix_encoding == AV_MATRIX_ENCODING_DPLII) { - matrix[FRONT_LEFT ][BACK_LEFT ] -= s->slev * SQRT3_2; - matrix[FRONT_LEFT ][BACK_RIGHT] -= s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][BACK_LEFT ] += s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][BACK_RIGHT] += s->slev * SQRT3_2; + matrix[FRONT_LEFT ][BACK_LEFT ] -= surround_mix_level * SQRT3_2; + matrix[FRONT_LEFT ][BACK_RIGHT] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][BACK_LEFT ] += surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][BACK_RIGHT] += surround_mix_level * SQRT3_2; } else { - matrix[ FRONT_LEFT][ BACK_LEFT] += s->slev; - matrix[FRONT_RIGHT][BACK_RIGHT] += s->slev; + matrix[ FRONT_LEFT][ BACK_LEFT] += surround_mix_level; + matrix[FRONT_RIGHT][BACK_RIGHT] += surround_mix_level; } }else if(out_ch_layout & AV_CH_FRONT_CENTER){ - matrix[ FRONT_CENTER][BACK_LEFT ]+= s->slev*M_SQRT1_2; - matrix[ FRONT_CENTER][BACK_RIGHT]+= s->slev*M_SQRT1_2; + matrix[ FRONT_CENTER][BACK_LEFT ]+= surround_mix_level*M_SQRT1_2; + matrix[ FRONT_CENTER][BACK_RIGHT]+= surround_mix_level*M_SQRT1_2; }else av_assert0(0); } @@ -261,22 +262,22 @@ av_cold static int auto_matrix(SwrContext *s) matrix[BACK_CENTER][SIDE_RIGHT]+= M_SQRT1_2; }else if(out_ch_layout & AV_CH_FRONT_LEFT){ if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY) { - matrix[FRONT_LEFT ][SIDE_LEFT ] -= s->slev * M_SQRT1_2; - matrix[FRONT_LEFT ][SIDE_RIGHT] -= s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][SIDE_LEFT ] += s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][SIDE_RIGHT] += s->slev * M_SQRT1_2; + matrix[FRONT_LEFT ][SIDE_LEFT ] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_LEFT ][SIDE_RIGHT] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][SIDE_LEFT ] += surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][SIDE_RIGHT] += surround_mix_level * M_SQRT1_2; } else if (matrix_encoding == AV_MATRIX_ENCODING_DPLII) { - matrix[FRONT_LEFT ][SIDE_LEFT ] -= s->slev * SQRT3_2; - matrix[FRONT_LEFT ][SIDE_RIGHT] -= s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][SIDE_LEFT ] += s->slev * M_SQRT1_2; - matrix[FRONT_RIGHT][SIDE_RIGHT] += s->slev * SQRT3_2; + matrix[FRONT_LEFT ][SIDE_LEFT ] -= surround_mix_level * SQRT3_2; + matrix[FRONT_LEFT ][SIDE_RIGHT] -= surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][SIDE_LEFT ] += surround_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][SIDE_RIGHT] += surround_mix_level * SQRT3_2; } else { - matrix[ FRONT_LEFT][ SIDE_LEFT] += s->slev; - matrix[FRONT_RIGHT][SIDE_RIGHT] += s->slev; + matrix[ FRONT_LEFT][ SIDE_LEFT] += surround_mix_level; + matrix[FRONT_RIGHT][SIDE_RIGHT] += surround_mix_level; } }else if(out_ch_layout & AV_CH_FRONT_CENTER){ - matrix[ FRONT_CENTER][SIDE_LEFT ]+= s->slev*M_SQRT1_2; - matrix[ FRONT_CENTER][SIDE_RIGHT]+= s->slev*M_SQRT1_2; + matrix[ FRONT_CENTER][SIDE_LEFT ]+= surround_mix_level * M_SQRT1_2; + matrix[ FRONT_CENTER][SIDE_RIGHT]+= surround_mix_level * M_SQRT1_2; }else av_assert0(0); } @@ -294,10 +295,10 @@ av_cold static int auto_matrix(SwrContext *s) /* mix LFE into front left/right or center */ if (unaccounted & AV_CH_LOW_FREQUENCY) { if (out_ch_layout & AV_CH_FRONT_CENTER) { - matrix[FRONT_CENTER][LOW_FREQUENCY] += s->lfe_mix_level; + matrix[FRONT_CENTER][LOW_FREQUENCY] += lfe_mix_level; } else if (out_ch_layout & AV_CH_FRONT_LEFT) { - matrix[FRONT_LEFT ][LOW_FREQUENCY] += s->lfe_mix_level * M_SQRT1_2; - matrix[FRONT_RIGHT][LOW_FREQUENCY] += s->lfe_mix_level * M_SQRT1_2; + matrix[FRONT_LEFT ][LOW_FREQUENCY] += lfe_mix_level * M_SQRT1_2; + matrix[FRONT_RIGHT][LOW_FREQUENCY] += lfe_mix_level * M_SQRT1_2; } else av_assert0(0); } @@ -311,59 +312,73 @@ av_cold static int auto_matrix(SwrContext *s) if((in_ch_layout & (1ULL<<j)) == 0) continue; if (i < FF_ARRAY_ELEMS(matrix) && j < FF_ARRAY_ELEMS(matrix[0])) - s->matrix[out_i][in_i]= matrix[i][j]; + matrix_param[stride*out_i + in_i] = matrix[i][j]; else - s->matrix[out_i][in_i]= i == j && (in_ch_layout & out_ch_layout & (1ULL<<i)); - sum += fabs(s->matrix[out_i][in_i]); + matrix_param[stride*out_i + in_i] = i == j && (in_ch_layout & out_ch_layout & (1ULL<<i)); + sum += fabs(matrix_param[stride*out_i + in_i]); in_i++; } maxcoef= FFMAX(maxcoef, sum); out_i++; } - if(s->rematrix_volume < 0) - maxcoef = -s->rematrix_volume; - - if (s->rematrix_maxval > 0) { - maxval = s->rematrix_maxval; - } else if ( av_get_packed_sample_fmt(s->out_sample_fmt) < AV_SAMPLE_FMT_FLT - || av_get_packed_sample_fmt(s->int_sample_fmt) < AV_SAMPLE_FMT_FLT) { - maxval = 1.0; - } else - maxval = INT_MAX; + if(rematrix_volume < 0) + maxcoef = -rematrix_volume; - if(maxcoef > maxval || s->rematrix_volume < 0){ + if(maxcoef > maxval || rematrix_volume < 0){ maxcoef /= maxval; for(i=0; i<SWR_CH_MAX; i++) for(j=0; j<SWR_CH_MAX; j++){ - s->matrix[i][j] /= maxcoef; + matrix_param[stride*i + j] /= maxcoef; } } - if(s->rematrix_volume > 0){ + if(rematrix_volume > 0){ for(i=0; i<SWR_CH_MAX; i++) for(j=0; j<SWR_CH_MAX; j++){ - s->matrix[i][j] *= s->rematrix_volume; + matrix_param[stride*i + j] *= rematrix_volume; } } - av_log(s, AV_LOG_DEBUG, "Matrix coefficients:\n"); + av_log(log_context, AV_LOG_DEBUG, "Matrix coefficients:\n"); for(i=0; i<av_get_channel_layout_nb_channels(out_ch_layout); i++){ const char *c = av_get_channel_name(av_channel_layout_extract_channel(out_ch_layout, i)); - av_log(s, AV_LOG_DEBUG, "%s: ", c ? c : "?"); + av_log(log_context, AV_LOG_DEBUG, "%s: ", c ? c : "?"); for(j=0; j<av_get_channel_layout_nb_channels(in_ch_layout); j++){ c = av_get_channel_name(av_channel_layout_extract_channel(in_ch_layout, j)); - av_log(s, AV_LOG_DEBUG, "%s:%f ", c ? c : "?", s->matrix[i][j]); + av_log(log_context, AV_LOG_DEBUG, "%s:%f ", c ? c : "?", matrix_param[stride*i + j]); } - av_log(s, AV_LOG_DEBUG, "\n"); + av_log(log_context, AV_LOG_DEBUG, "\n"); } - if (s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) { + return 0; +} + +av_cold static int auto_matrix(SwrContext *s) +{ + double maxval; + int ret; + + if (s->rematrix_maxval > 0) { + maxval = s->rematrix_maxval; + } else if ( av_get_packed_sample_fmt(s->out_sample_fmt) < AV_SAMPLE_FMT_FLT + || av_get_packed_sample_fmt(s->int_sample_fmt) < AV_SAMPLE_FMT_FLT) { + maxval = 1.0; + } else + maxval = INT_MAX; + + memset(s->matrix, 0, sizeof(s->matrix)); + ret = swr_build_matrix(s->in_ch_layout, s->out_ch_layout, + s->clev, s->slev, s->lfe_mix_level, + maxval, s->rematrix_volume, (double*)s->matrix, + s->matrix[1] - s->matrix[0], s->matrix_encoding, s); + + if (ret >= 0 && s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) { int i; for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0])*FF_ARRAY_ELEMS(s->matrix[0]); i++) s->matrix_flt[0][i] = s->matrix[0][i]; } - return 0; + return ret; } av_cold int swri_rematrix_init(SwrContext *s){ diff --git a/libswresample/swresample.h b/libswresample/swresample.h index a09563b..a8db5c2 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -120,6 +120,7 @@ */ #include <stdint.h> +#include "libavutil/channel_layout.h" #include "libavutil/frame.h" #include "libavutil/samplefmt.h" @@ -366,6 +367,36 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map); /** + * Generate a channel mixing matrix. + * + * This function is the one used internally by libswresample for building the + * default mixing matrix. It is made public just as a utility function for + * building custom matrices. + * + * @param in_layout input channel layout + * @param out_layout output channel layout + * @param center_mix_level mix level for the center channel + * @param surround_mix_level mix level for the surround channel(s) + * @param lfe_mix_level mix level for the low-frequency effects channel + * @param rematrix_maxval if 1.0, coefficients will be normalized to prevent + * overflow. if INT_MAX, coefficients will not be + * normalized. + * @param[out] matrix mixing coefficients; matrix[i + stride * o] is + * the weight of input channel i in output channel o. + * @param stride distance between adjacent input channels in the + * matrix array + * @param matrix_encoding matrixed stereo downmix mode (e.g. dplii) + * @param log_ctx parent logging context, can be NULL + * @return 0 on success, negative AVERROR code on failure + */ +int swr_build_matrix(uint64_t in_layout, uint64_t out_layout, + double center_mix_level, double surround_mix_level, + double lfe_mix_level, double rematrix_maxval, + double rematrix_volume, double *matrix, + int stride, enum AVMatrixEncoding matrix_encoding, + void *log_ctx); + +/** * Set a customized remix matrix. * * @param s allocated Swr context, not yet initialized

1 0

swresample: Use double and float for matrixes for best quality and speed
by git＠videolan.org 27 Sep '16

27 Sep '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Aug 18 01:07:32 2016 +0200| [740f5105d5bdc6c9bab1a6aa0ccd3a3362d12daf] | committer: Michael Niedermayer swresample: Use double and float for matrixes for best quality and speed Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=740f5105d5bdc6c9b… --- libswresample/rematrix.c | 11 ++++++++++- libswresample/swresample_internal.h | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index ddba043..0d6138d 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -73,6 +73,9 @@ int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride) for (out = 0; out < nb_out; out++) { for (in = 0; in < nb_in; in++) s->matrix[out][in] = matrix[in]; + if (s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) + for (in = 0; in < nb_in; in++) + s->matrix_flt[out][in] = matrix[in]; matrix += stride; } s->rematrix_custom = 1; @@ -354,6 +357,12 @@ av_cold static int auto_matrix(SwrContext *s) } av_log(s, AV_LOG_DEBUG, "\n"); } + if (s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) { + int i; + for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0])*FF_ARRAY_ELEMS(s->matrix[0]); i++) + s->matrix_flt[0][i] = s->matrix[0][i]; + } + return 0; } @@ -513,7 +522,7 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus float v=0; for(j=0; j<s->matrix_ch[out_i][0]; j++){ in_i= s->matrix_ch[out_i][1+j]; - v+= ((float*)in->ch[in_i])[i] * s->matrix[out_i][in_i]; + v+= ((float*)in->ch[in_i])[i] * s->matrix_flt[out_i][in_i]; } ((float*)out->ch[out_i])[i]= v; } diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 88dbc86..f2ea5a2 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -168,7 +168,8 @@ struct SwrContext { struct ResampleContext *resample; ///< resampling context struct Resampler const *resampler; ///< resampler virtual function table - float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients + double matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients + float matrix_flt[SWR_CH_MAX][SWR_CH_MAX]; ///< single precision floating point rematrixing coefficients uint8_t *native_matrix; uint8_t *native_one; uint8_t *native_simd_one;

1 0

doc: Mention -dn in the "Stream selection" paragraph.
by git＠videolan.org 27 Sep '16

27 Sep '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Sep 27 09:07:17 2016 +0200| [dcc506a91e7745fc0e4d07e05ff8a13ee75ced41] | committer: Carl Eugen Hoyos doc: Mention -dn in the "Stream selection" paragraph. There is no "Data options" paragraph. Requested-by: ilker tezcan > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcc506a91e7745fc0… --- doc/ffmpeg.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 7368cdb..5255d2d 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -223,7 +223,7 @@ with the highest resolution, for audio, it is the stream with the most channels, subtitles, it is the first subtitle stream. In the case where several streams of the same type rate equally, the stream with the lowest index is chosen. -You can disable some of those defaults by using the @code{-vn/-an/-sn} options. For +You can disable some of those defaults by using the @code{-vn/-an/-sn/-dn} options. For full manual control, use the @code{-map} option, which disables the defaults just described.

1 0

ffprobe: don't access AVCodecContext.pkt_timebase directly
by git＠videolan.org 27 Sep '16

27 Sep '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Sep 26 22:45:39 2016 -0300| [64545dd6001355491084902008431e45b3f03c50] | committer: James Almer ffprobe: don't access AVCodecContext.pkt_timebase directly Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64545dd6001355491… --- ffprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffprobe.c b/ffprobe.c index e64c66e..b59f11e 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -2611,7 +2611,7 @@ static int open_input_file(InputFile *ifile, const char *filename) if (err < 0) exit(1); - ist->dec_ctx->pkt_timebase = stream->time_base; + av_codec_set_pkt_timebase(ist->dec_ctx, stream->time_base); #if FF_API_LAVF_AVCTX ist->dec_ctx->time_base = stream->codec->time_base; ist->dec_ctx->framerate = stream->codec->framerate;

1 0

avcodec/ansi: Check dimensions
by git＠videolan.org 26 Sep '16

26 Sep '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Sep 26 20:25:59 2016 +0200| [69449da436169e7facaa6d1f3bcbc41cf6ce2754] | committer: Michael Niedermayer avcodec/ansi: Check dimensions Fixes: 1.avi Found-by: 连一汉 <lianyihan(a)360.cn> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69449da436169e7fa… --- libavcodec/ansi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 4808ea7..19c88d8 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -94,6 +94,9 @@ static av_cold int decode_init(AVCodecContext *avctx) int ret = ff_set_dimensions(avctx, 80 << 3, 25 << 4); if (ret < 0) return ret; + } else if (avctx->width % FONT_WIDTH || avctx->height % s->font_height) { + av_log(avctx, AV_LOG_ERROR, "Invalid dimensions %d %d\n", avctx->width, avctx->height); + return AVERROR(EINVAL); } return 0; }

1 0

avcodec/mpegvideo_enc: fix memory leak
by git＠videolan.org 26 Sep '16

26 Sep '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Sep 25 15:41:47 2016 +0200| [99b823f0a1be42abc0f3a6a0da946c4464db5fb6] | committer: Timo Rothenpieler avcodec/mpegvideo_enc: fix memory leak When the input frames contain side data, it will accumulate endlessly in the coded frame, as av_frame_copy_props will append any new side data. Fixes ticket #5799. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99b823f0a1be42abc… --- libavcodec/mpegvideo_enc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 87d7954..5cd654f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1735,6 +1735,7 @@ static void frame_end(MpegEncContext *s) #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS + av_frame_unref(s->avctx->coded_frame); av_frame_copy_props(s->avctx->coded_frame, s->current_picture.f); FF_ENABLE_DEPRECATION_WARNINGS #endif

1 0

lavf/movenc: Allow to disable writing the timecode track.
by git＠videolan.org 26 Sep '16

26 Sep '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Sep 26 08:50:48 2016 +0200| [46aae846165c35e6d184087542dd3e610fa36506] | committer: Carl Eugen Hoyos lavf/movenc: Allow to disable writing the timecode track. Fixes ticket #5492. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46aae846165c35e6d… --- doc/muxers.texi | 3 +++ libavformat/movenc.c | 6 ++++-- libavformat/movenc.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 27eb9a0..c8a056f 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -884,6 +884,9 @@ the new default-base-is-moof flag instead. This flag is new from 14496-12:2012. This may make the fragments easier to parse in certain circumstances (avoiding basing track fragment location calculations on the implicit end of the previous track fragment). +@item -write_tmcd +Specify @code{on} to force writing a timecode track, @code{off} to disable it +and @code{auto} to write a timecode track only for mov and mp4 output (default). @end table @subsection Example diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0382309..449d0b5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -90,6 +90,7 @@ static const AVOption options[] = { { "encryption_key", "The media encryption key (hex)", offsetof(MOVMuxContext, encryption_key), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM }, { "encryption_kid", "The media encryption key identifier (hex)", offsetof(MOVMuxContext, encryption_kid), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM }, { "use_stream_ids_as_track_ids", "use stream ids as track ids", offsetof(MOVMuxContext, use_stream_ids_as_track_ids), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + { "write_tmcd", "force or disable writing tmcd", offsetof(MOVMuxContext, write_tmcd), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM}, { NULL }, }; @@ -2312,7 +2313,7 @@ static int mov_write_minf_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext } else if (track->tag == MKTAG('r','t','p',' ')) { mov_write_hmhd_tag(pb); } else if (track->tag == MKTAG('t','m','c','d')) { - if (track->mode == MODE_MP4) + if (track->mode != MODE_MOV) mov_write_nmhd_tag(pb); else mov_write_gmhd_tag(pb, track); @@ -5539,7 +5540,8 @@ static int mov_write_header(AVFormatContext *s) } } - if (mov->mode == MODE_MOV || mov->mode == MODE_MP4) { + if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode == MODE_MP4) + || mov->write_tmcd == 1) { tmcd_track = mov->nb_streams; /* +1 tmcd track for each video stream with a timecode */ diff --git a/libavformat/movenc.h b/libavformat/movenc.h index ea76e39..1f7a9d7 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -219,6 +219,7 @@ typedef struct MOVMuxContext { int use_stream_ids_as_track_ids; int track_ids_ok; + int write_tmcd; } MOVMuxContext; #define FF_MOV_FLAG_RTP_HINT (1 << 0)

1 0

avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480
by git＠videolan.org 26 Sep '16

26 Sep '16

ffmpeg | branch: master | Jean-Yves Simon <lethalwp(a)gmail.com> | Tue Aug 9 17:15:30 2016 +0200| [fb37da37ac1e17f643269ea5bad5bee7e79dcb3a] | committer: Michael Niedermayer avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb37da37ac1e17f64… --- libavcodec/hevc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index cb1263c..764e093 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -370,6 +370,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm #if CONFIG_HEVC_D3D11VA_HWACCEL *fmt++ = AV_PIX_FMT_D3D11VA_VLD; #endif +#if CONFIG_HEVC_VAAPI_HWACCEL + *fmt++ = AV_PIX_FMT_VAAPI; +#endif break; }

1 0