January 2012 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/2] img2: added support for %t output pattern
by Yuval Adam 05 Dec '16

05 Dec '16

From: Yuval Adam <yuv.adm(a)gmail.com> The image2 muxer now supports timestamps in output filenames. When used in an output patterm '%t' will be replaced with the frames timestamp in hours, minutes and seconds (hh:mm:ss). Signed-off-by: Yuval Adam <yuv.adm(a)gmail.com> --- doc/muxers.texi | 5 +++++ libavformat/avformat.h | 6 ++++-- libavformat/img2.c | 13 ++++++++----- libavformat/utils.c | 32 +++++++++++++++++++++++++------- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 60a72d6..72212fe 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -109,6 +109,11 @@ If the pattern contains "%d" or "%0@var{N}d", the first filename of the file list specified will contain the number 1, all the following numbers will be sequential. +The pattern may also contain "%t", this string specifies the timestamp +of the frame in hours, minutes and seconds. Note that if two frames are written at the +same second, they will be overwritten, yielding a maximum output of 1 fps. +The "%t" and "%d" patterns may not be used simultaneously. + The pattern may contain a suffix which is used to automatically determine the format of the image files to write. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2ed6b56..a9ab0cc 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2067,7 +2067,8 @@ attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1 #endif /** - * Return in 'buf' the path with '%d' replaced by a number. + * Return in 'buf' the path with '%d' replaced by the frame number, + * and '%t' replaced by the frame timestamp. * * Also handles the '%0nd' format where 'n' is the total number * of digits and '%%'. @@ -2076,10 +2077,11 @@ attribute_deprecated int find_info_tag(char *arg, int arg_size, const char *tag1 * @param buf_size destination buffer size * @param path numbered sequence string * @param number frame number + * @param ts frame timestamp in seconds * @return 0 if OK, -1 on format error */ int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number); + const char *path, int number, int ts); /** * Check whether filename actually is a numbered sequence generator. diff --git a/libavformat/img2.c b/libavformat/img2.c index bc35591..8012e5b 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -142,7 +142,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, /* find the first image */ for(first_index = 0; first_index < 5; first_index++) { - if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){ + if (av_get_frame_filename(buf, sizeof(buf), path, first_index, 0) < 0){ *pfirst_index = *plast_index = 1; if (avio_check(buf, AVIO_FLAG_READ) > 0) @@ -165,7 +165,7 @@ static int find_image_range(int *pfirst_index, int *plast_index, else range1 = 2 * range; if (av_get_frame_filename(buf, sizeof(buf), path, - last_index + range1) < 0) + last_index + range1, 0) < 0) goto fail; if (avio_check(buf, AVIO_FLAG_READ) <= 0) break; @@ -310,7 +310,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) if (s->img_number > s->img_last) return AVERROR_EOF; if (av_get_frame_filename(filename, sizeof(filename), - s->path, s->img_number)<0 && s->img_number > 1) + s->path, s->img_number, 0)<0 && s->img_number > 1) return AVERROR(EIO); for(i=0; i<3; i++){ if (avio_open2(&f[i], filename, AVIO_FLAG_READ, @@ -389,12 +389,15 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) VideoData *img = s->priv_data; AVIOContext *pb[3]; char filename[1024]; - AVCodecContext *codec= s->streams[ pkt->stream_index ]->codec; + AVStream *stream = s->streams[ pkt->stream_index ]; + AVCodecContext *codec = stream->codec; int i; + int ts = av_rescale_q(pkt->pts, stream->time_base, AV_TIME_BASE_Q) / AV_TIME_BASE; + if (!img->is_pipe) { if (av_get_frame_filename(filename, sizeof(filename), - img->path, img->img_number) < 0 && img->img_number>1 && !img->updatefirst) { + img->path, img->img_number, ts) < 0 && img->img_number>1 && !img->updatefirst) { av_log(s, AV_LOG_ERROR, "Could not get frame filename number %d from pattern '%s'\n", img->img_number, img->path); diff --git a/libavformat/utils.c b/libavformat/utils.c index f0df759..6db2db0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -319,7 +319,7 @@ int av_append_packet(AVIOContext *s, AVPacket *pkt, int size) int av_filename_number_test(const char *filename) { char buf[1024]; - return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0); + return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1, 0)>=0); } AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret) @@ -3774,15 +3774,16 @@ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info) #endif int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number) + const char *path, int number, int ts) { const char *p; char *q, buf1[20], c; - int nd, len, percentd_found; + int nd, len, percent_found; + int hours, mins, secs; q = buf; p = path; - percentd_found = 0; + percent_found = 0; for(;;) { c = *p++; if (c == '\0') @@ -3800,9 +3801,9 @@ int av_get_frame_filename(char *buf, int buf_size, case '%': goto addchar; case 'd': - if (percentd_found) + if (percent_found) goto fail; - percentd_found = 1; + percent_found = 1; snprintf(buf1, sizeof(buf1), "%0*d", nd, number); len = strlen(buf1); if ((q - buf + len) > buf_size - 1) @@ -3810,6 +3811,23 @@ int av_get_frame_filename(char *buf, int buf_size, memcpy(q, buf1, len); q += len; break; + case 't': + if (percent_found) + goto fail; + percent_found = 1; + secs = ts % 60; + ts /= 60; + mins = ts % 60; + ts /= 60; + hours = ts; + snprintf(buf1, sizeof(buf1), + "%02d:%02d:%02d", hours, mins, secs); + len = strlen(buf1); + if ((q - buf + len) > buf_size - 1) + goto fail; + memcpy(q, buf1, len); + q += len; + break; default: goto fail; } @@ -3819,7 +3837,7 @@ int av_get_frame_filename(char *buf, int buf_size, *q++ = c; } } - if (!percentd_found) + if (!percent_found) goto fail; *q = '\0'; return 0; -- 1.7.2.2

