rpms/gstreamer-ffmpeg/devel gst-ffmpeg-0.10.4-av_picture_copy.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gst-ffmpeg-0.10.3-no-ffdec_faad.patch, 1.1, 1.2 gstreamer-ffmpeg.spec, 1.3, 1.4 sources, 1.2, 1.3 gst-ffmpeg-0.10.1-syslibs.patch, 1.1, NONE

Thu Jul 24 11:09:41 CEST 2008

Author: jwrdegoede

Update of /cvs/free/rpms/gstreamer-ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27575

Modified Files:
	.cvsignore gst-ffmpeg-0.10.3-no-ffdec_faad.patch 
	gstreamer-ffmpeg.spec sources 
Added Files:
	gst-ffmpeg-0.10.4-av_picture_copy.patch 
Removed Files:
	gst-ffmpeg-0.10.1-syslibs.patch 
Log Message:
* Thu May 22 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.4-1
- New upstream release 0.10.4
- Drop several upstreamed patches


gst-ffmpeg-0.10.4-av_picture_copy.patch:

--- NEW FILE gst-ffmpeg-0.10.4-av_picture_copy.patch ---
diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c
--- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c~	2008-05-22 20:18:14.000000000 +0200
+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.c	2008-05-22 20:18:14.000000000 +0200
@@ -3287,29 +3287,3 @@ gst_ffmpeg_avpicture_fill (AVPicture * p
 
   return 0;
 }
-
-/**
- * Convert image 'src' to 'dst'.
- *
- * We use this code to copy two pictures between the same
- * colorspaces, so this function is not realy used to do
- * colorspace conversion.
- * The ffmpeg code has a bug in it where odd sized frames were
- * not copied completely. We adjust the input parameters for
- * the original ffmpeg img_convert function here so that it
- * still does the right thing.
- */
-int
-gst_ffmpeg_img_convert (AVPicture * dst, int dst_pix_fmt,
-    const AVPicture * src, int src_pix_fmt, int src_width, int src_height)
-{
-  struct SwsContext *ctx;
-  int res;
-
-  ctx = sws_getContext (src_width, src_height, src_pix_fmt, src_width, src_height, dst_pix_fmt, 2,      /* flags : bicubic */
-      NULL, NULL, NULL);
-  res = sws_scale (ctx, (uint8_t **) src->data, (int *) src->linesize,
-      2, src_width, dst->data, dst->linesize);
-  sws_freeContext (ctx);
-  return res;
-}
diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h
--- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h~	2008-05-22 20:17:56.000000000 +0200
+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegcodecmap.h	2008-05-22 20:17:56.000000000 +0200
@@ -125,15 +125,6 @@ gst_ffmpeg_avpicture_fill (AVPicture * p
                            int         height);
 
 /*
- * convert an image, we only use this for copying the image, ie,
- * convert between the same colorspaces.
- */
-int
-gst_ffmpeg_img_convert (AVPicture * dst, int dst_pix_fmt,
-                        const AVPicture * src, int src_pix_fmt,
-                        int src_width, int src_height);
-
-/*
  * Convert from/to a GStreamer <-> FFMpeg timestamp.
  */
 static inline guint64
diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c
--- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c~	2008-05-22 20:27:02.000000000 +0200
+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c	2008-05-22 20:27:02.000000000 +0200
@@ -1342,11 +1342,7 @@ get_output_buffer (GstFFMpegDec * ffmpeg
     gst_ffmpeg_avpicture_fill (&pic, GST_BUFFER_DATA (*outbuf),
         ffmpegdec->context->pix_fmt, width, height);
 
-    /* the original convert function did not do the right thing, this
-     * is a patched up version that adjust widht/height so that the
-     * ffmpeg one works correctly. */
-    gst_ffmpeg_img_convert (&pic, ffmpegdec->context->pix_fmt,
-        (AVPicture *) ffmpegdec->picture,
+    av_picture_copy(&pic, (AVPicture *) ffmpegdec->picture,
         ffmpegdec->context->pix_fmt, width, height);
   }
   ffmpegdec->picture->pts = -1;
diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c
--- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c~	2008-05-22 20:27:18.000000000 +0200
+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdemux.c	2008-05-22 20:27:18.000000000 +0200
@@ -1268,9 +1268,8 @@ gst_ffmpegdemux_loop (GstPad * pad)
         avstream->codec->pix_fmt, avstream->codec->width,
         avstream->codec->height);
 
-    gst_ffmpeg_img_convert (&dst, avstream->codec->pix_fmt,
-        &src, avstream->codec->pix_fmt, avstream->codec->width,
-        avstream->codec->height);
+    av_picture_copy (&dst, &src, avstream->codec->pix_fmt,
+        avstream->codec->width, avstream->codec->height);
   } else {
     memcpy (GST_BUFFER_DATA (outbuf), pkt.data, outsize);
   }
diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c~ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c
--- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c~	2008-05-22 20:27:17.000000000 +0200
+++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegmux.c	2008-05-22 20:27:17.000000000 +0200
@@ -554,8 +554,8 @@ gst_ffmpegmux_collected (GstCollectPads 
       gst_ffmpeg_avpicture_fill (&src, GST_BUFFER_DATA (buf),
           PIX_FMT_RGB24, st->codec->width, st->codec->height);
 
-      gst_ffmpeg_img_convert (&dst, PIX_FMT_RGB24,
-          &src, PIX_FMT_RGB24, st->codec->width, st->codec->height);
+      av_picture_copy(&dst, &src, PIX_FMT_RGB24,
+          st->codec->width, st->codec->height);
     } else {
       pkt.data = GST_BUFFER_DATA (buf);
       pkt.size = GST_BUFFER_SIZE (buf);


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Apr 2008 15:12:58 -0000	1.2
+++ .cvsignore	24 Jul 2008 09:09:41 -0000	1.3
@@ -1 +1 @@
-gst-ffmpeg-0.10.3.tar.bz2
+gst-ffmpeg-0.10.4.tar.bz2

gst-ffmpeg-0.10.3-no-ffdec_faad.patch:

Index: gst-ffmpeg-0.10.3-no-ffdec_faad.patch
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gst-ffmpeg-0.10.3-no-ffdec_faad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-ffmpeg-0.10.3-no-ffdec_faad.patch	23 Apr 2008 15:12:58 -0000	1.1
+++ gst-ffmpeg-0.10.3-no-ffdec_faad.patch	24 Jul 2008 09:09:41 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c~ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c
---- gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c~	2008-04-10 22:10:45.000000000 +0200
-+++ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegdec.c	2008-04-10 22:10:45.000000000 +0200
-@@ -2256,6 +2256,11 @@ gst_ffmpegdec_register (GstPlugin * plug
+diff -up gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c.foo gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c
+--- gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c.foo	2008-05-19 21:58:09.000000000 +0200
++++ gst-ffmpeg-0.10.4/ext/ffmpeg/gstffmpegdec.c	2008-07-23 16:44:06.000000000 +0200
+@@ -2461,6 +2461,11 @@ gst_ffmpegdec_register (GstPlugin * plug
        goto next;
      }
  
@@ -12,4 +12,4 @@
 +
      /* name */
      if (!gst_ffmpeg_get_codecid_longname (in_plugin->id)) {
-       GST_INFO ("Add decoder %s (%d) please", in_plugin->name, in_plugin->id);
+       GST_WARNING ("Add a longname mapping for decoder %s (%d) please",


Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer-ffmpeg.spec	4 May 2008 09:56:01 -0000	1.3
+++ gstreamer-ffmpeg.spec	24 Jul 2008 09:09:41 -0000	1.4
@@ -1,14 +1,16 @@
 Name:           gstreamer-ffmpeg
-Version:        0.10.3
-Release:        4%{?dist}
+Version:        0.10.4
+Release:        1%{?dist}
 Summary:        GStreamer FFmpeg-based plug-ins
 Group:          Applications/Multimedia
 # the ffmpeg plugin is LGPL, the postproc plugin is GPL
 License:        GPLv2+ and LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar.bz2
-Patch0:         gst-ffmpeg-0.10.1-syslibs.patch
+# submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=534392
 Patch1:         gst-ffmpeg-0.10.3-no-ffdec_faad.patch
+# submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=534390
+Patch2:         gst-ffmpeg-0.10.4-av_picture_copy.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gstreamer-devel >= 0.10.0
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
@@ -27,8 +29,14 @@
 
 %prep
 %setup -q -n gst-ffmpeg-%{version}
-%patch0 -p1 -z .syslibs
 %patch1 -p1
+%patch2 -p1
+# adjust includes for the header move in latest ffmpeg <sigh>
+sed -i -e 's|ffmpeg/avcodec.h|ffmpeg/libavcodec/avcodec.h|g' \
+  -e 's|ffmpeg/avformat.h|ffmpeg/libavformat/avformat.h|g' \
+  -e 's|postproc/postprocess.h|ffmpeg/libpostproc/postprocess.h|g' \
+  -e 's|ffmpeg/swscale.h|ffmpeg/libswscale/swscale.h|g' \
+  ext/ffmpeg/*.c ext/ffmpeg/*.h ext/libpostproc/*.c
 
 
 %build
@@ -57,6 +65,13 @@
 
 
 %changelog
+* Thu May 22 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.4-1
+- New upstream release 0.10.4
+- Drop several upstreamed patches
+
+* Thu May  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.3-5
+- Fix playback of wvc1 videos (livna bug 1960)
+
 * Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.3-4
 - Disable ffdec_faad as this has issues (use gstreamer-plugins-bad instead)
   (livna bug 1935)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Apr 2008 15:12:58 -0000	1.2
+++ sources	24 Jul 2008 09:09:41 -0000	1.3
@@ -1 +1 @@
-c07fd2da0835989fc4eae291cbc05f09  gst-ffmpeg-0.10.3.tar.bz2
+761cbbc0b5f077449082d0ea7527941e  gst-ffmpeg-0.10.4.tar.bz2


--- gst-ffmpeg-0.10.1-syslibs.patch DELETED ---

