[FFmpeg-soc] [soc]: r5944 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_fade.c vf_negate.c vf_rotate.c
stefano
subversion at mplayerhq.hu
Sun Dec 12 19:35:50 CET 2010
Author: stefano
Date: Sun Dec 12 19:35:50 2010
New Revision: 5944
Log:
Update to FFmpeg r25942 / libswscale r32676.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/00_configure.diff
libavfilter/diffs/01_build.diff
libavfilter/diffs/03_doc_filters.diff
libavfilter/vf_fade.c
libavfilter/vf_negate.c
libavfilter/vf_rotate.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/checkout.sh Sun Dec 12 19:35:50 2010 (r5944)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25789
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25942
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r32571
+svn up -r32676
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/diffs/00_configure.diff Sun Dec 12 19:35:50 2010 (r5944)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 25789)
+--- configure (revision 25942)
+++ configure (working copy)
@@ -170,6 +170,7 @@
and libraw1394 [no]
@@ -26,17 +26,19 @@ Index: configure
log2
log2f
loongson
-@@ -1405,7 +1408,9 @@
+@@ -1406,9 +1409,11 @@
# filters
blackframe_filter_deps="gpl"
cropdetect_filter_deps="gpl"
+drawtext_filter_deps="libfreetype"
frei0r_filter_deps="frei0r dlopen strtok_r"
+ frei0r_src_filter_deps="frei0r dlopen strtok_r"
+ hqdn3d_filter_deps="gpl"
+movie_filter_deps="avformat"
ocv_smooth_filter_deps="libopencv"
yadif_filter_deps="gpl"
-@@ -2666,6 +2671,7 @@
+@@ -2669,6 +2674,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -44,7 +46,7 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2750,6 +2756,7 @@
+@@ -2753,6 +2759,7 @@
require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) &&
require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
Modified: libavfilter/diffs/01_build.diff
==============================================================================
--- libavfilter/diffs/01_build.diff Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/diffs/01_build.diff Sun Dec 12 19:35:50 2010 (r5944)
@@ -1,6 +1,6 @@
Index: libavfilter/Makefile
===================================================================
---- libavfilter/Makefile (revision 25789)
+--- libavfilter/Makefile (revision 25942)
+++ libavfilter/Makefile (working copy)
@@ -3,6 +3,7 @@
NAME = avfilter
@@ -10,7 +10,7 @@ Index: libavfilter/Makefile
HEADERS = avfilter.h avfiltergraph.h
-@@ -24,10 +25,14 @@
+@@ -23,24 +24,30 @@
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o
OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o
@@ -20,37 +20,40 @@ Index: libavfilter/Makefile
OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
+OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o
OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o
+ OBJS-$(CONFIG_GRADFUN_FILTER) += vf_gradfun.o
OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
+ OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
+OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
OBJS-$(CONFIG_OCV_SMOOTH_FILTER) += vf_libopencv.o
-@@ -35,10 +40,12 @@
+ OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
- OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o
+OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
+ OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o
OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o
+ OBJS-$(CONFIG_SETSAR_FILTER) += vf_aspect.o
OBJS-$(CONFIG_SETTB_FILTER) += vf_settb.o
OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
+OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o
OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
-@@ -46,6 +53,7 @@
-
+@@ -49,6 +56,7 @@
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
+ OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o
+OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o
OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
Index: libavfilter/allfilters.c
===================================================================
---- libavfilter/allfilters.c (revision 25789)
+--- libavfilter/allfilters.c (revision 25942)
+++ libavfilter/allfilters.c (working copy)
-@@ -45,10 +45,14 @@
+@@ -44,24 +44,30 @@
REGISTER_FILTER (CROP, crop, vf);
REGISTER_FILTER (CROPDETECT, cropdetect, vf);
REGISTER_FILTER (DRAWBOX, drawbox, vf);
@@ -60,28 +63,31 @@ Index: libavfilter/allfilters.c
REGISTER_FILTER (FORMAT, format, vf);
+ REGISTER_FILTER (FPS, fps, vf);
REGISTER_FILTER (FREI0R, frei0r, vf);
+ REGISTER_FILTER (GRADFUN, gradfun, vf);
REGISTER_FILTER (HFLIP, hflip, vf);
+ REGISTER_FILTER (HQDN3D, hqdn3d, vf);
+ REGISTER_FILTER (NEGATE, negate, vf);
REGISTER_FILTER (NOFORMAT, noformat, vf);
REGISTER_FILTER (NULL, null, vf);
REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf);
-@@ -56,10 +60,12 @@
+ REGISTER_FILTER (OVERLAY, overlay, vf);
REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
- REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
+ REGISTER_FILTER (ROTATE, rotate, vf);
REGISTER_FILTER (SCALE, scale, vf);
+ REGISTER_FILTER (SETDAR, setdar, vf);
REGISTER_FILTER (SETPTS, setpts, vf);
+ REGISTER_FILTER (SETSAR, setsar, vf);
REGISTER_FILTER (SETTB, settb, vf);
REGISTER_FILTER (SLICIFY, slicify, vf);
+ REGISTER_FILTER (SPLIT, split, vf);
REGISTER_FILTER (TRANSPOSE, transpose, vf);
REGISTER_FILTER (UNSHARP, unsharp, vf);
REGISTER_FILTER (VFLIP, vflip, vf);
-@@ -67,6 +73,7 @@
-
+@@ -70,6 +76,7 @@
REGISTER_FILTER (BUFFER, buffer, vsrc);
REGISTER_FILTER (COLOR, color, vsrc);
+ REGISTER_FILTER (FREI0R, frei0r_src, vsrc);
+ REGISTER_FILTER (MOVIE, movie, vsrc);
REGISTER_FILTER (NULLSRC, nullsrc, vsrc);
Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/diffs/03_doc_filters.diff Sun Dec 12 19:35:50 2010 (r5944)
@@ -1,8 +1,8 @@
Index: doc/filters.texi
===================================================================
---- doc/filters.texi (revision 25789)
+--- doc/filters.texi (revision 25942)
+++ doc/filters.texi (working copy)
-@@ -257,6 +257,99 @@
+@@ -348,6 +348,99 @@
drawbox=10:20:200:60:red@@0.5"
@end example
@@ -102,7 +102,7 @@ Index: doc/filters.texi
@section fifo
Buffer input images and send them when they are requested.
-@@ -333,6 +426,14 @@
+@@ -425,6 +518,14 @@
For more information see:
@url{http://piksel.org/frei0r}
@@ -114,12 +114,12 @@ Index: doc/filters.texi
+
+Modifies the framerate of the input video to a chosen one.
+
- @section hflip
+ @section gradfun
- Flip the input video horizontally.
-@@ -343,6 +444,14 @@
- ffmpeg -i in.avi -vf "hflip" out.avi
- @end example
+ Fix the banding artifacts that are sometimes introduced into nearly flat
+@@ -491,6 +592,14 @@
+ @var{luma_tmp}*@var{chroma_spatial}/@var{luma_spatial}
+ @end table
+ at section negate
+
@@ -132,7 +132,7 @@ Index: doc/filters.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -505,6 +614,14 @@
+@@ -653,6 +762,14 @@
can be used to test the monowhite pixel format descriptor definition.
@@ -147,7 +147,7 @@ Index: doc/filters.texi
@section scale
Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -635,6 +752,11 @@
+@@ -783,6 +900,11 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -159,7 +159,7 @@ Index: doc/filters.texi
@section transpose
Transpose rows with columns in the input video and optionally flip it.
-@@ -853,6 +975,27 @@
+@@ -1001,6 +1123,27 @@
"color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
@end example
Modified: libavfilter/vf_fade.c
==============================================================================
--- libavfilter/vf_fade.c Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/vf_fade.c Sun Dec 12 19:35:50 2010 (r5944)
@@ -36,6 +36,7 @@
ffmpeg -i input.avi -vfilters "fade=in:5:20" output.avi
*/
+#include "libavutil/pixdesc.h"
#include "avfilter.h"
typedef struct
@@ -92,7 +93,8 @@ static int query_formats(AVFilterContext
static int config_props(AVFilterLink *link)
{
FadeContext *fade = link->dst->priv;
- avcodec_get_chroma_sub_sample(link->format, &fade->hsub, &fade->vsub);
+ fade->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
+ fade->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
if (link->format == PIX_FMT_RGB24 || link->format == PIX_FMT_BGR24)
fade->bpp = 3;
else
@@ -181,7 +183,7 @@ AVFilter avfilter_vf_fade =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= get_video_buffer,
.start_frame = start_frame,
.end_frame = end_frame,
@@ -190,7 +192,7 @@ AVFilter avfilter_vf_fade =
.min_perms = AV_PERM_READ | AV_PERM_WRITE, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_negate.c
==============================================================================
--- libavfilter/vf_negate.c Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/vf_negate.c Sun Dec 12 19:35:50 2010 (r5944)
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/pixdesc.h"
#include "avfilter.h"
typedef struct
@@ -46,7 +47,8 @@ static int config_props(AVFilterLink *li
{
NegContext *neg = link->dst->priv;
- avcodec_get_chroma_sub_sample(link->format, &neg->hsub, &neg->vsub);
+ neg->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
+ neg->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
switch(link->format) {
case PIX_FMT_YUVJ444P:
Modified: libavfilter/vf_rotate.c
==============================================================================
--- libavfilter/vf_rotate.c Sun Nov 21 21:21:37 2010 (r5943)
+++ libavfilter/vf_rotate.c Sun Dec 12 19:35:50 2010 (r5944)
@@ -29,6 +29,7 @@
*/
#include <math.h>
+#include "libavutil/pixdesc.h"
#include "avfilter.h"
typedef struct
@@ -72,7 +73,8 @@ static int config_props_input(AVFilterLi
{
RotContext *rot = link->dst->priv;
- avcodec_get_chroma_sub_sample(link->format, &rot->hsub, &rot->vsub);
+ rot->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
+ rot->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
rot->backcolor[0] = 16;
rot->backcolor[1] = 128;
More information about the FFmpeg-soc
mailing list