4 22

[PATCH] rtpdec: make the NTP time values unsigned.
by flameeyes＠gmail.com 09 May '14

09 May '14

As per RFC3550, section 4, the NTP time is provided as 64-bit unsigned integer, so follow the same logic here. --- libavformat/rtpdec.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 86af2b9..87fd419 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -148,8 +148,8 @@ struct RTPDemuxContext { RTPStatistics statistics; ///< Statistics for this stream (used by RTCP receiver reports) /* rtcp sender statistics receive */ - int64_t last_rtcp_ntp_time; // TODO: move into statistics - int64_t first_rtcp_ntp_time; // TODO: move into statistics + uint64_t last_rtcp_ntp_time; // TODO: move into statistics + uint64_t first_rtcp_ntp_time; // TODO: move into statistics uint32_t last_rtcp_timestamp; // TODO: move into statistics /* rtcp sender statistics */ -- 1.7.1.1

4 3

[PATCH] lavu: add av_get_color_string() and use it in -colors option
by stefano.sabatini-lala＠poste.it 27 Oct '13

27 Oct '13

--- cmdutils.c | 13 +++++++++++++ cmdutils.h | 6 ++++++ cmdutils_common_opts.h | 1 + doc/fftools-common-opts.texi | 3 +++ libavutil/parseutils.c | 18 ++++++++++++++++++ libavutil/parseutils.h | 14 ++++++++++++++ 6 files changed, 55 insertions(+), 0 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index 514ebad..549c673 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -713,6 +713,19 @@ void show_pix_fmts(void) } } +void show_colors(void) +{ + char buf[256]; + int i; + + /* print header */ + fprintf(stderr, av_get_color_string(buf, sizeof(buf), -1)); + + for (i = 0; av_get_color_string(buf, sizeof(buf), i); i++) { + printf("%s", buf); + } +} + int read_yesno(void) { int c = getchar(); diff --git a/cmdutils.h b/cmdutils.h index c3d8a42..191ee36 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -195,6 +195,12 @@ void show_formats(void); void show_codecs(void); /** + * Print a listing containing all the color names supported by the + * program. + */ +void show_colors(void); + +/** * Print a listing containing all the filters supported by the * program. */ diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index da30997..1e3799a 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -6,6 +6,7 @@ { "version", OPT_EXIT, {(void*)show_version}, "show version" }, { "formats" , OPT_EXIT, {(void*)show_formats }, "show available formats" }, { "codecs" , OPT_EXIT, {(void*)show_codecs }, "show available codecs" }, + { "colors" , OPT_EXIT, {(void*)show_colors }, "show recognized color names" }, { "bsfs" , OPT_EXIT, {(void*)show_bsfs }, "show available bit stream filters" }, { "protocols", OPT_EXIT, {(void*)show_protocols}, "show available protocols" }, { "filters", OPT_EXIT, {(void*)show_filters }, "show available filters" }, diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d72ca5c..5b25971 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -59,6 +59,9 @@ Codec can handle input truncated at random locations instead of only at frame bo @item -bsfs Show available bitstream filters. + at item -colors +Show recognized color names. + @item -protocols Show available protocols. diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index d67d31b..e701620 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -373,6 +373,24 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, return 0; } +char *av_get_color_string(char *buf, int buf_size, int color_idx) +{ + /* print header */ + if (color_idx < 0) { + snprintf(buf, buf_size, "%-32s #RRGGBB\n", "name"); + } else { + ColorEntry *color; + if (color_idx >= FF_ARRAY_ELEMS(color_table)) + return NULL; + color = &color_table[color_idx]; + snprintf(buf, buf_size, "%-32s #%02X%02X%02X\n", + color->name, + color->rgb_color[0], color->rgb_color[1], color->rgb_color[2]); + } + + return buf; +} + /* get a positive number between n_min and n_max, for a maximum length of len_max. Return -1 if error. */ static int date_get_num(const char **pp, diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index c3986af..3e3a34b 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -73,6 +73,20 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, void *log_ctx); /** + * Print in buf the string corresponding to the color with + * number color_idx, or an header if color_idx is negative. + * + * @param buf the buffer where to write the string + * @param buf_size the size of buf + * @param color_idx the number of the pixel format to print the + * corresponding info string, or a negative value to print the + * corresponding header. + * @return the printed string or NULL if color_idx doesn't correspond to any + * color + */ +char *av_get_color_string(char *buf, int buf_size, int color_idx); + +/** * Parses timestr and returns in *time a corresponding number of * microseconds. * -- 1.7.2.3

5 18

[WIP] rotate filter(s)
by stefano.sabatini-lala＠poste.it 13 Jun '13

13 Jun '13

Hi, in attachment a first stub at the rotate filter. I don't know if it is a good idea to keep the float variant, while the rotate_ss may be useful (and the rotation angle could be made parametric). The integer-only rotating code is taken from tests/rotozoom.c, I don't know if we have a corresponding version in the libs. fill_line_with_color() and draw_rectangle() are duplicated from vf_pad.c, so maybe we should make them public (or at least ff_ them), drawutils.[ch] may be a good place where to put them. Note that ffplay/SDL doesn't work with odd width/height sizes, so you may need to rescale to an even wxh size (this could be done with a parametric scale as discussed some months ago). What this rotate filter still lacks, apart a resolution to the refactoring problems mentioned above, is a YUV planar version of the rotating function, and possibly the extension to other RGB variants, which should be pretty easy to add. Everyone feel free to continue to work on this and post an updated patch. Regards. -- FFmpeg = Fostering and Frightening Multimedia Portable Emblematic Guru

9 23

[PATCH]Support decoding gray8a tiff images
by Carl Eugen Hoyos 17 May '13

17 May '13

Hi! Supported by ImageMagick and gimp. Please comment, Carl Eugen

3 5

[PATCH] lavfi: remove unsharp mp wrapper
by Stefano Sabatini 17 Feb '13

17 Feb '13

The unsharp filter was already integrated natively in libavfilter. --- doc/filters.texi | 1 - libavfilter/Makefile | 1 - libavfilter/libmpcodecs/vf_unsharp.c | 324 ---------------------------------- libavfilter/vf_mp.c | 2 - 4 files changed, 0 insertions(+), 328 deletions(-) delete mode 100644 libavfilter/libmpcodecs/vf_unsharp.c diff --git a/doc/filters.texi b/doc/filters.texi index b41fce7..4763695 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -956,7 +956,6 @@ The list of the currently supported filters follows: @item test @item tile @item tinterlace -@item unsharp @item uspp @item yuvcsp @item yvu9 diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 6007fed..7c53c9d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -128,7 +128,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_test.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tile.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o -OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_unsharp.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yuvcsp.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o diff --git a/libavfilter/libmpcodecs/vf_unsharp.c b/libavfilter/libmpcodecs/vf_unsharp.c deleted file mode 100644 index db22f78..0000000 --- a/libavfilter/libmpcodecs/vf_unsharp.c +++ /dev/null @@ -1,324 +0,0 @@ -/* - * Copyright (C) 2002 Remi Guyomarch <rguyom(a)pobox.com> - * - * 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 "config.h" -#include "mp_msg.h" -#include "cpudetect.h" - -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" -#include "libvo/fastmemcpy.h" -#include "libavutil/common.h" - -//===========================================================================// - -#define MIN_MATRIX_SIZE 3 -#define MAX_MATRIX_SIZE 63 - -typedef struct FilterParam { - int msizeX, msizeY; - double amount; - uint32_t *SC[MAX_MATRIX_SIZE-1]; -} FilterParam; - -struct vf_priv_s { - FilterParam lumaParam; - FilterParam chromaParam; - unsigned int outfmt; -}; - - -//===========================================================================// - -/* This code is based on : - -An Efficient algorithm for Gaussian blur using finite-state machines -Frederick M. Waltz and John W. V. Miller - -SPIE Conf. on Machine Vision Systems for Inspection and Metrology VII -Originally published Boston, Nov 98 - -*/ - -static void unsharp( uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int width, int height, FilterParam *fp ) { - - uint32_t **SC = fp->SC; - uint32_t SR[MAX_MATRIX_SIZE-1], Tmp1, Tmp2; - uint8_t* src2 = src; // avoid gcc warning - - int32_t res; - int x, y, z; - int amount = fp->amount * 65536.0; - int stepsX = fp->msizeX/2; - int stepsY = fp->msizeY/2; - int scalebits = (stepsX+stepsY)*2; - int32_t halfscale = 1 << ((stepsX+stepsY)*2-1); - - if( !fp->amount ) { - if( src == dst ) - return; - if( dstStride == srcStride ) - fast_memcpy( dst, src, srcStride*height ); - else - for( y=0; y<height; y++, dst+=dstStride, src+=srcStride ) - fast_memcpy( dst, src, width ); - return; - } - - for( y=0; y<2*stepsY; y++ ) - memset( SC[y], 0, sizeof(SC[y][0]) * (width+2*stepsX) ); - - for( y=-stepsY; y<height+stepsY; y++ ) { - if( y < height ) src2 = src; - memset( SR, 0, sizeof(SR[0]) * (2*stepsX-1) ); - for( x=-stepsX; x<width+stepsX; x++ ) { - Tmp1 = x<=0 ? src2[0] : x>=width ? src2[width-1] : src2[x]; - for( z=0; z<stepsX*2; z+=2 ) { - Tmp2 = SR[z+0] + Tmp1; SR[z+0] = Tmp1; - Tmp1 = SR[z+1] + Tmp2; SR[z+1] = Tmp2; - } - for( z=0; z<stepsY*2; z+=2 ) { - Tmp2 = SC[z+0][x+stepsX] + Tmp1; SC[z+0][x+stepsX] = Tmp1; - Tmp1 = SC[z+1][x+stepsX] + Tmp2; SC[z+1][x+stepsX] = Tmp2; - } - if( x>=stepsX && y>=stepsY ) { - uint8_t* srx = src - stepsY*srcStride + x - stepsX; - uint8_t* dsx = dst - stepsY*dstStride + x - stepsX; - - res = (int32_t)*srx + ( ( ( (int32_t)*srx - (int32_t)((Tmp1+halfscale) >> scalebits) ) * amount ) >> 16 ); - *dsx = res>255 ? 255 : res<0 ? 0 : (uint8_t)res; - } - } - if( y >= 0 ) { - dst += dstStride; - src += srcStride; - } - } -} - -//===========================================================================// - -static int config( struct vf_instance *vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt ) { - - int z, stepsX, stepsY; - FilterParam *fp; - const char *effect; - - // allocate buffers - - fp = &vf->priv->lumaParam; - effect = fp->amount == 0 ? "don't touch" : fp->amount < 0 ? "blur" : "sharpen"; - mp_msg( MSGT_VFILTER, MSGL_INFO, "unsharp: %dx%d:%0.2f (%s luma) \n", fp->msizeX, fp->msizeY, fp->amount, effect ); - memset( fp->SC, 0, sizeof( fp->SC ) ); - stepsX = fp->msizeX/2; - stepsY = fp->msizeY/2; - for( z=0; z<2*stepsY; z++ ) - fp->SC[z] = av_malloc(sizeof(*(fp->SC[z])) * (width+2*stepsX)); - - fp = &vf->priv->chromaParam; - effect = fp->amount == 0 ? "don't touch" : fp->amount < 0 ? "blur" : "sharpen"; - mp_msg( MSGT_VFILTER, MSGL_INFO, "unsharp: %dx%d:%0.2f (%s chroma)\n", fp->msizeX, fp->msizeY, fp->amount, effect ); - memset( fp->SC, 0, sizeof( fp->SC ) ); - stepsX = fp->msizeX/2; - stepsY = fp->msizeY/2; - for( z=0; z<2*stepsY; z++ ) - fp->SC[z] = av_malloc(sizeof(*(fp->SC[z])) * (width+2*stepsX)); - - return vf_next_config( vf, width, height, d_width, d_height, flags, outfmt ); -} - -//===========================================================================// - -static void get_image( struct vf_instance *vf, mp_image_t *mpi ) { - if( mpi->flags & MP_IMGFLAG_PRESERVE ) - return; // don't change - if( mpi->imgfmt!=vf->priv->outfmt ) - return; // colorspace differ - - vf->dmpi = vf_get_image( vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h ); - mpi->planes[0] = vf->dmpi->planes[0]; - mpi->stride[0] = vf->dmpi->stride[0]; - mpi->width = vf->dmpi->width; - if( mpi->flags & MP_IMGFLAG_PLANAR ) { - mpi->planes[1] = vf->dmpi->planes[1]; - mpi->planes[2] = vf->dmpi->planes[2]; - mpi->stride[1] = vf->dmpi->stride[1]; - mpi->stride[2] = vf->dmpi->stride[2]; - } - mpi->flags |= MP_IMGFLAG_DIRECT; -} - -static int put_image( struct vf_instance *vf, mp_image_t *mpi, double pts) { - mp_image_t *dmpi; - - if( !(mpi->flags & MP_IMGFLAG_DIRECT) ) - // no DR, so get a new image! hope we'll get DR buffer: - vf->dmpi = vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); - dmpi= vf->dmpi; - - unsharp( dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, &vf->priv->lumaParam ); - unsharp( dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2, &vf->priv->chromaParam ); - unsharp( dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w/2, mpi->h/2, &vf->priv->chromaParam ); - - vf_clone_mpi_attributes(dmpi, mpi); - -#if HAVE_MMX - if(gCpuCaps.hasMMX) - __asm__ volatile ("emms\n\t"); -#endif -#if HAVE_MMX2 - if(gCpuCaps.hasMMX2) - __asm__ volatile ("sfence\n\t"); -#endif - - return vf_next_put_image( vf, dmpi, pts); -} - -static void uninit( struct vf_instance *vf ) { - unsigned int z; - FilterParam *fp; - - if( !vf->priv ) return; - - fp = &vf->priv->lumaParam; - for( z=0; z<sizeof(fp->SC)/sizeof(fp->SC[0]); z++ ) { - av_free( fp->SC[z] ); - fp->SC[z] = NULL; - } - fp = &vf->priv->chromaParam; - for( z=0; z<sizeof(fp->SC)/sizeof(fp->SC[0]); z++ ) { - av_free( fp->SC[z] ); - fp->SC[z] = NULL; - } - - free( vf->priv ); - vf->priv = NULL; -} - -//===========================================================================// - -static int query_format( struct vf_instance *vf, unsigned int fmt ) { - switch(fmt) { - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - return vf_next_query_format( vf, vf->priv->outfmt ); - } - return 0; -} - -//===========================================================================// - -static void parse( FilterParam *fp, char* args ) { - - // l7x5:0.8:c3x3:-0.2 - - char *z; - char *pos = args; - char *max = args + strlen(args); - - // parse matrix sizes - fp->msizeX = ( pos && pos+1<max ) ? atoi( pos+1 ) : 0; - z = strchr( pos+1, 'x' ); - fp->msizeY = ( z && z+1<max ) ? atoi( pos=z+1 ) : fp->msizeX; - - // min/max & odd - fp->msizeX = 1 | av_clip(fp->msizeX, MIN_MATRIX_SIZE, MAX_MATRIX_SIZE); - fp->msizeY = 1 | av_clip(fp->msizeY, MIN_MATRIX_SIZE, MAX_MATRIX_SIZE); - - // parse amount - pos = strchr( pos+1, ':' ); - fp->amount = ( pos && pos+1<max ) ? atof( pos+1 ) : 0; -} - -//===========================================================================// - -static const unsigned int fmt_list[] = { - IMGFMT_YV12, - IMGFMT_I420, - IMGFMT_IYUV, - 0 -}; - -static int vf_open( vf_instance_t *vf, char *args ) { - vf->config = config; - vf->put_image = put_image; - vf->get_image = get_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 ) { - char *args2 = strchr( args, 'l' ); - if( args2 ) - parse( &vf->priv->lumaParam, args2 ); - else { - vf->priv->lumaParam.amount = - vf->priv->lumaParam.msizeX = - vf->priv->lumaParam.msizeY = 0; - } - - args2 = strchr( args, 'c' ); - if( args2 ) - parse( &vf->priv->chromaParam, args2 ); - else { - vf->priv->chromaParam.amount = - vf->priv->chromaParam.msizeX = - vf->priv->chromaParam.msizeY = 0; - } - - if( !vf->priv->lumaParam.msizeX && !vf->priv->chromaParam.msizeX ) - return 0; // nothing to do - } - - // check csp: - vf->priv->outfmt = vf_match_csp( &vf->next, fmt_list, IMGFMT_YV12 ); - if( !vf->priv->outfmt ) { - uninit( vf ); - return 0; // no csp match :( - } - - return 1; -} - -const vf_info_t vf_info_unsharp = { - "unsharp mask & gaussian blur", - "unsharp", - "Remi Guyomarch", - "", - vf_open, - NULL -}; - -//===========================================================================// diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 86f6244..abb68e5 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -147,7 +147,6 @@ extern const vf_info_t vf_info_halfpack; extern const vf_info_t vf_info_dint; extern const vf_info_t vf_info_1bpp; extern const vf_info_t vf_info_2xsai; -extern const vf_info_t vf_info_unsharp; extern const vf_info_t vf_info_swapuv; extern const vf_info_t vf_info_il; extern const vf_info_t vf_info_fil; @@ -246,7 +245,6 @@ static const vf_info_t* const filters[]={ &vf_info_test, &vf_info_tile, &vf_info_tinterlace, - &vf_info_unsharp, &vf_info_uspp, &vf_info_yuvcsp, &vf_info_yvu9, -- 1.7.2.5

4 5

[PATCH] vf_unsharp: extend unsharp syntax, for supporting named options
by Stefano Sabatini 15 Feb '13

15 Feb '13

Make setting params less awkward. The old syntax is kept for backward compatibility. --- doc/filters.texi | 7 +++++ libavfilter/vf_unsharp.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 191d8a4..32630f7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1776,6 +1776,11 @@ Sharpen or blur the input video. It accepts the following parameters: @var{luma_msize_x}:@var{luma_msize_y}:@var{luma_amount}:@var{chroma_msize_x}:@var{chroma_msize_y}:@var{chroma_amount} +Alternatively it is possible to specify separately the luma or chroma +component through a string of the form: +"@var{msize_x}x@var{msize_y}[-+]@var{amount} using the :-separated +@opt{luma}/@opt{l} and @opt{chroma}/@opt{c} options. + Negative values for the amount will blur the input video, while positive values will sharpen. All parameters are optional and default to the equivalent of the string '5:5:1.0:5:5:0.0'. @@ -1811,9 +1816,11 @@ and 5.0, default value is 0.0. @example # Strong luma sharpen effect parameters unsharp=7:7:2.5 +unsharp=l=7x7+2.5 # Strong blur of both luma and chroma parameters unsharp=7:7:-2:7:7:-2 +unsharp=l=7x7-2:c=7x7-2 # Use the default values with @command{ffmpeg} ./ffmpeg -i in.avi -vf "unsharp" out.mp4 diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index ed8eef8..80859bd 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -39,6 +39,7 @@ #include "avfilter.h" #include "libavutil/common.h" #include "libavutil/mem.h" +#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #define MATRIX_MIN_LINE_SIZE 3 @@ -60,11 +61,34 @@ typedef struct FilterParam { } FilterParam; typedef struct { + const AVClass *class; FilterParam luma; ///< luma parameters (width, height, amount) FilterParam chroma; ///< chroma parameters (width, height, amount) int hsub, vsub; + char *luma_str, *chroma_str; } UnsharpContext; +#define OFFSET(x) offsetof(UnsharpContext, x) + +static const AVOption unsharp_options[] = { + {"luma", "set luma parameters", OFFSET(luma_str), FF_OPT_TYPE_STRING, {.str="5x5+1"}, CHAR_MIN, CHAR_MAX }, + {"l", "set luma parameters", OFFSET(luma_str), FF_OPT_TYPE_STRING, {.str="5x5+1"}, CHAR_MIN, CHAR_MAX }, + {"chroma", "set chroma parameters file", OFFSET(chroma_str), FF_OPT_TYPE_STRING, {.str="5x5+0"}, CHAR_MIN, CHAR_MAX }, + {"c", "set chroma parameters file", OFFSET(chroma_str), FF_OPT_TYPE_STRING, {.str="5x5+0"}, CHAR_MIN, CHAR_MAX }, + {NULL} +}; + +static const char *unsharp_get_name(void *ctx) +{ + return "unsharp"; +} + +static const AVClass unsharp_class = { + "UnsharpContext", + unsharp_get_name, + unsharp_options +}; + static void apply_unsharp( uint8_t *dst, int dst_stride, const uint8_t *src, int src_stride, int width, int height, FilterParam *fp) @@ -130,17 +154,49 @@ static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, double a fp->halfscale = 1 << (fp->scalebits - 1); } +static int parse_component_params(int *msize_x, int *msize_y, double *amount, + char *params, void *log_ctx) +{ + int n; + char sign; + + n = sscanf(params, "%dx%d%c%lf", msize_x, msize_y, &sign, amount); + if (n != 4 || (sign != '+' && sign != '-')) { + av_log(log_ctx, AV_LOG_ERROR, + "Invalid component parameters '%s', must be of the form " + "'XxY[+-]A'\n", params); + return AVERROR(EINVAL); + } + if (sign == '-') + *amount *= -1; + + return 0; +} + static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) { UnsharpContext *unsharp = ctx->priv; int lmsize_x = 5, cmsize_x = 5; int lmsize_y = 5, cmsize_y = 5; + int ret, val; double lamount = 1.0f, camount = 0.0f; int val; + unsharp->class = &unsharp_class; + av_opt_set_defaults2(unsharp, 0, 0); + if (args) + ret = sscanf(args, "%d:%d:%lf:%d:%d:%lf", &lmsize_x, &lmsize_y, &lamount, &cmsize_x, &cmsize_y, &camount); + if (!ret) { + if ((ret = av_set_options_string(unsharp, args, "=", ":")) < 0 || + (ret = parse_component_params(&lmsize_x, &lmsize_y, &lamount, + unsharp->luma_str, ctx)) < 0 || + (ret = parse_component_params(&cmsize_x, &cmsize_y, &camount, + unsharp->chroma_str, ctx)) < 0) + return ret; + } #define CHECK_SIZE(lc, xy, lc_str) \ val = lc##msize_##xy; \ @@ -215,6 +271,9 @@ static av_cold void uninit(AVFilterContext *ctx) { UnsharpContext *unsharp = ctx->priv; + av_freep(&unsharp->luma_str); + av_freep(&unsharp->chroma_str); + free_filter_param(&unsharp->luma); free_filter_param(&unsharp->chroma); } -- 1.7.2.5

4 4

[PATCH] vf_unsharp: extend/improve feedback for validity checks
by Stefano Sabatini 15 Feb '13

15 Feb '13

Abort for invalid too big values, and exactly state why the input value is invalid. In particular, avoid out-of-buffer access with too big values. --- libavfilter/vf_unsharp.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index e41e76f..9c85e5d 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -135,19 +135,27 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) UnsharpContext *unsharp = ctx->priv; int lmsize_x = 5, cmsize_x = 0; int lmsize_y = 5, cmsize_y = 0; + int val; double lamount = 1.0f, camount = 0.0f; if (args) sscanf(args, "%d:%d:%lf:%d:%d:%lf", &lmsize_x, &lmsize_y, &lamount, &cmsize_x, &cmsize_y, &camount); - if ((lamount && (lmsize_x < 2 || lmsize_y < 2)) || - (camount && (cmsize_x < 2 || cmsize_y < 2))) { - av_log(ctx, AV_LOG_ERROR, - "Invalid value <2 for lmsize_x:%d or lmsize_y:%d or cmsize_x:%d or cmsize_y:%d\n", - lmsize_x, lmsize_y, cmsize_x, cmsize_y); - return AVERROR(EINVAL); +#define CHECK_SIZE(lc, xy, lc_str) \ + val = lc##msize_##xy; \ + if (val < MATRIX_MIN_LINE_SIZE || val > MATRIX_MAX_LINE_SIZE) { \ + av_log(ctx, AV_LOG_ERROR, \ + "Invalid value '%d' for %s %s size, " \ + "must be >= %d and <= %d\n", \ + val, #lc_str, #xy, \ + MATRIX_MIN_LINE_SIZE, MATRIX_MAX_LINE_SIZE); \ + return AVERROR(EINVAL); \ } + CHECK_SIZE(l, x, luma); + CHECK_SIZE(l, y, luma); + CHECK_SIZE(c, x, chroma); + CHECK_SIZE(c, y, chroma); set_filter_param(&unsharp->luma, lmsize_x, lmsize_y, lamount); set_filter_param(&unsharp->chroma, cmsize_x, cmsize_y, camount); -- 1.7.2.5

3 8

[PATCH] vf_unsharp: provide better names for the MIN/MAX_SIZE macros
by Stefano Sabatini 15 Feb '13

15 Feb '13

--- libavfilter/vf_unsharp.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index b770437..e41e76f 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -41,8 +41,9 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" -#define MIN_SIZE 3 -#define MAX_SIZE 13 +#define MATRIX_MIN_LINE_SIZE 3 +#define MATRIX_MAX_LINE_SIZE 13 +#define MATRIX_MAX_SIZE (MATRIX_MAX_LINE_SIZE * MATRIX_MAX_LINE_SIZE) /* right-shift and round-up */ #define UPSHIFT(x,shift) (-((-(x))>>(shift))) @@ -55,7 +56,7 @@ typedef struct FilterParam { int steps_y; ///< vertical step count int scalebits; ///< bits to shift pixel int32_t halfscale; ///< amount to add to pixel - uint32_t *sc[(MAX_SIZE * MAX_SIZE) - 1]; ///< finite state machine storage + uint32_t *sc[MATRIX_MAX_SIZE - 1]; ///< finite state machine storage } FilterParam; typedef struct { @@ -69,7 +70,7 @@ static void apply_unsharp( uint8_t *dst, int dst_stride, int width, int height, FilterParam *fp) { uint32_t **sc = fp->sc; - uint32_t sr[(MAX_SIZE * MAX_SIZE) - 1], tmp1, tmp2; + uint32_t sr[MATRIX_MAX_SIZE - 1], tmp1, tmp2; int32_t res; int x, y, z; -- 1.7.2.5

3 6

Yamaha SMAF 'CNTI' chunk is wrong.
by yoshihisa.uchida＠gmail.com 07 Jan '13

07 Jan '13

Hi, ffmpeg developers, For Yamaha SMAF, Contents Info chunk ('CNTI') includes only following members: - Contents Class - Contents Type - Contents Code Type - Copy Status - Copy Counts (see http://smaf-yamaha.com/what/s52.html) But, in the current ffmpeg, 'CNTI' includes metadata ("VN:libavcodec,"). According to SMAF Specifications Optional Data Chunk (http://smaf-yamaha.com/what/s52.html) I corrected that metadata include Optional Data Chunk ('OPDA'). Regards, uchan

5 5