[FFmpeg-soc] [soc]: r5754 - in libavfilter: Makefile allfilters.c checkout.sh diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_overlay.c vf_setpts.c
stefano
subversion at mplayerhq.hu
Tue Apr 13 00:34:55 CEST 2010
Author: stefano
Date: Tue Apr 13 00:34:54 2010
New Revision: 5754
Log:
Update to FFmpeg r22866 / libswscale r30979.
Modified:
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/checkout.sh
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
libavfilter/vf_overlay.c
libavfilter/vf_setpts.c
Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/Makefile Tue Apr 13 00:34:54 2010 (r5754)
@@ -34,6 +34,7 @@ OBJS-$(CONFIG_SETPTS_FILTER)
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
OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
Modified: libavfilter/allfilters.c
==============================================================================
--- libavfilter/allfilters.c Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/allfilters.c Tue Apr 13 00:34:54 2010 (r5754)
@@ -53,6 +53,7 @@ void avfilter_register_all(void)
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);
REGISTER_FILTER (BUFFER, buffer, vsrc);
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/checkout.sh Tue Apr 13 00:34:54 2010 (r5754)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22749
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22866
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Tue Apr 13 00:34:54 2010 (r5754)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 22749)
+--- ffmpeg.c (revision 22866)
+++ ffmpeg.c (working copy)
@@ -43,6 +43,13 @@
#include "libavutil/libm.h"
@@ -237,7 +237,7 @@ Index: ffmpeg.c
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
-@@ -923,7 +1123,9 @@
+@@ -932,7 +1132,9 @@
int *frame_size)
{
int nb_frames, i, ret;
@@ -247,7 +247,7 @@ Index: ffmpeg.c
AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
AVFrame picture_crop_temp, picture_pad_temp;
AVCodecContext *enc, *dec;
-@@ -971,6 +1173,9 @@
+@@ -980,6 +1182,9 @@
if (nb_frames <= 0)
return;
@@ -257,7 +257,7 @@ Index: ffmpeg.c
if (ost->video_crop) {
if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
fprintf(stderr, "error cropping picture\n");
-@@ -982,6 +1187,7 @@
+@@ -991,6 +1196,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -1008,6 +1214,7 @@
+@@ -1017,6 +1223,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1055,6 +1262,7 @@
+@@ -1064,6 +1271,7 @@
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
@@ -281,7 +281,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1320,6 +1528,10 @@
+@@ -1329,6 +1537,10 @@
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -292,7 +292,7 @@ Index: ffmpeg.c
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
-@@ -1447,6 +1659,15 @@
+@@ -1456,6 +1668,15 @@
&buffer_to_free);
}
@@ -308,7 +308,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1468,10 +1689,18 @@
+@@ -1477,10 +1698,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,7 +328,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1489,6 +1718,9 @@
+@@ -1498,6 +1727,9 @@
do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
break;
case AVMEDIA_TYPE_VIDEO:
@@ -338,7 +338,7 @@ Index: ffmpeg.c
do_video_out(os, ost, ist, &picture, &frame_size);
if (vstats_filename && frame_size)
do_video_stats(os, ost, frame_size);
-@@ -1557,7 +1789,17 @@
+@@ -1566,7 +1798,17 @@
av_free_packet(&opkt);
}
}
@@ -356,7 +356,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -2039,9 +2281,10 @@
+@@ -2044,9 +2286,10 @@
av_exit(1);
}
@@ -368,7 +368,7 @@ Index: ffmpeg.c
codec->bits_per_raw_sample= 0;
}
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
-@@ -2049,6 +2292,13 @@
+@@ -2054,6 +2297,13 @@
ost->resample_pix_fmt= icodec->pix_fmt;
ost->encoding_needed = 1;
ist->decoding_needed = 1;
@@ -382,7 +382,7 @@ Index: ffmpeg.c
break;
case AVMEDIA_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2447,6 +2697,12 @@
+@@ -2439,6 +2689,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -4023,6 +4279,9 @@
+@@ -4015,6 +4271,9 @@
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
@@ -405,7 +405,7 @@ Index: ffmpeg.c
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
-@@ -4083,6 +4342,9 @@
+@@ -4075,6 +4334,9 @@
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/diffs/03_libavfilter_doc.diff Tue Apr 13 00:34:54 2010 (r5754)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 22749)
+--- doc/libavfilter.texi (revision 22866)
+++ doc/libavfilter.texi (working copy)
@@ -139,6 +139,20 @@
@@ -195,10 +195,10 @@ Index: doc/libavfilter.texi
+
+Transpose (line => column) input video to next video filter.
+
- @section vflip
+ @section unsharp
- Flip the input video vertically.
-@@ -229,6 +390,32 @@
+ Sharpen or blur the input video. It accepts the following parameters:
+@@ -282,6 +443,32 @@
Below is a description of the currently available video sources.
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/vf_overlay.c Tue Apr 13 00:34:54 2010 (r5754)
@@ -144,11 +144,11 @@ static int config_input_overlay(AVFilter
var_values[OVERLAY_W] = ctx->inputs[1]->w;
var_values[OVERLAY_H] = ctx->inputs[1]->h;
- over->x = ff_eval2((expr = over->x_expr), var_values, var_names,
+ over->x = ff_parse_and_eval_expr((expr = over->x_expr), var_values, var_names,
NULL, NULL, NULL, NULL, NULL, &error);
if (error)
goto fail;
- over->y = ff_eval2((expr = over->y_expr), var_values, var_names,
+ over->y = ff_parse_and_eval_expr((expr = over->y_expr), var_values, var_names,
NULL, NULL, NULL, NULL, NULL, &error);
if (error)
goto fail;
Modified: libavfilter/vf_setpts.c
==============================================================================
--- libavfilter/vf_setpts.c Sun Apr 11 18:29:01 2010 (r5753)
+++ libavfilter/vf_setpts.c Tue Apr 13 00:34:54 2010 (r5754)
@@ -63,7 +63,7 @@ enum PosOfValue {
};
typedef struct {
- AVEvalExpr *expr;
+ AVExpr *expr;
double const_values[POV_NULL+1];
} SetPTSContext;
@@ -72,7 +72,7 @@ static av_cold int init(AVFilterContext
SetPTSContext *setpts = ctx->priv;
const char *error;
- setpts->expr = ff_parse(args ? args : "PTS",
+ setpts->expr = ff_parse_expr(args ? args : "PTS",
const_names, NULL, NULL, NULL, NULL, &error);
if (! setpts->expr)
av_log(ctx, AV_LOG_ERROR,
@@ -108,7 +108,7 @@ static void start_frame(AVFilterLink *li
// (uint64_t) ff_parse_eval(setpts->expr, setpts->const_values, setpts));
ref2->pts =
- (uint64_t) ff_parse_eval(setpts->expr, setpts->const_values, setpts);
+ (uint64_t) ff_eval_expr(setpts->expr, setpts->const_values, setpts);
setpts->const_values[POV_N ] += 1.0;
@@ -118,7 +118,7 @@ static void start_frame(AVFilterLink *li
static av_cold void uninit(AVFilterContext *ctx)
{
SetPTSContext *setpts = ctx->priv;
- ff_eval_free(setpts->expr);
+ ff_free_expr(setpts->expr);
}
AVFilter avfilter_vf_setpts =
More information about the FFmpeg-soc
mailing list