[FFmpeg-soc] [soc]: r3762 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff
stefano
subversion at mplayerhq.hu
Thu Oct 9 22:56:05 CEST 2008
Author: stefano
Date: Thu Oct 9 22:56:05 2008
New Revision: 3762
Log:
Update ffplay diff and checkout.sh to match against FFmpeg SVN revision
15585.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh (original)
+++ libavfilter/checkout.sh Thu Oct 9 22:56:05 2008
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r15000
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r15585
echo "patching ffmpeg"
for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff (original)
+++ libavfilter/diffs/01_ffplay_filters.diff Thu Oct 9 22:56:05 2008
@@ -1,10 +1,10 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 15000)
+--- ffplay.c (revision 15585)
+++ ffplay.c (working copy)
-@@ -28,6 +28,12 @@
- #include "libswscale/swscale.h"
+@@ -29,6 +29,12 @@
#include "libavcodec/audioconvert.h"
+ #include "libavcodec/opt.h"
+#if ENABLE_AVFILTER
+# include "libavfilter/avfilter.h"
@@ -15,7 +15,7 @@ Index: ffplay.c
#include "cmdutils.h"
#include <SDL.h>
-@@ -66,7 +72,9 @@
+@@ -67,7 +73,9 @@
/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
#define SAMPLE_ARRAY_SIZE (2*65536)
@@ -25,7 +25,7 @@ Index: ffplay.c
typedef struct PacketQueue {
AVPacketList *first_pkt, *last_pkt;
-@@ -84,7 +92,12 @@
+@@ -85,7 +93,12 @@
double pts; ///<presentation time stamp for this picture
SDL_Overlay *bmp;
int width, height; /* source height & width */
@@ -38,7 +38,7 @@ Index: ffplay.c
} VideoPicture;
typedef struct SubPicture {
-@@ -171,6 +184,10 @@
+@@ -172,6 +185,10 @@
// QETimer *video_timer;
char filename[1024];
int width, height, xleft, ytop;
@@ -49,8 +49,8 @@ Index: ffplay.c
} VideoState;
static void show_help(void);
-@@ -210,6 +227,9 @@
- static int error_resilience = FF_ER_CAREFUL;
+@@ -211,6 +228,9 @@
+ static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
+#if ENABLE_AVFILTER
@@ -59,7 +59,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -656,6 +676,13 @@
+@@ -657,6 +677,13 @@
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
@@ -73,7 +73,7 @@ Index: ffplay.c
/* XXX: use variable in the frame */
if (is->video_st->sample_aspect_ratio.num)
aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
-@@ -663,9 +690,10 @@
+@@ -664,9 +691,10 @@
aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
else
aspect_ratio = 0;
@@ -85,7 +85,7 @@ Index: ffplay.c
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -868,9 +896,15 @@
+@@ -869,9 +897,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -101,7 +101,7 @@ Index: ffplay.c
} else {
w = 640;
h = 480;
-@@ -1175,6 +1209,20 @@
+@@ -1176,6 +1210,20 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -122,7 +122,7 @@ Index: ffplay.c
#if 0
/* XXX: use generic function */
/* XXX: disable overlay if no hardware acceleration or if RGB format */
-@@ -1192,12 +1240,9 @@
+@@ -1193,12 +1241,9 @@
break;
}
#endif
@@ -136,7 +136,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1214,8 +1259,11 @@
+@@ -1215,8 +1260,11 @@
VideoPicture *vp;
int dst_pix_fmt;
AVPicture pict;
@@ -149,7 +149,7 @@ Index: ffplay.c
/* wait until we have space to put a new picture */
SDL_LockMutex(is->pictq_mutex);
while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
-@@ -1231,8 +1279,13 @@
+@@ -1232,8 +1280,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -163,7 +163,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1256,6 +1309,12 @@
+@@ -1257,6 +1310,12 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
@@ -176,7 +176,7 @@ Index: ffplay.c
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1267,17 +1326,29 @@
+@@ -1268,18 +1327,30 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -193,6 +193,7 @@ Index: ffplay.c
+ av_picture_copy(&pict, &pict_src,
+ vp->pix_fmt, vp->width, vp->height);
+#else
+ sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
img_convert_ctx = sws_getCachedContext(img_convert_ctx,
- is->video_st->codec->width, is->video_st->codec->height,
- is->video_st->codec->pix_fmt,
@@ -210,7 +211,7 @@ Index: ffplay.c
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1332,54 +1403,256 @@
+@@ -1334,54 +1405,256 @@
return queue_picture(is, src_frame, pts);
}
@@ -498,7 +499,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2156,6 +2429,12 @@
+@@ -2161,6 +2434,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -511,13 +512,23 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2493,6 +2772,9 @@
+@@ -2498,6 +2777,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" },
+#if ENABLE_AVFILTER
+ { "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", "" },
{ NULL, },
};
+@@ -2546,7 +2828,9 @@
+ avctx_opts[i]= avcodec_alloc_context2(i);
+ }
+ avformat_opts = av_alloc_format_context();
++#if !ENABLE_AVFILTER
+ sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
++#endif
+
+ show_banner();
More information about the FFmpeg-soc
mailing list