Author: rdieter Update of /cvs/free/rpms/xine-lib-extras-freeworld/EL-5 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10543 Modified Files: xine-lib-extras-freeworld.spec Added Files: xine-lib-1.1.16-internal_ffmpeg.patch Log Message: internal_ffmpeg patch xine-lib-1.1.16-internal_ffmpeg.patch: --- NEW FILE xine-lib-1.1.16-internal_ffmpeg.patch --- # HG changeset patch # User Darren Salt <linux(a)youmustbejoking.demon.co.uk&gt; # Date 1231451064 0 # Node ID c20ec3a8802d8f71d4ad9dc26a413716efe2d71a # Parent 894298041810085fcdf52f6e7bd8a7202ca77735 Fix build with libavcodec < 51.68.0. This covers the internal snapshot and the version in Debian lenny. --- a/src/combined/ffmpeg/ff_video_decoder.c Wed Jan 07 18:28:36 2009 +0000 +++ b/src/combined/ffmpeg/ff_video_decoder.c Thu Jan 08 21:44:24 2009 +0000 @@ -58,6 +58,12 @@ #define ENABLE_DIRECT_RENDERING +/* reordered_opaque appeared in libavcodec 51.68.0 */ +#define AVCODEC_HAS_REORDERED_OPAQUE +#if LIBAVCODEC_VERSION_INT < 0x334400 +# undef AVCODEC_HAS_REORDERED_OPAQUE +#endif + typedef struct ff_video_decoder_s ff_video_decoder_t; typedef struct ff_video_class_s { @@ -78,9 +84,11 @@ struct ff_video_decoder_s { xine_stream_t *stream; int64_t pts; +#ifdef AVCODEC_HAS_REORDERED_OPAQUE uint64_t pts_tag_mask; uint64_t pts_tag; int pts_tag_counter; +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ int video_step; uint8_t decoder_ok:1; @@ -609,10 +617,6 @@ static void ff_convert_frame(ff_video_de su = this->av_frame->data[1]; sv = this->av_frame->data[2]; - /* Some segfaults & heap corruption have been observed with img->height, - * so we use this->bih.biHeight instead (which is the displayed height) - */ - if (this->context->pix_fmt == PIX_FMT_YUV410P) { yuv9_to_yv12( @@ -633,7 +637,7 @@ static void ff_convert_frame(ff_video_de img->pitches[2], /* width x height */ img->width, - this->bih.biHeight); + img->height); } else if (this->context->pix_fmt == PIX_FMT_YUV411P) { @@ -655,7 +659,7 @@ static void ff_convert_frame(ff_video_de img->pitches[2], /* width x height */ img->width, - this->bih.biHeight); + img->height); } else if (this->context->pix_fmt == PIX_FMT_RGBA32) { @@ -663,7 +667,7 @@ static void ff_convert_frame(ff_video_de uint32_t *argb_pixels; uint32_t argb; - for(y = 0; y < this->bih.biHeight; y++) { + for(y = 0; y < img->height; y++) { argb_pixels = (uint32_t *)sy; for(x = 0; x < img->width; x++) { uint8_t r, g, b; @@ -691,7 +695,7 @@ static void ff_convert_frame(ff_video_de uint8_t *src; uint16_t pixel16; - for(y = 0; y < this->bih.biHeight; y++) { + for(y = 0; y < img->height; y++) { src = sy; for(x = 0; x < img->width; x++) { uint8_t r, g, b; @@ -720,7 +724,7 @@ static void ff_convert_frame(ff_video_de uint8_t *src; uint16_t pixel16; - for(y = 0; y < this->bih.biHeight; y++) { + for(y = 0; y < img->height; y++) { src = sy; for(x = 0; x < img->width; x++) { uint8_t r, g, b; @@ -748,7 +752,7 @@ static void ff_convert_frame(ff_video_de int x, plane_ptr = 0; uint8_t *src; - for(y = 0; y < this->bih.biHeight; y++) { + for(y = 0; y < img->height; y++) { src = sy; for(x = 0; x < img->width; x++) { uint8_t r, g, b; @@ -772,7 +776,7 @@ static void ff_convert_frame(ff_video_de int x, plane_ptr = 0; uint8_t *src; - for(y = 0; y < this->bih.biHeight; y++) { + for(y = 0; y < img->height; y++) { src = sy; for(x = 0; x < img->width; x++) { uint8_t r, g, b; @@ -815,7 +819,7 @@ static void ff_convert_frame(ff_video_de v_palette[x] = COMPUTE_V(r, g, b); } - for(y = 0; y < this->bih.biHeight; y++) { + for(y = 0; y < img->height; y++) { src = sy; for(x = 0; x < img->width; x++) { pixel = *src++; @@ -832,7 +836,7 @@ static void ff_convert_frame(ff_video_de } else { - for (y = 0; y < this->bih.biHeight; y++) { + for (y=0; y<img->height; y++) { xine_fast_memcpy (dy, sy, img->width); dy += img->pitches[0]; @@ -840,7 +844,7 @@ static void ff_convert_frame(ff_video_de sy += this->av_frame->linesize[0]; } - for (y = 0; y < this->bih.biHeight / 2; y++) { + for (y=0; y<(img->height/2); y++) { if (this->context->pix_fmt != PIX_FMT_YUV444P) { @@ -1181,6 +1185,7 @@ static void ff_handle_mpeg12_buffer (ff_ } } +#ifdef AVCODEC_HAS_REORDERED_OPAQUE static uint64_t ff_tag_pts(ff_video_decoder_t *this, uint64_t pts) { return pts | this->pts_tag; @@ -1217,6 +1222,7 @@ static void ff_check_pts_tagging(ff_vide } } +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { uint8_t *chunk_buf = this->buf; AVRational avr00 = {0, 1}; @@ -1241,12 +1247,14 @@ static void ff_handle_buffer (ff_video_d this->size = 0; } +#ifdef AVCODEC_HAS_REORDERED_OPAQUE if (this->size == 0) { /* take over pts when we are about to buffer a frame */ this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts); this->context->reordered_opaque = ff_tag_pts(this, this->pts); this->pts = 0; } +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ /* data accumulation */ if (buf->size > 0) { @@ -1301,8 +1309,10 @@ static void ff_handle_buffer (ff_video_d &got_picture, &chunk_buf[offset], this->size); +#ifdef AVCODEC_HAS_REORDERED_OPAQUE /* reset consumed pts value */ this->context->reordered_opaque = ff_tag_pts(this, 0); +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ lprintf("consumed size: %d, got_picture: %d\n", len, got_picture); if ((len <= 0) || (len > this->size)) { @@ -1320,10 +1330,12 @@ static void ff_handle_buffer (ff_video_d memmove (this->buf, &chunk_buf[offset], this->size); chunk_buf = this->buf; +#ifdef AVCODEC_HAS_REORDERED_OPAQUE /* take over pts for next access unit */ this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts); this->context->reordered_opaque = ff_tag_pts(this, this->pts); this->pts = 0; +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ } } } @@ -1418,9 +1430,14 @@ static void ff_handle_buffer (ff_video_d ff_convert_frame(this, img); } +#ifndef AVCODEC_HAS_REORDERED_OPAQUE + img->pts = this->pts; + this->pts = 0; +#else /* AVCODEC_HAS_REORDERED_OPAQUE */ img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque); ff_check_pts_tagging(this, this->av_frame->reordered_opaque); /* only check for valid frames */ this->av_frame->reordered_opaque = 0; +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ /* workaround for weird 120fps streams */ if( video_step_to_use == 750 ) { @@ -1460,8 +1477,13 @@ static void ff_handle_buffer (ff_video_d this->output_format, VO_BOTH_FIELDS|this->frame_flags); /* set PTS to allow early syncing */ +#ifndef AVCODEC_HAS_REORDERED_OPAQUE + img->pts = this->pts; + this->pts = 0; +#else /* AVCODEC_HAS_REORDERED_OPAQUE */ img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque); this->av_frame->reordered_opaque = 0; +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ img->duration = video_step_to_use; @@ -1547,9 +1569,11 @@ static void ff_reset (video_decoder_t *t if (this->is_mpeg12) mpeg_parser_reset(this->mpeg_parser); +#ifdef AVCODEC_HAS_REORDERED_OPAQUE this->pts_tag_mask = 0; this->pts_tag = 0; this->pts_tag_counter = 0; +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ } static void ff_discontinuity (video_decoder_t *this_gen) { @@ -1558,6 +1582,7 @@ static void ff_discontinuity (video_deco lprintf ("ff_discontinuity\n"); this->pts = 0; +#ifdef AVCODEC_HAS_REORDERED_OPAQUE /* * there is currently no way to reset all the pts which are stored in the decoder. * therefore, we add a unique tag (generated from pts_tag_counter) to pts (see @@ -1588,6 +1613,7 @@ static void ff_discontinuity (video_deco counter_mask <<= 1; } } +#endif /* AVCODEC_HAS_REORDERED_OPAQUE */ } static void ff_dispose (video_decoder_t *this_gen) { Index: xine-lib-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/xine-lib-extras-freeworld.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xine-lib-extras-freeworld.spec 8 Jan 2009 16:24:30 -0000 1.8 +++ xine-lib-extras-freeworld.spec 8 Jan 2009 22:02:38 -0000 1.9 @@ -4,13 +4,13 @@ %define abiver 1.25 %if 0%{?fedora} > 6 -%define _with_external_ffmpeg --with-external-ffmpeg +#define _with_external_ffmpeg --with-external-ffmpeg %endif Name: xine-lib-extras-freeworld Summary: Extra codecs for the Xine multimedia library Version: 1.1.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -19,7 +19,8 @@ Patch0: xine-lib-1.1.3-optflags.patch Patch6: xine-lib-1.1.1-deepbind-939.patch -Patch100: xine-lib-1.1.16-ffmpeg_api.patch +# http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=c20ec3a8802d... +Patch100: xine-lib-1.1.16-internal_ffmpeg.patch BuildRequires: pkgconfig BuildRequires: zlib-devel @@ -68,7 +69,7 @@ # Patch1 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind -%patch100 -p1 -b .ffmpeg_api +%patch100 -p1 -b .internal_ffmpeg # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -185,6 +186,10 @@ %changelog +* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.16-2 +- drop ffmpeg_api patch (not needed) +- internal_ffmpeg patch + * Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.16-1 - xine-lib-1.1.16