October 2012 - ffmpeg-cvslog - lists.ffmpeg.org

aac: reference supported sample rates in encoders.
by git＠videolan.org 06 Nov '12

06 Nov '12

ffmpeg | branch: master | Clément Bœsch <clement.boesch(a)smartjog.com> | Mon Mar 26 22:32:17 2012 +0200| [29679f4a372eb208af31c57177ab49f67c698362] | committer: Clément Bœsch aac: reference supported sample rates in encoders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29679f4a372eb208a… --- libavcodec/aacenc.c | 1 + libavcodec/libvo-aacenc.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index cf4aef9..fd72daf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -816,6 +816,7 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 8f7c581..c5191ec 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -193,6 +193,7 @@ AVCodec ff_libvo_aacenc_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_close, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

3 2

sws: bump micro for range bugfix
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 31 23:04:13 2012 +0100| [6a712e7f6296a5b69a90612a6b7c721d0cc8c159] | committer: Michael Niedermayer sws: bump micro for range bugfix Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a712e7f6296a5b69… --- libswscale/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/version.h b/libswscale/version.h index 37dcc96..0603b10 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 2 #define LIBSWSCALE_VERSION_MINOR 1 -#define LIBSWSCALE_VERSION_MICRO 101 +#define LIBSWSCALE_VERSION_MICRO 102 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \

1 0

eval-test: add some otherwise untested functions.
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 31 22:46:58 2012 +0100| [25a21c587c070fbcc79ff9e0004b6de4ec6ec692] | committer: Michael Niedermayer eval-test: add some otherwise untested functions. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25a21c587c070fbcc… --- libavutil/eval.c | 5 +++++ tests/ref/fate/eval | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/libavutil/eval.c b/libavutil/eval.c index 3cea170..dbad7c1 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -791,6 +791,11 @@ int main(int argc, char **argv) "taylor(eq(mod(ld(1),4),1)-eq(mod(ld(1),4),3), PI/2, 1)", "root(sin(ld(0))-1, 2)", "root(sin(ld(0))+6+sin(ld(0)/12)-log(ld(0)), 100)", + "7000000B*random(0)", + "squish(2)", + "gauss(0.1)", + "hypot(4,3)", + "gcd(30,55)*min(9,1)", NULL }; diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval index d58cc80..73a45d1 100644 --- a/tests/ref/fate/eval +++ b/tests/ref/fate/eval @@ -217,5 +217,20 @@ Evaluating 'root(sin(ld(0))-1, 2)' Evaluating 'root(sin(ld(0))+6+sin(ld(0)/12)-log(ld(0)), 100)' 'root(sin(ld(0))+6+sin(ld(0)/12)-log(ld(0)), 100)' -> 60.965601 +Evaluating '7000000B*random(0)' +'7000000B*random(0)' -> 0.003078 + +Evaluating 'squish(2)' +'squish(2)' -> 0.000335 + +Evaluating 'gauss(0.1)' +'gauss(0.1)' -> 0.396953 + +Evaluating 'hypot(4,3)' +'hypot(4,3)' -> 5.000000 + +Evaluating 'gcd(30,55)*min(9,1)' +'gcd(30,55)*min(9,1)' -> 5.000000 + 12.700000 == 12.7 0.931323 == 0.931322575

1 0

[ffmpeg-web] branch master updated. b2c6097 web: Switch back to standard banner on 06th of November
by ffmpeg-cvslog＠ffmpeg.org 31 Oct '12

31 Oct '12

The branch, master has been updated via b2c60977c9beb36440e58f6c984c21219a653196 (commit) from c2f20b2a42b948f8d65c19d34da0c55bbf416c95 (commit) - Log ----------------------------------------------------------------- commit b2c60977c9beb36440e58f6c984c21219a653196 Author: Alexander Strasser <eclipse7(a)gmx.net> AuthorDate: Thu Nov 1 00:13:38 2012 +0100 Commit: Alexander Strasser <eclipse7(a)gmx.net> CommitDate: Thu Nov 1 00:13:38 2012 +0100 web: Switch back to standard banner on 06th of November diff --git a/src/logik/1106-standard b/src/logik/1106-standard new file mode 100644 index 0000000..e69de29 ----------------------------------------------------------------------- Summary of changes: src/logik/{0531-standard => 1106-standard} | 0 1 files changed, 0 insertions(+), 0 deletions(-) copy src/logik/{0531-standard => 1106-standard} (100%) hooks/post-receive --

