[FFmpeg-soc] [soc]: r5492 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_drawbox.c vf_fifo.c vf_fps.c vf_hflip.c vf_negate.c vf_overlay....
stefano
subversion at mplayerhq.hu
Sat Dec 5 02:01:55 CET 2009
Author: stefano
Date: Sat Dec 5 02:01:55 2009
New Revision: 5492
Log:
Update to FFmpeg r20735 / libswscale r29974.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
libavfilter/vf_drawbox.c
libavfilter/vf_fifo.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_negate.c
libavfilter/vf_overlay.c
libavfilter/vf_rotate.c
libavfilter/vf_split.c
libavfilter/vf_transpose.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_movie.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/checkout.sh Sat Dec 5 02:01:55 2009 (r5492)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20660
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20735
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r29968
+svn up -r29974
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/diffs/01_ffplay_filters.diff Sat Dec 5 02:01:55 2009 (r5492)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 20660)
+--- ffplay.c (revision 20735)
+++ ffplay.c (working copy)
@@ -30,6 +30,12 @@
#include "libavcodec/colorspace.h"
@@ -296,7 +296,7 @@ Index: ffplay.c
+ picref->pts = pts;
+ picref->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio;
+ avfilter_start_frame(link, avfilter_ref_pic(picref, ~0));
-+ avfilter_draw_slice(link, 0, link->h);
++ avfilter_draw_slice(link, 0, link->h, 1);
+ avfilter_end_frame(link);
+ avfilter_unref_pic(picref);
+
@@ -547,7 +547,7 @@ Index: ffplay.c
if (show_status)
printf("\n");
SDL_Quit();
-@@ -2490,6 +2791,9 @@
+@@ -2484,6 +2785,9 @@
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" },
{ "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
@@ -555,9 +555,9 @@ Index: ffplay.c
+ { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
+#endif
{ "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
- { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
{ NULL, },
-@@ -2539,7 +2843,9 @@
+ };
+@@ -2532,7 +2836,9 @@
avcodec_opts[i]= avcodec_alloc_context2(i);
}
avformat_opts = avformat_alloc_context();
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Dec 5 02:01:55 2009 (r5492)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 20660)
+--- ffmpeg.c (revision 20735)
+++ ffmpeg.c (working copy)
@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
@@ -267,15 +267,15 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -941,6 +1149,7 @@
- }
+@@ -950,6 +1158,7 @@
+ av_exit(1);
}
+#if !CONFIG_AVFILTER
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -989,6 +1198,7 @@
+@@ -997,6 +1206,7 @@
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
@@ -283,7 +283,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1255,6 +1465,10 @@
+@@ -1263,6 +1473,10 @@
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -294,7 +294,7 @@ Index: ffmpeg.c
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
-@@ -1377,6 +1591,15 @@
+@@ -1385,6 +1599,15 @@
&buffer_to_free);
}
@@ -310,7 +310,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1398,10 +1621,18 @@
+@@ -1406,10 +1629,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -330,7 +330,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1418,6 +1649,9 @@
+@@ -1426,6 +1657,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -340,7 +340,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);
-@@ -1483,7 +1717,17 @@
+@@ -1491,7 +1725,17 @@
av_free_packet(&opkt);
}
}
@@ -358,22 +358,20 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1937,16 +2181,27 @@
+@@ -1945,9 +2189,10 @@
av_exit(1);
}
-+#if CONFIG_AVFILTER
-+ ost->resample_height = icodec->height;
-+#else
++#if !CONFIG_AVFILTER
ost->original_height = icodec->height;
ost->original_width = icodec->width;
-
- ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
- ost->resample_width = icodec->width - (frame_leftBand + frame_rightBand);
- ost->resample_pix_fmt= icodec->pix_fmt;
+-
+#endif
codec->bits_per_raw_sample= 0;
}
+ ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
+@@ -1955,6 +2200,13 @@
+ ost->resample_pix_fmt= icodec->pix_fmt;
ost->encoding_needed = 1;
ist->decoding_needed = 1;
+
@@ -386,7 +384,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2333,6 +2588,12 @@
+@@ -2341,6 +2593,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -399,7 +397,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3898,6 +4159,9 @@
+@@ -3899,6 +4157,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" },
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/diffs/03_libavfilter_doc.diff Sat Dec 5 02:01:55 2009 (r5492)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 20660)
+--- doc/libavfilter.texi (revision 20735)
+++ doc/libavfilter.texi (working copy)
@@ -111,6 +111,20 @@
Modified: libavfilter/vf_drawbox.c
==============================================================================
--- libavfilter/vf_drawbox.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_drawbox.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -137,7 +137,7 @@ static void end_frame(AVFilterLink *link
draw_box(pic,context,context->color);
- avfilter_draw_slice(output, 0, pic->h);
+ avfilter_draw_slice(output, 0, pic->h, 1);
avfilter_end_frame(output);
}
Modified: libavfilter/vf_fifo.c
==============================================================================
--- libavfilter/vf_fifo.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_fifo.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -74,7 +74,7 @@ static void end_frame(AVFilterLink *link
/* TODO: support forwarding slices as they come if the next filter has
* requested a frame and we had none buffered */
-static void draw_slice(AVFilterLink *link, int y, int h)
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
}
@@ -90,7 +90,7 @@ static int request_frame(AVFilterLink *l
/* by doing this, we give ownership of the reference to the next filter,
* so we don't have to worry about dereferencing it ourselves. */
avfilter_start_frame(link, buf->root.next->pic);
- avfilter_draw_slice(link, 0, buf->root.next->pic->h);
+ avfilter_draw_slice(link, 0, buf->root.next->pic->h, 1);
avfilter_end_frame(link);
if(buf->last == buf->root.next)
Modified: libavfilter/vf_fps.c
==============================================================================
--- libavfilter/vf_fps.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_fps.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -102,7 +102,7 @@ static int request_frame(AVFilterLink *l
fps->has_frame=0;
avfilter_start_frame(link, avfilter_ref_pic(fps->pic, ~AV_PERM_WRITE));
- avfilter_draw_slice (link, 0, fps->pic->h);
+ avfilter_draw_slice (link, 0, fps->pic->h, 1);
avfilter_end_frame (link);
avfilter_unref_pic(fps->pic);
Modified: libavfilter/vf_hflip.c
==============================================================================
--- libavfilter/vf_hflip.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_hflip.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -50,7 +50,7 @@ static int config_props(AVFilterLink *li
return 0;
}
-static void draw_slice(AVFilterLink *link, int y, int h)
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
FlipContext *flip = link->dst->priv;
AVFilterPicRef *in = link->cur_pic;
@@ -84,7 +84,7 @@ static void draw_slice(AVFilterLink *lin
}
}
- avfilter_draw_slice(link->dst->outputs[0], y, h);
+ avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
}
AVFilter avfilter_vf_hflip =
Modified: libavfilter/vf_negate.c
==============================================================================
--- libavfilter/vf_negate.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_negate.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -64,7 +64,7 @@ static int config_props(AVFilterLink *li
return 0;
}
-static void draw_slice(AVFilterLink *link, int y, int h)
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
NegContext *neg = link->dst->priv;
AVFilterPicRef *in = link->cur_pic;
@@ -106,7 +106,7 @@ static void draw_slice(AVFilterLink *lin
}
}
- avfilter_draw_slice(link->dst->outputs[0], y, h);
+ avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
}
AVFilter avfilter_vf_negate =
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_overlay.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -268,7 +268,7 @@ static int request_frame(AVFilterLink *l
/* and send it to the next filter */
avfilter_start_frame(link, avfilter_ref_pic(pic, ~0));
- avfilter_draw_slice (link, 0, pic->h);
+ avfilter_draw_slice (link, 0, pic->h, 1);
avfilter_end_frame (link);
avfilter_unref_pic(pic);
Modified: libavfilter/vf_rotate.c
==============================================================================
--- libavfilter/vf_rotate.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_rotate.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -105,7 +105,7 @@ static int config_props_output(AVFilterL
return 0;
}
-static void draw_slice(AVFilterLink *link, int y, int h)
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
RotContext *rot = link->dst->priv;
AVFilterPicRef *in = link->cur_pic;
@@ -153,7 +153,7 @@ static void draw_slice(AVFilterLink *lin
}
}
- avfilter_draw_slice(link->dst->outputs[0], y, h);
+ avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
}
AVFilter avfilter_vf_rotate =
Modified: libavfilter/vf_split.c
==============================================================================
--- libavfilter/vf_split.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_split.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -43,10 +43,10 @@ static void end_frame(AVFilterLink *link
avfilter_unref_pic(link->cur_pic);
}
-static void draw_slice(AVFilterLink *link, int y, int h)
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
- avfilter_draw_slice(link->dst->outputs[0], y, h);
- avfilter_draw_slice(link->dst->outputs[1], y, h);
+ avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
+ avfilter_draw_slice(link->dst->outputs[1], y, h, slice_dir);
}
AVFilter avfilter_vf_split =
Modified: libavfilter/vf_transpose.c
==============================================================================
--- libavfilter/vf_transpose.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vf_transpose.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -64,7 +64,7 @@ static int config_props_output(AVFilterL
return 0;
}
-static void draw_slice(AVFilterLink *link, int y, int h)
+static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
TransContext *trans = link->dst->priv;
AVFilterPicRef *in = link->cur_pic;
@@ -86,7 +86,7 @@ static void draw_slice(AVFilterLink *lin
}
}
- avfilter_draw_slice(link->dst->outputs[0], y, h);
+ avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
}
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
Modified: libavfilter/vsrc_buffer.c
==============================================================================
--- libavfilter/vsrc_buffer.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vsrc_buffer.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -106,7 +106,7 @@ static int request_frame(AVFilterLink *l
picref->pts = c->pts;
picref->pixel_aspect = c->pixel_aspect;
avfilter_start_frame(link, avfilter_ref_pic(picref, ~0));
- avfilter_draw_slice(link, 0, link->h);
+ avfilter_draw_slice(link, 0, link->h, 1);
avfilter_end_frame(link);
avfilter_unref_pic(picref);
Modified: libavfilter/vsrc_movie.c
==============================================================================
--- libavfilter/vsrc_movie.c Fri Dec 4 23:44:51 2009 (r5491)
+++ libavfilter/vsrc_movie.c Sat Dec 5 02:01:55 2009 (r5492)
@@ -234,7 +234,7 @@ static int request_frame(AVFilterLink *l
out->pixel_aspect = mv->codec_ctx->sample_aspect_ratio;
avfilter_start_frame(link, out);
- avfilter_draw_slice(link, 0, out->h);
+ avfilter_draw_slice(link, 0, out->h, 1);
avfilter_end_frame(link);
return 0;
More information about the FFmpeg-soc
mailing list