From: <sl...@ke...> - 2008-10-30 12:06:10
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: slomo Date: Thu Oct 30 2008 12:06:00 UTC Log message: Based on a patch by: Alexis Ballier <aballier at gentoo dot org> * configure.ac: * ext/ffmpeg/gstffmpeg.c: * ext/ffmpeg/gstffmpeg.h: * ext/ffmpeg/gstffmpegaudioresample.c: * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_flags_get_type), (gst_ffmpeg_cfg_init): * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), (gst_ffmpeg_caps_to_pixfmt), (gst_ffmpeg_caps_with_codecid): * ext/ffmpeg/gstffmpegcodecmap.h: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps), (gst_ffmpegdec_register): * ext/ffmpeg/gstffmpegdeinterlace.c: * ext/ffmpeg/gstffmpegdemux.c: * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps), (gst_ffmpegenc_setcaps), (gst_ffmpegenc_register): * ext/ffmpeg/gstffmpegmux.c: * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_seek): * ext/libpostproc/gstpostproc.c: * ffmpegrev: Update ffmpeg/swscale snapshot to the latest revision and adjust to API changes. Fixes bug #556405. Require libavutil for swscale too when building with an external ffmpeg and fix includes for external ffmpeg. Modified files: . : ChangeLog configure.ac ffmpegrev ext/ffmpeg : gstffmpeg.c gstffmpeg.h gstffmpegaudioresample.c gstffmpegcfg.c gstffmpegcodecmap.c gstffmpegcodecmap.h gstffmpegdec.c gstffmpegdeinterlace.c gstffmpegdemux.c gstffmpegenc.c gstffmpegmux.c gstffmpegprotocol.c ext/libpostproc : gstpostproc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.513&r2=1.514 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/configure.ac.diff?r1=1.98&r2=1.99 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ffmpegrev.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpeg.c.diff?r1=1.40&r2=1.41 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpeg.h.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegaudioresample.c.diff?r1=1.3&r2=1.4 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcfg.c.diff?r1=1.10&r2=1.11 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c.diff?r1=1.168&r2=1.169 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.h.diff?r1=1.24&r2=1.25 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c.diff?r1=1.211&r2=1.212 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdeinterlace.c.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c.diff?r1=1.95&r2=1.96 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegenc.c.diff?r1=1.112&r2=1.113 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegmux.c.diff?r1=1.51&r2=1.52 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegprotocol.c.diff?r1=1.32&r2=1.33 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/libpostproc/gstpostproc.c.diff?r1=1.13&r2=1.14 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.513 retrieving revision 1.514 diff -u -d -r1.513 -r1.514 --- ChangeLog 15 Oct 2008 11:28:04 -0000 1.513 +++ ChangeLog 30 Oct 2008 12:05:43 -0000 1.514 @@ -1,3 +1,32 @@ +2008-10-30 Sebastian Dröge <seb...@co...> + + Based on a patch by: Alexis Ballier <aballier at gentoo dot org> + * configure.ac: + * ext/ffmpeg/gstffmpeg.c: + * ext/ffmpeg/gstffmpeg.h: + * ext/ffmpeg/gstffmpegaudioresample.c: + * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_flags_get_type), + (gst_ffmpeg_cfg_init): + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), + (gst_ffmpeg_caps_to_pixfmt), (gst_ffmpeg_caps_with_codecid): + * ext/ffmpeg/gstffmpegcodecmap.h: + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps), + (gst_ffmpegdec_register): + * ext/ffmpeg/gstffmpegdeinterlace.c: + * ext/ffmpeg/gstffmpegdemux.c: + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps), + (gst_ffmpegenc_setcaps), (gst_ffmpegenc_register): + * ext/ffmpeg/gstffmpegmux.c: + * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_seek): + * ext/libpostproc/gstpostproc.c: + * ffmpegrev: + Update ffmpeg/swscale snapshot to the latest revision and adjust + to API changes. Fixes bug #556405. + Require libavutil for swscale too when building with an external + ffmpeg and fix includes for external ffmpeg. 2008-10-15 Sebastian Dröge <sl...@ci...> Patch by: Robin Stocker <robin at nibor dot org> Index: configure.ac RCS file: /cvs/gstreamer/gst-ffmpeg/configure.ac,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- configure.ac 8 Oct 2008 13:11:53 -0000 1.98 +++ configure.ac 30 Oct 2008 12:05:43 -0000 1.99 @@ -211,7 +211,7 @@ if test "x$with_system_ffmpeg" = "xyes"; then PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat) - PKG_CHECK_MODULES(POSTPROC, libavcodec libpostproc) + PKG_CHECK_MODULES(POSTPROC, libavutil libavcodec libpostproc) PKG_CHECK_MODULES(SWSCALE, libavutil libswcale) saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS" Index: ffmpegrev RCS file: /cvs/gstreamer/gst-ffmpeg/ffmpegrev,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ffmpegrev 31 Aug 2008 11:49:06 -0000 1.9 +++ ffmpegrev 30 Oct 2008 12:05:43 -0000 1.10 @@ -1,8 +1,8 @@ -FFMPEG_REVISION=15004 +FFMPEG_REVISION=15750 FFMPEG_CO_DIR=gst-libs/ext/ffmpeg FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk # Because ffmpeg checks out libswscale via an svn:externals, checking # out an old ffmpeg does not check out a corresponding libswscale. # Keep the swscale checkout manually synchronized, then. Update this # when you update FFMPEG_REVISION. -FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-08-28 00:07:21 +0200}'" +FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-10-30 12:29:00 +0100}'" Index: gstffmpeg.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpeg.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- gstffmpeg.c 17 Dec 2007 12:43:05 -0000 1.40 +++ gstffmpeg.c 30 Oct 2008 12:05:44 -0000 1.41 @@ -31,8 +31,8 @@ #include <avcodec.h> #include <avformat.h> #else -#include <ffmpeg/avcodec.h> -#include <ffmpeg/avformat.h> +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> #endif #include "gstffmpeg.h" Index: gstffmpeg.h RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpeg.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gstffmpeg.h 17 Dec 2007 12:43:05 -0000 1.7 +++ gstffmpeg.h 30 Oct 2008 12:05:44 -0000 1.8 @@ -28,8 +28,8 @@ #include <gst/gst.h> Index: gstffmpegaudioresample.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegaudioresample.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gstffmpegaudioresample.c 8 May 2008 11:15:52 -0000 1.3 +++ gstffmpegaudioresample.c 30 Oct 2008 12:05:44 -0000 1.4 @@ -27,7 +27,7 @@ #ifdef HAVE_FFMPEG_UNINSTALLED Index: gstffmpegcfg.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcfg.c,v retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gstffmpegcfg.c 1 Aug 2008 18:37:02 -0000 1.10 +++ gstffmpegcfg.c 30 Oct 2008 12:05:44 -0000 1.11 @@ -272,7 +272,6 @@ {CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"}, {CODEC_FLAG_NORMALIZE_AQP, "Normalize Adaptive Quantization (masking, etc)", "aqp"}, - {CODEC_FLAG_TRELLIS_QUANT, "Trellis Quantization", "trellis"}, {CODEC_FLAG_GLOBAL_HEADER, "Global headers in extradata instead of every keyframe", "global-headers"}, @@ -669,6 +668,9 @@ "Prediction Method", GST_TYPE_FFMPEG_PRED_METHOD, FF_PRED_LEFT, G_PARAM_READWRITE); gst_ffmpeg_add_pspec (pspec, config.prediction_method, FALSE, huffyuv, NULL); + pspec = g_param_spec_int ("trellis", "Trellis Quantization", + "Trellis RD quantization", 0, 1, 1, G_PARAM_READWRITE); + gst_ffmpeg_add_pspec (pspec, config.trellis, FALSE, mpeg, NULL); } /* ==== END CONFIGURATION SECTION ==== */ Index: gstffmpegcodecmap.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.c,v retrieving revision 1.168 retrieving revision 1.169 diff -u -d -r1.168 -r1.169 --- gstffmpegcodecmap.c 8 Oct 2008 14:20:37 -0000 1.168 +++ gstffmpegcodecmap.c 30 Oct 2008 12:05:44 -0000 1.169 @@ -26,7 +26,7 @@ #include <string.h> @@ -456,7 +456,7 @@ NULL); if (context) { gst_caps_set_simple (caps, - "depth", G_TYPE_INT, context->bits_per_sample, NULL); + "depth", G_TYPE_INT, context->bits_per_coded_sample, NULL); } break; @@ -636,7 +636,7 @@ caps = gst_ff_vid_caps_new (context, codec_id, "video/x-huffyuv", NULL); - "bpp", G_TYPE_INT, context->bits_per_sample, NULL); + "bpp", G_TYPE_INT, context->bits_per_coded_sample, NULL); @@ -752,7 +752,7 @@ "layout", G_TYPE_STRING, "microsoft", NULL); - "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL); + "depth", G_TYPE_INT, (gint) context->bits_per_coded_sample, NULL); } else { gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL); @@ -763,7 +763,7 @@ "layout", G_TYPE_STRING, "quicktime", NULL); @@ -813,7 +813,7 @@ caps = gst_ff_vid_caps_new (context, codec_id, "video/x-camtasia", NULL); gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 8, 32, NULL); @@ -851,21 +851,22 @@ caps = gst_ff_vid_caps_new (context, codec_id, "video/x-qdrw", NULL); - case CODEC_ID_DNXHD: - caps = gst_ff_vid_caps_new (context, codec_id, "video/x-dnxhd", NULL); - break; + case CODEC_ID_DNXHD: + caps = gst_ff_vid_caps_new (context, codec_id, "video/x-dnxhd", NULL); + break; - case CODEC_ID_MIMIC: - caps = gst_ff_vid_caps_new (context, codec_id, "video/x-mimic", NULL); + case CODEC_ID_MIMIC: + caps = gst_ff_vid_caps_new (context, codec_id, "video/x-mimic", NULL); - case CODEC_ID_VMNC: - caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vmnc", NULL); + case CODEC_ID_VMNC: + caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vmnc", NULL); case CODEC_ID_TRUESPEECH: - caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-truespeech", NULL); + caps = + gst_ff_aud_caps_new (context, codec_id, "audio/x-truespeech", NULL); case CODEC_ID_WS_VQA: case CODEC_ID_IDCIN: @@ -1166,7 +1167,7 @@ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-alac", NULL); - "samplesize", G_TYPE_INT, context->bits_per_sample, NULL); + "samplesize", G_TYPE_INT, context->bits_per_coded_sample, NULL); @@ -1189,7 +1190,7 @@ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-tta", NULL); default: @@ -1354,25 +1355,24 @@ if (caps == NULL) { if (bpp != 0) { if (r_mask != 0) { - if (a_mask) { + if (a_mask) { caps = gst_ff_vid_caps_new (context, codec_id, "video/x-raw-rgb", - "bpp", G_TYPE_INT, bpp, - "depth", G_TYPE_INT, depth, - "red_mask", G_TYPE_INT, r_mask, - "green_mask", G_TYPE_INT, g_mask, - "blue_mask", G_TYPE_INT, b_mask, - "alpha_mask", G_TYPE_INT, a_mask, - "endianness", G_TYPE_INT, endianness, NULL); - } - else { + "bpp", G_TYPE_INT, bpp, + "depth", G_TYPE_INT, depth, + "red_mask", G_TYPE_INT, r_mask, + "green_mask", G_TYPE_INT, g_mask, + "blue_mask", G_TYPE_INT, b_mask, + "alpha_mask", G_TYPE_INT, a_mask, + "endianness", G_TYPE_INT, endianness, NULL); + } else { + } caps = gst_ff_vid_caps_new (context, codec_id, "video/x-raw-rgb", "bpp", G_TYPE_INT, bpp, @@ -1462,8 +1462,7 @@ switch (codec_type) { case CODEC_TYPE_VIDEO: - caps = gst_ffmpeg_pixfmt_to_caps (context->pix_fmt, - context, codec_id); + caps = gst_ffmpeg_pixfmt_to_caps (context->pix_fmt, context, codec_id); GstCaps *temp; enum PixelFormat i; @@ -1567,7 +1566,7 @@ gst_structure_get_int (structure, "width", &context->width); gst_structure_get_int (structure, "height", &context->height); - gst_structure_get_int (structure, "bpp", &context->bits_per_sample); + gst_structure_get_int (structure, "bpp", &context->bits_per_coded_sample); fps = gst_structure_get_value (structure, "framerate"); if (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)) { @@ -1710,7 +1709,7 @@ static void -nal_escape (guint8 *dst, guint8 *src, guint size, guint *destsize) +nal_escape (guint8 * dst, guint8 * src, guint size, guint * destsize) { guint8 *dstp = dst; guint8 *srcp = src; @@ -1718,7 +1717,7 @@ gint count = 0; while (srcp < end) { - if (count == 2 && *srcp <= 0x03 ) { + if (count == 2 && *srcp <= 0x03) { GST_DEBUG ("added escape code"); *dstp++ = 0x03; count = 0; @@ -1737,7 +1736,7 @@ /* copy the config, escaping NAL units as we iterate them, if something fails we * copy everything and hope for the best. */ -copy_config (guint8 *dst, guint8 *src, guint size, guint *destsize) +copy_config (guint8 * dst, guint8 * src, guint size, guint * destsize) @@ -1748,11 +1747,11 @@ if (size < 7) goto full_copy; - /* check version */ + /* check version */ if (*srcp != 1) - cnt = *(srcp + 5) & 0x1f; /* Number of sps */ + cnt = *(srcp + 5) & 0x1f; /* Number of sps */ GST_DEBUG ("num SPS %d", cnt); @@ -1770,7 +1769,7 @@ srcp += nalsize + 2; } - cnt = *(dstp++) = *(srcp++); /* Number of pps */ + cnt = *(dstp++) = *(srcp++); /* Number of pps */ GST_DEBUG ("num PPS %d", cnt); @@ -1837,12 +1836,12 @@ * reason for this but let's just escape it for now. Start by allocating * enough space, x2 is more than enough. */ context->extradata = - av_mallocz (GST_ROUND_UP_16 (size * 2 + FF_INPUT_BUFFER_PADDING_SIZE)); + av_mallocz (GST_ROUND_UP_16 (size * 2 + + FF_INPUT_BUFFER_PADDING_SIZE)); copy_config (context->extradata, data, size, &extrasize); GST_DEBUG ("escaped size: %d", extrasize); context->extradata_size = extrasize; - } - else { + } else { /* allocate with enough padding */ GST_DEBUG ("copy codec_data"); @@ -1921,7 +1920,7 @@ gint depth; if (gst_structure_get_int (str, "depth", &depth)) { - context->bits_per_sample = depth; + context->bits_per_coded_sample = depth; GST_WARNING ("No depth field in caps %" GST_PTR_FORMAT, caps); @@ -1954,7 +1953,8 @@ context->bit_rate = bitrate; } case CODEC_ID_ALAC: - gst_structure_get_int (str, "samplesize", &context->bits_per_sample); + gst_structure_get_int (str, "samplesize", + &context->bits_per_coded_sample); case CODEC_ID_DVVIDEO: @@ -2110,7 +2110,7 @@ CODEC_ID_NONE }; static enum CodecID mp4_audio_list[] = { - CODEC_ID_AAC, CODEC_ID_MP3, + CODEC_ID_AAC, CODEC_ID_MP3, Index: gstffmpegcodecmap.h RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcodecmap.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- gstffmpegcodecmap.h 8 Oct 2008 14:20:37 -0000 1.24 +++ gstffmpegcodecmap.h 30 Oct 2008 12:05:44 -0000 1.25 @@ -23,7 +23,7 @@ Index: gstffmpegdec.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v retrieving revision 1.211 retrieving revision 1.212 diff -u -d -r1.211 -r1.212 --- gstffmpegdec.c 15 Oct 2008 11:28:05 -0000 1.211 +++ gstffmpegdec.c 30 Oct 2008 12:05:44 -0000 1.212 @@ -697,7 +697,7 @@ /* workaround encoder bugs */ ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT; - ffmpegdec->context->error_resilience = 1; + ffmpegdec->context->error_recognition = 1; /* for slow cpus */ ffmpegdec->context->lowres = ffmpegdec->lowres; @@ -2449,7 +2449,7 @@ AVCodec *in_plugin; gint rank; - in_plugin = first_avcodec; + in_plugin = av_codec_next (NULL); GST_LOG ("Registering decoders"); @@ -2559,7 +2559,7 @@ gst_caps_unref (sinkcaps); if (srccaps) gst_caps_unref (srccaps); - in_plugin = in_plugin->next; + in_plugin = av_codec_next (in_plugin); GST_LOG ("Finished Registering decoders"); Index: gstffmpegdeinterlace.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdeinterlace.c,v --- gstffmpegdeinterlace.c 12 Jul 2007 11:13:13 -0000 1.9 +++ gstffmpegdeinterlace.c 30 Oct 2008 12:05:45 -0000 1.10 # include <avcodec.h> -# include <ffmpeg/avcodec.h> +# include <libavcodec/avcodec.h> Index: gstffmpegdemux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- gstffmpegdemux.c 29 Aug 2008 00:27:28 -0000 1.95 +++ gstffmpegdemux.c 30 Oct 2008 12:05:45 -0000 1.96 @@ -30,7 +30,7 @@ #include <avi.h> #ifdef HAVE_AVI_H #include <ffmpeg/avi.h> Index: gstffmpegenc.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegenc.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- gstffmpegenc.c 8 Oct 2008 14:20:37 -0000 1.112 +++ gstffmpegenc.c 30 Oct 2008 12:05:45 -0000 1.113 @@ -31,7 +31,7 @@ @@ -132,7 +132,7 @@ /* construct the element details struct */ details.longname = g_strdup_printf ("FFMPEG %s encoder", - params->in_plugin->long_name); + params->in_plugin->long_name); details.klass = g_strdup_printf ("Codec/Encoder/%s", (params->in_plugin->type == CODEC_TYPE_VIDEO) ? "Video" : "Audio"); details.description = g_strdup_printf ("FFMPEG %s encoder", @@ -294,7 +294,8 @@ if (oclass->in_plugin->type == CODEC_TYPE_AUDIO) { caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); - GST_DEBUG_OBJECT (ffmpegenc, "audio caps, return template %"GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (ffmpegenc, "audio caps, return template %" GST_PTR_FORMAT, + caps); return caps; @@ -302,7 +303,7 @@ /* cached */ if (oclass->sinkcaps) { caps = gst_caps_copy (oclass->sinkcaps); - GST_DEBUG_OBJECT (ffmpegenc, "return cached caps %"GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (ffmpegenc, "return cached caps %" GST_PTR_FORMAT, caps); @@ -343,8 +344,8 @@ /* set some default properties */ ctx->width = DEFAULT_WIDTH; ctx->height = DEFAULT_HEIGHT; - ctx->time_base.num = DEFAULT_FRAME_RATE_BASE; - ctx->time_base.den = 25 * DEFAULT_FRAME_RATE_BASE; + ctx->time_base.num = 1; + ctx->time_base.den = 25; ctx->bit_rate = DEFAULT_VIDEO_BITRATE; /* makes it silent */ ctx->strict_std_compliance = -1; @@ -381,7 +382,7 @@ - GST_DEBUG_OBJECT (ffmpegenc, "probed caps gave %"GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (ffmpegenc, "probed caps gave %" GST_PTR_FORMAT, caps); oclass->sinkcaps = gst_caps_copy (caps); return caps; @@ -420,7 +421,6 @@ /* RTP payload used for GOB production (for Asterisk) */ if (ffmpegenc->rtp_payload_size) { - ffmpegenc->context->rtp_mode = 1; ffmpegenc->context->rtp_payload_size = ffmpegenc->rtp_payload_size; @@ -985,13 +985,13 @@ GType type; GST_LOG ("Registering encoders"); /* build global ffmpeg param/property info */ gst_ffmpeg_cfg_init (); while (in_plugin) { gchar *type_name; GstCaps *srccaps = NULL, *sinkcaps = NULL; @@ -1010,8 +1010,7 @@ goto next; - GST_DEBUG ("Trying plugin %s [%s]", in_plugin->name, - in_plugin->long_name); + GST_DEBUG ("Trying plugin %s [%s]", in_plugin->name, in_plugin->long_name); /* no codecs for which we're GUARANTEED to have better alternatives */ if (!strcmp (in_plugin->name, "vorbis") || @@ -1034,8 +1033,7 @@ in_plugin->id, TRUE); if (!sinkcaps) { - GST_WARNING ("Couldn't get sink caps for encoder %s", - in_plugin->name); + GST_WARNING ("Couldn't get sink caps for encoder %s", in_plugin->name); /* construct the type */ @@ -1068,7 +1066,7 @@ GST_LOG ("Finished registering encoders"); Index: gstffmpegmux.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegmux.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- gstffmpegmux.c 6 Jul 2008 21:06:45 -0000 1.51 +++ gstffmpegmux.c 30 Oct 2008 12:05:45 -0000 1.52 @@ -25,7 +25,7 @@ @@ -570,7 +570,7 @@ if (GST_BUFFER_DURATION_IS_VALID (buf)) pkt.duration = gst_ffmpeg_time_gst_to_ff (GST_BUFFER_DURATION (buf), - ffmpegmux->context->streams[best_pad->padnum]->time_base); + ffmpegmux->context->streams[best_pad->padnum]->time_base); else pkt.duration = 0; av_write_frame (ffmpegmux->context, &pkt); Index: gstffmpegprotocol.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegprotocol.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- gstffmpegprotocol.c 3 Nov 2007 16:14:53 -0000 1.32 +++ gstffmpegprotocol.c 30 Oct 2008 12:05:45 -0000 1.33 @@ -175,8 +175,8 @@ return size; -static offset_t -gst_ffmpegdata_seek (URLContext * h, offset_t pos, int whence) +static int64_t +gst_ffmpegdata_seek (URLContext * h, int64_t pos, int whence) GstProtocolInfo *info; guint64 newpos; Index: gstpostproc.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/libpostproc/gstpostproc.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gstpostproc.c 13 May 2008 15:07:25 -0000 1.13 +++ gstpostproc.c 30 Oct 2008 12:05:45 -0000 1.14 @@ -32,8 +32,8 @@ #include <postprocess.h> -#include <postproc/postprocess.h> +#include <libpostproc/postprocess.h> |