1 0

lavfi: fix references to avfilter_* functions that don't exist anymore.
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Wed Oct 31 20:54:53 2012 +0100| [54a48d2f0452deaea4a0cece506b454f29b480ca] | committer: Clément Bœsch lavfi: fix references to avfilter_* functions that don't exist anymore. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54a48d2f0452deaea… --- libavfilter/avfilter.h | 4 ++-- libavfilter/internal.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 28d4c9d..ccc7f2b 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -292,7 +292,7 @@ struct AVFilterPad { /** * Callback function to get a video buffer. If NULL, the filter system will - * use avfilter_default_get_video_buffer(). + * use ff_default_get_video_buffer(). * * Input video pads only. */ @@ -300,7 +300,7 @@ struct AVFilterPad { /** * Callback function to get an audio buffer. If NULL, the filter system will - * use avfilter_default_get_audio_buffer(). + * use ff_default_get_audio_buffer(). * * Input audio pads only. */ diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 8d03913..03dc63d 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -101,7 +101,7 @@ struct AVFilterPad { /** * Callback function to get a video buffer. If NULL, the filter system will - * use avfilter_default_get_video_buffer(). + * use ff_default_get_video_buffer(). * * Input video pads only. */ @@ -109,7 +109,7 @@ struct AVFilterPad { /** * Callback function to get an audio buffer. If NULL, the filter system will - * use avfilter_default_get_audio_buffer(). + * use ff_default_get_audio_buffer(). * * Input audio pads only. */

1 0

