[FFmpeg-soc] [soc]: r1063 - in libavfilter: diffs diffs/00_build.diff diffs/01_ffplay_get_video_frame.diff diffs/02_ffplay_VideoPicture_vars.diff diffs/03_ffplay_filters.diff diffs/README ffmpeg.diff
koorogi
subversion at mplayerhq.hu
Mon Aug 20 18:04:10 CEST 2007
Author: koorogi
Date: Mon Aug 20 18:04:10 2007
New Revision: 1063
Log:
Split the ffmpeg patch into logical parts
Added:
libavfilter/diffs/
libavfilter/diffs/00_build.diff
libavfilter/diffs/01_ffplay_get_video_frame.diff
libavfilter/diffs/02_ffplay_VideoPicture_vars.diff
libavfilter/diffs/03_ffplay_filters.diff
libavfilter/diffs/README
Removed:
libavfilter/ffmpeg.diff
Added: libavfilter/diffs/00_build.diff
==============================================================================
--- (empty file)
+++ libavfilter/diffs/00_build.diff Mon Aug 20 18:04:10 2007
@@ -0,0 +1,123 @@
+Index: configure
+===================================================================
+--- configure (revision 10118)
++++ configure (working copy)
+@@ -70,6 +70,7 @@
+ echo " and ffmpeg will be under GPL [default=no]"
+ echo " --enable-pp enable GPLed postprocessing support [default=no]"
+ echo " --enable-swscaler software scaler support [default=no]"
++ echo " --enable-avfilter video filter support (replaces vhook) [default=no]"
+ echo " --enable-beosthreads use BeOS threads [default=no]"
+ echo " --enable-pthreads use pthreads [default=no]"
+ echo " --enable-w32threads use Win32 threads [default=no]"
+@@ -570,6 +571,7 @@
+ CONFIG_LIST='
+ audio_beos
+ audio_oss
++ avfilter
+ avisynth
+ beos_netserver
+ bktr
+@@ -1837,6 +1839,7 @@
+ echo "shared ${shared-no}"
+ echo "postprocessing support ${pp-no}"
+ echo "software scaler enabled ${swscaler-no}"
++echo "new filter support ${avfilter-no}"
+ echo "video hooking ${vhook-no}"
+ if enabled vhook; then
+ echo "Imlib2 support ${imlib2-no}"
+@@ -2115,3 +2118,8 @@
+ apply libswscale.pc sed s/^Libs:.*$/Libs:/
+ apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
+ fi
++
++if enabled avfilter; then
++ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$avfilter_version" "-lavfilter $extralibs" "$pkg_requires libavutil = $lavu=version" ffmpeg
++ pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$avfilter_version" "$extralibs" "$pkg_requires libavutil = $libavu_version"
++fi
+Index: Makefile
+===================================================================
+--- Makefile (revision 10118)
++++ Makefile (working copy)
+@@ -8,6 +8,7 @@
+
+ CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
++ -I$(SRC_PATH)/libavfilter \
+ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H
+ LDFLAGS+= -g
+
+@@ -65,6 +66,11 @@
+ EXTRALIBS+=-lswscale$(BUILDSUF)
+ endif
+
++ifeq ($(CONFIG_AVFILTER),yes)
++LDFLAGS+=-L$(BUILD_ROOT)/libavfilter
++EXTRALIBS+=-lavfilter$(BUILDSUF)
++endif
++
+ all: lib $(PROGS) $(ALL_TARGETS-yes)
+
+ lib:
+@@ -76,7 +82,10 @@
+ endif
+ ifeq ($(CONFIG_SWSCALER),yes)
+ $(MAKE) -C libswscale all
++ifeq ($(CONFIG_AVFILTER),yes)
++ $(MAKE) -C libavfilter all
+ endif
++endif
+
+ ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+ $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
+@@ -181,6 +190,9 @@
+ $(MAKE) -C libpostproc install-headers
+ endif
+ $(MAKE) -C libswscale install-headers
++ifeq ($(CONFIG_AVFILTER),yes)
++ $(MAKE) -C libavfilter install-headers
++endif
+
+ uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
+
+@@ -199,12 +211,14 @@
+ $(MAKE) -C libavcodec uninstall-libs
+ $(MAKE) -C libavformat uninstall-libs
+ $(MAKE) -C libpostproc uninstall-libs
++ $(MAKE) -C libavfilter uninstall-libs
+
+ uninstall-headers:
+ $(MAKE) -C libavutil uninstall-headers
+ $(MAKE) -C libavcodec uninstall-headers
+ $(MAKE) -C libavformat uninstall-headers
+ $(MAKE) -C libpostproc uninstall-headers
++ $(MAKE) -C libavfilter uninstall-headers
+ -rmdir "$(INCDIR)"
+
+ depend dep: .depend .vhookdep
+@@ -217,6 +231,9 @@
+ ifeq ($(CONFIG_SWSCALER),yes)
+ $(MAKE) -C libswscale depend
+ endif
++ifeq ($(CONFIG_AVFILTER),yes)
++ $(MAKE) -C libavfilter depend
++endif
+
+ .depend: $(SRCS) version.h
+ $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
+@@ -236,6 +253,7 @@
+ $(MAKE) -C libavformat clean
+ $(MAKE) -C libpostproc clean
+ $(MAKE) -C libswscale clean
++ $(MAKE) -C libavfilter clean
+ rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
+ output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
+ rm -f doc/*.html doc/*.pod doc/*.1
+@@ -249,6 +267,7 @@
+ $(MAKE) -C libavformat distclean
+ $(MAKE) -C libpostproc distclean
+ $(MAKE) -C libswscale distclean
++ $(MAKE) -C libavfilter distclean
+ rm -f .depend version.h config.* *.pc
+
+ TAGS:
Added: libavfilter/diffs/01_ffplay_get_video_frame.diff
==============================================================================
--- (empty file)
+++ libavfilter/diffs/01_ffplay_get_video_frame.diff Mon Aug 20 18:04:10 2007
@@ -0,0 +1,87 @@
+Index: ffplay.c
+===================================================================
+--- ffplay.c (revision 10134)
++++ ffplay.c (working copy)
+@@ -1338,21 +1338,12 @@
+ avcodec_default_release_buffer(c, pic);
+ }
+
+-static int video_thread(void *arg)
++static int get_video_frame(VideoState *is, AVFrame *frame, uint64_t *pts)
+ {
+- VideoState *is = arg;
+ AVPacket pkt1, *pkt = &pkt1;
+- int len1, got_picture;
+- AVFrame *frame= avcodec_alloc_frame();
+- double pts;
++ int got_picture;
+
+- for(;;) {
+- while (is->paused && !is->videoq.abort_request) {
+- SDL_Delay(10);
+- }
+- if (packet_queue_get(&is->videoq, pkt, 1) < 0)
+- break;
+-
++ while (packet_queue_get(&is->videoq, pkt, 1) >= 0) {
+ if(pkt->data == flush_pkt.data){
+ avcodec_flush_buffers(is->video_st->codec);
+ continue;
+@@ -1361,26 +1352,45 @@
+ /* NOTE: ipts is the PTS of the _first_ picture beginning in
+ this packet, if any */
+ global_video_pkt_pts= pkt->pts;
+- len1 = avcodec_decode_video(is->video_st->codec,
+- frame, &got_picture,
+- pkt->data, pkt->size);
++ avcodec_decode_video(is->video_st->codec,
++ frame, &got_picture,
++ pkt->data, pkt->size);
+
+ if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
+ && frame->opaque && *(uint64_t*)frame->opaque != AV_NOPTS_VALUE)
+- pts= *(uint64_t*)frame->opaque;
++ *pts= *(uint64_t*)frame->opaque;
+ else if(pkt->dts != AV_NOPTS_VALUE)
+- pts= pkt->dts;
++ *pts= pkt->dts;
+ else
+- pts= 0;
+- pts *= av_q2d(is->video_st->time_base);
++ *pts= 0;
+
+-// if (len1 < 0)
+-// break;
+- if (got_picture) {
+- if (output_picture2(is, frame, pts) < 0)
++ /* put pts into units of 1/AV_TIME_BASE */
++ *pts = AV_TIME_BASE * (*pts) * is->video_st->time_base.num /
++ is->video_st->time_base.den;
++
++ av_free_packet(pkt);
++ if(got_picture)
++ return 1;
++ }
++ return 0;
++}
++
++static int video_thread(void *arg)
++{
++ VideoState *is = arg;
++ AVFrame *frame= avcodec_alloc_frame();
++ uint64_t pts_int;
++ double pts;
++
++ for(;;) {
++ while (is->paused && !is->videoq.abort_request)
++ SDL_Delay(10);
++ while(get_video_frame(is, frame, &pts_int)) {
++ pts = pts_int;
++ pts /= AV_TIME_BASE;
++ if(output_picture2(is, frame, pts) < 0)
+ goto the_end;
+ }
+- av_free_packet(pkt);
+ if (step)
+ if (cur_stream)
+ stream_pause(cur_stream);
Added: libavfilter/diffs/02_ffplay_VideoPicture_vars.diff
==============================================================================
--- (empty file)
+++ libavfilter/diffs/02_ffplay_VideoPicture_vars.diff Mon Aug 20 18:04:10 2007
@@ -0,0 +1,67 @@
+--- ffplay.c 2007-08-20 11:47:41.000000000 -0400
++++ ffplay.c 2007-08-20 11:53:06.000000000 -0400
+@@ -79,6 +79,7 @@
+ double pts; ///<presentation time stamp for this picture
+ SDL_Overlay *bmp;
+ int width, height; /* source height & width */
++ enum PixelFormat pix_fmt;
+ int allocated;
+ } VideoPicture;
+
+@@ -652,10 +653,9 @@
+ aspect_ratio = 0;
+ else
+ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio)
+- * is->video_st->codec->width / is->video_st->codec->height;;
++ * vp->width / vp->height;
+ if (aspect_ratio <= 0.0)
+- aspect_ratio = (float)is->video_st->codec->width /
+- (float)is->video_st->codec->height;
++ aspect_ratio = (float)vp->width / (float)vp->height;
+ /* if an active format is indicated, then it overrides the
+ mpeg format */
+ #if 0
+@@ -1166,6 +1166,10 @@
+ if (vp->bmp)
+ SDL_FreeYUVOverlay(vp->bmp);
+
++ vp->width = is->video_st->codec->width;
++ vp->height = is->video_st->codec->height;
++ vp->pix_fmt = is->video_st->codec->pix_fmt;
++
+ #if 0
+ /* XXX: use generic function */
+ /* XXX: disable overlay if no hardware acceleration or if RGB format */
+@@ -1183,12 +1187,9 @@
+ break;
+ }
+ #endif
+- vp->bmp = SDL_CreateYUVOverlay(is->video_st->codec->width,
+- is->video_st->codec->height,
++ vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height,
+ SDL_YV12_OVERLAY,
+ screen);
+- vp->width = is->video_st->codec->width;
+- vp->height = is->video_st->codec->height;
+
+ SDL_LockMutex(is->pictq_mutex);
+ vp->allocated = 1;
+@@ -1259,16 +1260,14 @@
+ pict.linesize[1] = vp->bmp->pitches[2];
+ pict.linesize[2] = vp->bmp->pitches[1];
+ img_convert_ctx = sws_getCachedContext(img_convert_ctx,
+- is->video_st->codec->width, is->video_st->codec->height,
+- is->video_st->codec->pix_fmt,
+- is->video_st->codec->width, is->video_st->codec->height,
++ vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
+ dst_pix_fmt, sws_flags, NULL, NULL, NULL);
+ if (img_convert_ctx == NULL) {
+ fprintf(stderr, "Cannot initialize the conversion context\n");
+ exit(1);
+ }
+ sws_scale(img_convert_ctx, src_frame->data, src_frame->linesize,
+- 0, is->video_st->codec->height, pict.data, pict.linesize);
++ 0, vp->height, pict.data, pict.linesize);
+ /* update the bitmap content */
+ SDL_UnlockYUVOverlay(vp->bmp);
+
Added: libavfilter/diffs/03_ffplay_filters.diff
==============================================================================
--- (empty file)
+++ libavfilter/diffs/03_ffplay_filters.diff Mon Aug 20 18:04:10 2007
@@ -0,0 +1,351 @@
+--- ffplay.c 2007-08-20 11:53:06.000000000 -0400
++++ ffplay.c 2007-08-20 11:57:49.000000000 -0400
+@@ -25,6 +25,10 @@
+ #include "swscale.h"
+ #include "avstring.h"
+
++#if ENABLE_AVFILTER
++# include "avfilter.h"
++#endif
++
+ #include "version.h"
+ #include "cmdutils.h"
+
+@@ -81,6 +85,10 @@
+ int width, height; /* source height & width */
+ enum PixelFormat pix_fmt;
+ int allocated;
++
++#if ENABLE_AVFILTER
++ AVFilterPicRef *picref;
++#endif
+ } VideoPicture;
+
+ typedef struct SubPicture {
+@@ -163,6 +171,10 @@
+ // QETimer *video_timer;
+ char filename[1024];
+ int width, height, xleft, ytop;
++
++#if ENABLE_AVFILTER
++ AVFilterContext *out_video_filter; ///<the last filter in the video chain
++#endif
+ } VideoState;
+
+ void show_help(void);
+@@ -202,6 +214,9 @@
+ static int error_resilience = FF_ER_CAREFUL;
+ static int error_concealment = 3;
+ static int decoder_reorder_pts= 0;
++#if ENABLE_AVFILTER
++static char *vfilters = NULL;
++#endif
+
+ /* current context */
+ static int is_full_screen;
+@@ -648,14 +663,22 @@
+
+ vp = &is->pictq[is->pictq_rindex];
+ if (vp->bmp) {
++#if ENABLE_AVFILTER
++ if (vp->picref->pixel_aspect.num == 0)
++ aspect_ratio = 0;
++ else
++ aspect_ratio = av_q2d(vp->picref->pixel_aspect);
++#else
+ /* XXX: use variable in the frame */
+ if (is->video_st->codec->sample_aspect_ratio.num == 0)
+ aspect_ratio = 0;
+ else
+- aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio)
+- * vp->width / vp->height;
++ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
++#endif
+ if (aspect_ratio <= 0.0)
+ aspect_ratio = (float)vp->width / (float)vp->height;
++ else
++ aspect_ratio *= (float)vp->width / (float)vp->height;
+ /* if an active format is indicated, then it overrides the
+ mpeg format */
+ #if 0
+@@ -858,9 +881,15 @@
+ } else if(!is_full_screen && screen_width){
+ w = screen_width;
+ h = screen_height;
++#if ENABLE_AVFILTER
++ }else if (is->out_video_filter && is->out_video_filter->inputs[0]){
++ w = is->out_video_filter->inputs[0]->w;
++ h = is->out_video_filter->inputs[0]->h;
++#else
+ }else if (is->video_st && is->video_st->codec->width){
+ w = is->video_st->codec->width;
+ h = is->video_st->codec->height;
++#endif
+ } else {
+ w = 640;
+ h = 480;
+@@ -1166,9 +1195,19 @@
+ if (vp->bmp)
+ SDL_FreeYUVOverlay(vp->bmp);
+
++#if ENABLE_AVFILTER
++ if (vp->picref)
++ avfilter_unref_pic(vp->picref);
++ vp->picref = NULL;
++
++ vp->width = is->out_video_filter->inputs[0]->w;
++ vp->height = is->out_video_filter->inputs[0]->h;
++ vp->pix_fmt = is->out_video_filter->inputs[0]->format;
++#else
+ vp->width = is->video_st->codec->width;
+ vp->height = is->video_st->codec->height;
+ vp->pix_fmt = is->video_st->codec->pix_fmt;
++#endif
+
+ #if 0
+ /* XXX: use generic function */
+@@ -1223,8 +1262,13 @@
+
+ /* alloc or resize hardware picture buffer */
+ if (!vp->bmp ||
++#if ENABLE_AVFILTER
++ vp->width != is->out_video_filter->inputs[0]->w ||
++ vp->height != is->out_video_filter->inputs[0]->h) {
++#else
+ vp->width != is->video_st->codec->width ||
+ vp->height != is->video_st->codec->height) {
++#endif
+ SDL_Event event;
+
+ vp->allocated = 0;
+@@ -1248,6 +1292,12 @@
+
+ /* if the frame is not skipped, then display it */
+ if (vp->bmp) {
++#if ENABLE_AVFILTER
++ if(vp->picref)
++ avfilter_unref_pic(vp->picref);
++ vp->picref = src_frame->opaque;
++#endif
++
+ /* get a pointer on the bitmap */
+ SDL_LockYUVOverlay (vp->bmp);
+
+@@ -1374,6 +1424,136 @@
+ return 0;
+ }
+
++#if ENABLE_AVFILTER
++typedef struct {
++ VideoState *is;
++ AVFrame *frame;
++} FilterPriv;
++
++static int input_init(AVFilterContext *ctx, const char *args, void *opaque)
++{
++ FilterPriv *priv = ctx->priv;
++ if(!opaque) return -1;
++
++ priv->is = opaque;
++ priv->frame = avcodec_alloc_frame();
++
++ return 0;
++}
++
++static void input_uninit(AVFilterContext *ctx)
++{
++ FilterPriv *priv = ctx->priv;
++ av_free(priv->frame);
++}
++
++static int input_request_frame(AVFilterLink *link)
++{
++ FilterPriv *priv = link->src->priv;
++ AVFilterPicRef *picref;
++ uint64_t pts;
++
++ if(!get_video_frame(priv->is, priv->frame, &pts))
++ return -1;
++
++ /* FIXME: until I figure out how to hook everything up to the codec
++ * right, we're just copying the entire frame. */
++ picref = avfilter_get_video_buffer(link, AV_PERM_WRITE);
++ av_picture_copy((AVPicture *)&picref->data, (AVPicture *)priv->frame,
++ picref->pic->format, picref->w, picref->h);
++
++ 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, picref->h);
++ avfilter_end_frame(link);
++ avfilter_unref_pic(picref);
++
++ return 0;
++}
++
++static int *input_query_formats(AVFilterLink *link)
++{
++ FilterPriv *priv = link->src->priv;
++ return avfilter_make_format_list(1, priv->is->video_st->codec->pix_fmt);
++}
++
++static int input_config_props(AVFilterLink *link)
++{
++ FilterPriv *priv = link->src->priv;
++ AVCodecContext *c = priv->is->video_st->codec;
++
++ link->w = c->width;
++ link->h = c->height;
++
++ return 0;
++}
++
++static AVFilter input_filter =
++{
++ .name = "ffplay_input",
++ .author = "Bobby Bingham",
++
++ .priv_size = sizeof(FilterPriv),
++
++ .init = input_init,
++ .uninit = input_uninit,
++
++ .inputs = (AVFilterPad[]) {{ .name = NULL }},
++ .outputs = (AVFilterPad[]) {{ .name = "default",
++ .type = AV_PAD_VIDEO,
++ .request_frame = input_request_frame,
++ .query_formats = input_query_formats,
++ .config_props = input_config_props, },
++ { .name = NULL }},
++};
++
++static void output_end_frame(AVFilterLink *link)
++{
++}
++
++static int *output_query_formats(AVFilterLink *link)
++{
++ return avfilter_make_format_list(8, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P,
++ PIX_FMT_YUV410P, PIX_FMT_YUV411P, PIX_FMT_YUYV422,
++ PIX_FMT_RGB24, PIX_FMT_BGR24);
++}
++
++static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
++ uint64_t *pts)
++{
++ AVFilterPicRef *pic;
++
++ if(avfilter_request_frame(ctx->inputs[0]))
++ return 0;
++ if(!(pic = ctx->inputs[0]->cur_pic))
++ return 0;
++ ctx->inputs[0]->cur_pic = NULL;
++
++ frame->opaque = pic;
++ *pts = pic->pts;
++
++ memcpy(frame->data, pic->data, sizeof(frame->data));
++ memcpy(frame->linesize, pic->linesize, sizeof(frame->linesize));
++
++ return 1;
++}
++
++static AVFilter output_filter =
++{
++ .name = "ffplay_output",
++ .author = "Bobby Bingham",
++
++ .inputs = (AVFilterPad[]) {{ .name = "default",
++ .type = AV_PAD_VIDEO,
++ .end_frame = output_end_frame,
++ .query_formats = output_query_formats,
++ .min_perms = AV_PERM_READ, },
++ { .name = NULL }},
++ .outputs = (AVFilterPad[]) {{ .name = NULL }},
++};
++#endif /* ENABLE_AVFILTER */
++
+ static int video_thread(void *arg)
+ {
+ VideoState *is = arg;
+@@ -1381,10 +1561,46 @@
+ uint64_t pts_int;
+ double pts;
+
++#if ENABLE_AVFILTER
++ AVFilterContext *filt_src = NULL, *filt_out = NULL, *filt_graph = NULL;
++ AVFilter *filterdef;
++
++ avfilter_init();
++ //avfilter_register(&input_filter);
++ //avfilter_register(&output_filter);
++
++ if(!(filt_src = avfilter_open(&input_filter, "src"))) goto the_end;
++ if(!(filt_out = avfilter_open(&output_filter, "out"))) goto the_end;
++
++ if(avfilter_init_filter(filt_src, NULL, is)) goto the_end;
++ if(avfilter_init_filter(filt_out, NULL, frame)) goto the_end;
++
++ if(vfilters) {
++ if(!(filterdef = avfilter_get_by_name("graph")) ||
++ !(filt_graph = avfilter_open(filterdef, NULL)))
++ goto the_end;
++ if(avfilter_init_filter(filt_graph, vfilters, NULL))
++ goto the_end;
++ if(avfilter_link(filt_src, 0, filt_graph, 0)) goto the_end;
++ if(avfilter_link(filt_graph, 0, filt_out, 0)) goto the_end;
++ if(avfilter_config_link(filt_src->outputs[0])) goto the_end;
++ if(avfilter_graph_config_links(filt_graph)) goto the_end;
++ if(avfilter_config_link(filt_out->inputs[0])) goto the_end;
++ } else {
++ if(avfilter_link(filt_src, 0, filt_out, 0) < 0) goto the_end;
++ if(avfilter_config_link(filt_src->outputs[0])) goto the_end;
++ }
++ is->out_video_filter = filt_out;
++#endif
++
+ for(;;) {
+ while (is->paused && !is->videoq.abort_request)
+ SDL_Delay(10);
++#if ENABLE_AVFILTER
++ while(get_filtered_video_frame(filt_out, frame, &pts_int)) {
++#else
+ while(get_video_frame(is, frame, &pts_int)) {
++#endif
+ pts = pts_int;
+ pts /= AV_TIME_BASE;
+ if(output_picture2(is, frame, pts) < 0)
+@@ -1395,6 +1611,10 @@
+ stream_pause(cur_stream);
+ }
+ the_end:
++ #if ENABLE_AVFILTER
++ if(filt_src) avfilter_destroy(filt_src);
++ if(filt_out) avfilter_destroy(filt_out);
++ #endif
+ av_free(frame);
+ return 0;
+ }
+@@ -2145,6 +2365,12 @@
+ /* free all pictures */
+ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
+ vp = &is->pictq[i];
++#if ENABLE_AVFILTER
++ if (vp->picref) {
++ avfilter_unref_pic(vp->picref);
++ vp->picref = NULL;
++ }
++#endif
+ if (vp->bmp) {
+ SDL_FreeYUVOverlay(vp->bmp);
+ vp->bmp = NULL;
+@@ -2497,6 +2723,9 @@
+ #endif
+ { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
+ { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
++#if ENABLE_AVFILTER
++ { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" },
++#endif
+ { NULL, },
+ };
+
Added: libavfilter/diffs/README
==============================================================================
--- (empty file)
+++ libavfilter/diffs/README Mon Aug 20 18:04:10 2007
@@ -0,0 +1,18 @@
+These diff files, applied in sequence, will allow ffplay to use libavfilter:
+
+00_build.diff:
+ build system changes
+
+01_ffplay_get_video_frame.diff:
+ separate a function to get the next video frame out from the main video
+ thread function. this will make it easier to replace it with a version
+ which returns the frame after being filtered.
+
+02_ffplay_VideoPicture_vars.diff:
+ changes the code to use the image dimensions and pixel format stored in
+ the VideoPicture structure, rather than assuming the codec is right. if
+ we filter the video, the codec may not accurately represent the filtered
+ output.
+
+03_ffplay_filters.diff:
+ enables filtering
More information about the FFmpeg-soc
mailing list