[FFmpeg-soc] [soc]: r4197 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
stefano
subversion at mplayerhq.hu
Mon Apr 13 19:52:51 CEST 2009
Author: stefano
Date: Mon Apr 13 19:52:51 2009
New Revision: 4197
Log:
Update against FFmpeg r18497.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
libavfilter/diffs/02_ffmpeg_filters.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Tue Apr 7 22:31:57 2009 (r4196)
+++ libavfilter/checkout.sh Mon Apr 13 19:52:51 2009 (r4197)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r18342
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r18497
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 Tue Apr 7 22:31:57 2009 (r4196)
+++ libavfilter/diffs/01_ffplay_filters.diff Mon Apr 13 19:52:51 2009 (r4197)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 18342)
+--- ffplay.c (revision 18497)
+++ ffplay.c (working copy)
@@ -29,6 +29,12 @@
#include "libavcodec/audioconvert.h"
@@ -38,7 +38,7 @@ Index: ffplay.c
} VideoPicture;
typedef struct SubPicture {
-@@ -173,6 +186,10 @@
+@@ -172,6 +185,10 @@
// QETimer *video_timer;
char filename[1024];
int width, height, xleft, ytop;
@@ -49,7 +49,7 @@ Index: ffplay.c
} VideoState;
static void show_help(void);
-@@ -213,6 +230,9 @@
+@@ -212,6 +229,9 @@
static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
@@ -59,7 +59,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -662,6 +682,13 @@
+@@ -661,6 +681,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);
-@@ -669,9 +696,10 @@
+@@ -668,9 +695,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
-@@ -874,9 +902,15 @@
+@@ -873,9 +901,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;
-@@ -1189,6 +1223,20 @@
+@@ -1188,6 +1222,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 */
-@@ -1206,12 +1254,9 @@
+@@ -1205,12 +1253,9 @@
break;
}
#endif
@@ -136,7 +136,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1227,8 +1272,11 @@
+@@ -1226,8 +1271,11 @@
{
VideoPicture *vp;
int dst_pix_fmt;
@@ -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 &&
-@@ -1244,8 +1292,13 @@
+@@ -1243,8 +1291,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -163,7 +163,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1270,6 +1323,11 @@
+@@ -1269,6 +1322,11 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
AVPicture pict;
@@ -175,7 +175,7 @@ Index: ffplay.c
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1283,18 +1341,30 @@
+@@ -1282,18 +1340,30 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -210,7 +210,7 @@ Index: ffplay.c
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1349,54 +1419,267 @@
+@@ -1348,54 +1418,267 @@
return queue_picture(is, src_frame, pts);
}
@@ -229,9 +229,9 @@ Index: ffplay.c
+ /* NOTE: ipts is the PTS of the _first_ picture beginning in
+ this packet, if any */
+ is->video_st->codec->reordered_opaque= pkt->pts;
-+ len1 = avcodec_decode_video(is->video_st->codec,
-+ frame, &got_picture,
-+ pkt->data, pkt->size);
++ len1 = avcodec_decode_video2(is->video_st->codec,
++ frame, &got_picture,
++ pkt);
+
+ if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
+ && frame->reordered_opaque != AV_NOPTS_VALUE)
@@ -470,9 +470,9 @@ Index: ffplay.c
- /* NOTE: ipts is the PTS of the _first_ picture beginning in
- this packet, if any */
- is->video_st->codec->reordered_opaque= pkt->pts;
-- len1 = avcodec_decode_video(is->video_st->codec,
+- len1 = avcodec_decode_video2(is->video_st->codec,
- frame, &got_picture,
-- pkt->data, pkt->size);
+- pkt);
+ pts = pts_int;
+ pts /= AV_TIME_BASE;
+ ret = output_picture2(is, frame, pts);
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Tue Apr 7 22:31:57 2009 (r4196)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Apr 13 19:52:51 2009 (r4197)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 18342)
+--- ffmpeg.c (revision 18497)
+++ ffmpeg.c (working copy)
@@ -40,6 +40,13 @@
#include "libavutil/avstring.h"
@@ -26,7 +26,7 @@ Index: ffmpeg.c
static int intra_only = 0;
static int audio_sample_rate = 44100;
-@@ -281,6 +291,13 @@
+@@ -287,6 +297,13 @@
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
@@ -40,7 +40,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -296,6 +313,183 @@
+@@ -302,6 +319,183 @@
static struct termios oldtty;
#endif
@@ -224,7 +224,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#if HAVE_TERMIOS_H
-@@ -880,6 +1074,9 @@
+@@ -892,6 +1086,9 @@
if (nb_frames <= 0)
return;
@@ -234,7 +234,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");
-@@ -891,6 +1088,7 @@
+@@ -903,6 +1100,7 @@
} else {
formatted_picture = in_picture;
}
@@ -242,7 +242,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -908,12 +1106,14 @@
+@@ -920,12 +1118,14 @@
}
}
@@ -257,17 +257,18 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1184,6 +1384,9 @@
- static short *samples= NULL;
+@@ -1194,6 +1394,10 @@
+ static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
+#if CONFIG_AVFILTER
+ int loop;
+#endif
++
+ AVPacket avpkt;
if(ist->next_pts == AV_NOPTS_VALUE)
- ist->next_pts= ist->pts;
-@@ -1303,6 +1506,15 @@
+@@ -1314,6 +1518,15 @@
&buffer_to_free);
}
@@ -283,7 +284,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1324,10 +1536,18 @@
+@@ -1335,10 +1548,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -303,7 +304,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1350,6 +1570,9 @@
+@@ -1361,6 +1582,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -313,7 +314,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);
-@@ -1407,7 +1630,17 @@
+@@ -1421,7 +1645,17 @@
av_free_packet(&opkt);
}
}
@@ -331,7 +332,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1840,10 +2073,21 @@
+@@ -1854,10 +2088,21 @@
fprintf(stderr, "Cannot get resampling context\n");
av_exit(1);
}
@@ -353,7 +354,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3860,6 +4104,9 @@
+@@ -3874,6 +4119,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" },
More information about the FFmpeg-soc
mailing list