ffv1: assert that there is at least one slice
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Oct 31 18:01:10 2012 +0000| [010f1ce95443a539d3d0405b0b089f245121333a] | committer: Paul B Mahol ffv1: assert that there is at least one slice Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=010f1ce95443a539d… --- libavcodec/ffv1.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 7dc6a73..074be4c 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -113,6 +113,7 @@ av_cold int ffv1_init_slice_contexts(FFV1Context *f) int i; f->slice_count = f->num_h_slices * f->num_v_slices; + av_assert0(f->slice_count > 0); for (i = 0; i < f->slice_count; i++) { FFV1Context *fs = av_mallocz(sizeof(*fs));

1 0

lavfi/hue: add missing GPL dependency.
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Wed Oct 31 19:11:41 2012 +0100| [fd6707ed0eace7de605e070fa2a783e138a52d6e] | committer: Clément Bœsch lavfi/hue: add missing GPL dependency. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd6707ed0eace7de6… --- LICENSE | 1 + configure | 1 + 2 files changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index e29be90..f38fc16 100644 --- a/LICENSE +++ b/LICENSE @@ -31,6 +31,7 @@ Specifically, the GPL parts of FFmpeg are - vf_decimate.c - vf_delogo.c - vf_hqdn3d.c + - vf_hue.c - vf_mp.c - vf_smartblur.c - vf_super2xsai.c diff --git a/configure b/configure index 115e8b1..dc1aa79 100755 --- a/configure +++ b/configure @@ -1940,6 +1940,7 @@ frei0r_filter_extralibs='$ldl' frei0r_src_filter_deps="frei0r dlopen" frei0r_src_filter_extralibs='$ldl' hqdn3d_filter_deps="gpl" +hue_filter_deps="gpl" movie_filter_deps="avcodec avformat" mp_filter_deps="gpl avcodec swscale postproc inline_asm" mptestsrc_filter_deps="gpl"

1 0

LICENSE: update GPL filter list.
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Wed Oct 31 19:06:05 2012 +0100| [5b4cae50c9928295a7a262f8b5719f08b45983bb] | committer: Clément Bœsch LICENSE: update GPL filter list. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b4cae50c9928295a… --- LICENSE | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LICENSE b/LICENSE index b98b5d3..e29be90 100644 --- a/LICENSE +++ b/LICENSE @@ -23,13 +23,16 @@ Specifically, the GPL parts of FFmpeg are libswresample/swresample-test.c - the texi2pod.pl tool - the following filters in libavfilter: + - f_ebur128.c - vf_blackframe.c - vf_boxblur.c - vf_colormatrix.c - vf_cropdetect.c + - vf_decimate.c - vf_delogo.c - vf_hqdn3d.c - vf_mp.c + - vf_smartblur.c - vf_super2xsai.c - vf_tinterlace.c - vf_yadif.c

1 0

lavfi: remove hqdn3d libmpcodecs wrapper.
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Wed Oct 31 19:02:57 2012 +0100| [f53112b665828fa2c2a99e4233b0d9a66e807ff6] | committer: Clément Bœsch lavfi: remove hqdn3d libmpcodecs wrapper. The native filter was ported from the MPlayer project when the mp wrapper didn't even exist, and when mp=hqdn3d was added, it was already obsolete. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f53112b665828fa2c… --- doc/filters.texi | 1 - libavfilter/Makefile | 1 - libavfilter/libmpcodecs/vf_hqdn3d.c | 373 ----------------------------------- libavfilter/version.h | 2 +- libavfilter/vf_mp.c | 2 - 5 files changed, 1 insertion(+), 378 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6a11b12..786b2db 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2640,7 +2640,6 @@ The list of the currently supported filters follows: @item fspp @item geq @item harddup -@item hqdn3d @item il @item ilpack @item ivtc diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 5fbfe17..0ab0633 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -173,7 +173,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fixpts.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fspp.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_geq.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_harddup.o -OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_hqdn3d.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_il.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ilpack.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ivtc.o diff --git a/libavfilter/libmpcodecs/vf_hqdn3d.c b/libavfilter/libmpcodecs/vf_hqdn3d.c deleted file mode 100644 index eba3439..0000000 --- a/libavfilter/libmpcodecs/vf_hqdn3d.c +++ /dev/null @@ -1,373 +0,0 @@ -/* - * Copyright (C) 2003 Daniel Moreno <comac(a)comac.darktech.org> - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <inttypes.h> -#include <math.h> - -#include "mp_msg.h" -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -#define PARAM1_DEFAULT 4.0 -#define PARAM2_DEFAULT 3.0 -#define PARAM3_DEFAULT 6.0 - -//===========================================================================// - -struct vf_priv_s { - int Coefs[4][512*16]; - unsigned int *Line; - unsigned short *Frame[3]; -}; - - -/***************************************************************************/ - -static void uninit(struct vf_instance *vf) -{ - free(vf->priv->Line); - free(vf->priv->Frame[0]); - free(vf->priv->Frame[1]); - free(vf->priv->Frame[2]); - - vf->priv->Line = NULL; - vf->priv->Frame[0] = NULL; - vf->priv->Frame[1] = NULL; - vf->priv->Frame[2] = NULL; -} - -static int config(struct vf_instance *vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt){ - - uninit(vf); - vf->priv->Line = malloc(width*sizeof(int)); - - return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); -} - -static inline unsigned int LowPassMul(unsigned int PrevMul, unsigned int CurrMul, int* Coef){ -// int dMul= (PrevMul&0xFFFFFF)-(CurrMul&0xFFFFFF); - int dMul= PrevMul-CurrMul; - unsigned int d=((dMul+0x10007FF)>>12); - return CurrMul + Coef[d]; -} - -static void deNoiseTemporal( - unsigned char *Frame, // mpi->planes[x] - unsigned char *FrameDest, // dmpi->planes[x] - unsigned short *FrameAnt, - int W, int H, int sStride, int dStride, - int *Temporal) -{ - long X, Y; - unsigned int PixelDst; - - for (Y = 0; Y < H; Y++){ - for (X = 0; X < W; X++){ - PixelDst = LowPassMul(FrameAnt[X]<<8, Frame[X]<<16, Temporal); - FrameAnt[X] = ((PixelDst+0x1000007F)>>8); - FrameDest[X]= ((PixelDst+0x10007FFF)>>16); - } - Frame += sStride; - FrameDest += dStride; - FrameAnt += W; - } -} - -static void deNoiseSpacial( - unsigned char *Frame, // mpi->planes[x] - unsigned char *FrameDest, // dmpi->planes[x] - unsigned int *LineAnt, // vf->priv->Line (width bytes) - int W, int H, int sStride, int dStride, - int *Horizontal, int *Vertical) -{ - long X, Y; - long sLineOffs = 0, dLineOffs = 0; - unsigned int PixelAnt; - unsigned int PixelDst; - - /* First pixel has no left nor top neighbor. */ - PixelDst = LineAnt[0] = PixelAnt = Frame[0]<<16; - FrameDest[0]= ((PixelDst+0x10007FFF)>>16); - - /* First line has no top neighbor, only left. */ - for (X = 1; X < W; X++){ - PixelDst = LineAnt[X] = LowPassMul(PixelAnt, Frame[X]<<16, Horizontal); - FrameDest[X]= ((PixelDst+0x10007FFF)>>16); - } - - for (Y = 1; Y < H; Y++){ - unsigned int PixelAnt; - sLineOffs += sStride, dLineOffs += dStride; - /* First pixel on each line doesn't have previous pixel */ - PixelAnt = Frame[sLineOffs]<<16; - PixelDst = LineAnt[0] = LowPassMul(LineAnt[0], PixelAnt, Vertical); - FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16); - - for (X = 1; X < W; X++){ - unsigned int PixelDst; - /* The rest are normal */ - PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal); - PixelDst = LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical); - FrameDest[dLineOffs+X]= ((PixelDst+0x10007FFF)>>16); - } - } -} - -static void deNoise(unsigned char *Frame, // mpi->planes[x] - unsigned char *FrameDest, // dmpi->planes[x] - unsigned int *LineAnt, // vf->priv->Line (width bytes) - unsigned short **FrameAntPtr, - int W, int H, int sStride, int dStride, - int *Horizontal, int *Vertical, int *Temporal) -{ - long X, Y; - long sLineOffs = 0, dLineOffs = 0; - unsigned int PixelAnt; - unsigned int PixelDst; - unsigned short* FrameAnt=(*FrameAntPtr); - - if(!FrameAnt){ - (*FrameAntPtr)=FrameAnt=malloc(W*H*sizeof(unsigned short)); - for (Y = 0; Y < H; Y++){ - unsigned short* dst=&FrameAnt[Y*W]; - unsigned char* src=Frame+Y*sStride; - for (X = 0; X < W; X++) dst[X]=src[X]<<8; - } - } - - if(!Horizontal[0] && !Vertical[0]){ - deNoiseTemporal(Frame, FrameDest, FrameAnt, - W, H, sStride, dStride, Temporal); - return; - } - if(!Temporal[0]){ - deNoiseSpacial(Frame, FrameDest, LineAnt, - W, H, sStride, dStride, Horizontal, Vertical); - return; - } - - /* First pixel has no left nor top neighbor. Only previous frame */ - LineAnt[0] = PixelAnt = Frame[0]<<16; - PixelDst = LowPassMul(FrameAnt[0]<<8, PixelAnt, Temporal); - FrameAnt[0] = ((PixelDst+0x1000007F)>>8); - FrameDest[0]= ((PixelDst+0x10007FFF)>>16); - - /* First line has no top neighbor. Only left one for each pixel and - * last frame */ - for (X = 1; X < W; X++){ - LineAnt[X] = PixelAnt = LowPassMul(PixelAnt, Frame[X]<<16, Horizontal); - PixelDst = LowPassMul(FrameAnt[X]<<8, PixelAnt, Temporal); - FrameAnt[X] = ((PixelDst+0x1000007F)>>8); - FrameDest[X]= ((PixelDst+0x10007FFF)>>16); - } - - for (Y = 1; Y < H; Y++){ - unsigned int PixelAnt; - unsigned short* LinePrev=&FrameAnt[Y*W]; - sLineOffs += sStride, dLineOffs += dStride; - /* First pixel on each line doesn't have previous pixel */ - PixelAnt = Frame[sLineOffs]<<16; - LineAnt[0] = LowPassMul(LineAnt[0], PixelAnt, Vertical); - PixelDst = LowPassMul(LinePrev[0]<<8, LineAnt[0], Temporal); - LinePrev[0] = ((PixelDst+0x1000007F)>>8); - FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16); - - for (X = 1; X < W; X++){ - unsigned int PixelDst; - /* The rest are normal */ - PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal); - LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical); - PixelDst = LowPassMul(LinePrev[X]<<8, LineAnt[X], Temporal); - LinePrev[X] = ((PixelDst+0x1000007F)>>8); - FrameDest[dLineOffs+X]= ((PixelDst+0x10007FFF)>>16); - } - } -} - - -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ - int cw= mpi->w >> mpi->chroma_x_shift; - int ch= mpi->h >> mpi->chroma_y_shift; - int W = mpi->w, H = mpi->h; - - mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, - mpi->w,mpi->h); - - if(!dmpi) return 0; - - deNoise(mpi->planes[0], dmpi->planes[0], - vf->priv->Line, &vf->priv->Frame[0], W, H, - mpi->stride[0], dmpi->stride[0], - vf->priv->Coefs[0], - vf->priv->Coefs[0], - vf->priv->Coefs[1]); - deNoise(mpi->planes[1], dmpi->planes[1], - vf->priv->Line, &vf->priv->Frame[1], cw, ch, - mpi->stride[1], dmpi->stride[1], - vf->priv->Coefs[2], - vf->priv->Coefs[2], - vf->priv->Coefs[3]); - deNoise(mpi->planes[2], dmpi->planes[2], - vf->priv->Line, &vf->priv->Frame[2], cw, ch, - mpi->stride[2], dmpi->stride[2], - vf->priv->Coefs[2], - vf->priv->Coefs[2], - vf->priv->Coefs[3]); - - return vf_next_put_image(vf,dmpi, pts); -} - -//===========================================================================// - -static int query_format(struct vf_instance *vf, unsigned int fmt){ - switch(fmt) - { - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - case IMGFMT_YVU9: - case IMGFMT_444P: - case IMGFMT_422P: - case IMGFMT_411P: - return vf_next_query_format(vf, fmt); - } - return 0; -} - - -#define ABS(A) ( (A) > 0 ? (A) : -(A) ) - -static void PrecalcCoefs(int *Ct, double Dist25) -{ - int i; - double Gamma, Simil, C; - - Gamma = log(0.25) / log(1.0 - Dist25/255.0 - 0.00001); - - for (i = -255*16; i <= 255*16; i++) - { - Simil = 1.0 - ABS(i) / (16*255.0); - C = pow(Simil, Gamma) * 65536.0 * (double)i / 16.0; - Ct[16*256+i] = (C<0) ? (C-0.5) : (C+0.5); - } - - Ct[0] = (Dist25 != 0); -} - - -static int vf_open(vf_instance_t *vf, char *args){ - double LumSpac, LumTmp, ChromSpac, ChromTmp; - double Param1, Param2, Param3, Param4; - - vf->config=config; - vf->put_image=put_image; - vf->query_format=query_format; - vf->uninit=uninit; - vf->priv=malloc(sizeof(struct vf_priv_s)); - memset(vf->priv, 0, sizeof(struct vf_priv_s)); - - if (args) - { - switch(sscanf(args, "%lf:%lf:%lf:%lf", - &Param1, &Param2, &Param3, &Param4 - )) - { - case 0: - LumSpac = PARAM1_DEFAULT; - LumTmp = PARAM3_DEFAULT; - - ChromSpac = PARAM2_DEFAULT; - ChromTmp = LumTmp * ChromSpac / LumSpac; - break; - - case 1: - LumSpac = Param1; - LumTmp = PARAM3_DEFAULT * Param1 / PARAM1_DEFAULT; - - ChromSpac = PARAM2_DEFAULT * Param1 / PARAM1_DEFAULT; - ChromTmp = LumTmp * ChromSpac / LumSpac; - break; - - case 2: - LumSpac = Param1; - LumTmp = PARAM3_DEFAULT * Param1 / PARAM1_DEFAULT; - - ChromSpac = Param2; - ChromTmp = LumTmp * ChromSpac / LumSpac; - break; - - case 3: - LumSpac = Param1; - LumTmp = Param3; - - ChromSpac = Param2; - ChromTmp = LumTmp * ChromSpac / LumSpac; - break; - - case 4: - LumSpac = Param1; - LumTmp = Param3; - - ChromSpac = Param2; - ChromTmp = Param4; - break; - - default: - LumSpac = PARAM1_DEFAULT; - LumTmp = PARAM3_DEFAULT; - - ChromSpac = PARAM2_DEFAULT; - ChromTmp = LumTmp * ChromSpac / LumSpac; - } - } - else - { - LumSpac = PARAM1_DEFAULT; - LumTmp = PARAM3_DEFAULT; - - ChromSpac = PARAM2_DEFAULT; - ChromTmp = LumTmp * ChromSpac / LumSpac; - } - - PrecalcCoefs(vf->priv->Coefs[0], LumSpac); - PrecalcCoefs(vf->priv->Coefs[1], LumTmp); - PrecalcCoefs(vf->priv->Coefs[2], ChromSpac); - PrecalcCoefs(vf->priv->Coefs[3], ChromTmp); - - return 1; -} - -const vf_info_t vf_info_hqdn3d = { - "High Quality 3D Denoiser", - "hqdn3d", - "Daniel Moreno & A'rpi", - "", - vf_open, - NULL -}; - -//===========================================================================// diff --git a/libavfilter/version.h b/libavfilter/version.h index d18944f..ef53ee8 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 21 -#define LIBAVFILTER_VERSION_MICRO 105 +#define LIBAVFILTER_VERSION_MICRO 106 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index fddba3b..93d27ec 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -146,7 +146,6 @@ extern const vf_info_t vf_info_fspp; extern const vf_info_t vf_info_geq; extern const vf_info_t vf_info_halfpack; extern const vf_info_t vf_info_harddup; -extern const vf_info_t vf_info_hqdn3d; extern const vf_info_t vf_info_il; extern const vf_info_t vf_info_ilpack; extern const vf_info_t vf_info_ivtc; @@ -196,7 +195,6 @@ static const vf_info_t* const filters[]={ &vf_info_fspp, &vf_info_geq, &vf_info_harddup, - &vf_info_hqdn3d, &vf_info_il, &vf_info_ilpack, &vf_info_ivtc,

1 0

av_image_copy: check for av_image_get_linesize() failure.
by git＠videolan.org 31 Oct '12

31 Oct '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Oct 31 18:57:21 2012 +0100| [adc39b28a5264591b9f8e5838a752c3d547e8110] | committer: Michael Niedermayer av_image_copy: check for av_image_get_linesize() failure. Fixes CID703722 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adc39b28a5264591b… --- libavutil/imgutils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 0cff341..b946d6d 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -276,6 +276,10 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], for (i = 0; i < planes_nb; i++) { int h = height; int bwidth = av_image_get_linesize(pix_fmt, width, i); + if (bwidth < 0) { + av_log(0, AV_LOG_ERROR, "av_image_get_linesize failed\n"); + return; + } if (i == 1 || i == 2) { h= -((-height)>>desc->log2_chroma_h); }

1 0