September 2008 - ffmpeg-cvslog

r15473 - trunk/libavcodec/indeo3.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: benoit Date: Tue Sep 30 11:32:14 2008 New Revision: 15473 Log: use uint8_t instead of unsigned char Modified: trunk/libavcodec/indeo3.c Modified: trunk/libavcodec/indeo3.c ============================================================================== --- trunk/libavcodec/indeo3.c (original) +++ trunk/libavcodec/indeo3.c Tue Sep 30 11:32:14 2008 @@ -32,10 +32,10 @@ typedef struct { - unsigned char *Ybuf; - unsigned char *Ubuf; - unsigned char *Vbuf; - unsigned char *the_buf; + uint8_t *Ybuf; + uint8_t *Ubuf; + uint8_t *Vbuf; + uint8_t *the_buf; unsigned int the_buf_size; unsigned short y_w, y_h; unsigned short uv_w, uv_h; @@ -50,7 +50,7 @@ typedef struct Indeo3DecodeContext { YUVBufs *cur_frame; YUVBufs *ref_frame; - unsigned char *ModPred; + uint8_t *ModPred; uint8_t *corrector_type; } Indeo3DecodeContext; @@ -91,10 +91,10 @@ static av_cold void build_modpred(Indeo3 } } -static void iv_Decode_Chunk(Indeo3DecodeContext *s, unsigned char *cur, - unsigned char *ref, int width, int height, const unsigned char *buf1, - long fflags2, const unsigned char *hdr, - const unsigned char *buf2, int min_width_160); +static void iv_Decode_Chunk(Indeo3DecodeContext *s, uint8_t *cur, + uint8_t *ref, int width, int height, const uint8_t *buf1, + long fflags2, const uint8_t *hdr, + const uint8_t *buf2, int min_width_160); /* ---------------------------------------------------------------------- */ static av_cold void iv_alloc_frames(Indeo3DecodeContext *s) @@ -176,12 +176,12 @@ static av_cold void iv_free_func(Indeo3D /* ---------------------------------------------------------------------- */ static unsigned long iv_decode_frame(Indeo3DecodeContext *s, - const unsigned char *buf, int buf_size) + const uint8_t *buf, int buf_size) { unsigned int hdr_width, hdr_height, chroma_width, chroma_height; unsigned long fflags1, fflags2, fflags3, offs1, offs2, offs3, offs; - const unsigned char *hdr_pos, *buf_pos; + const uint8_t *hdr_pos, *buf_pos; buf_pos = buf; buf_pos += 18; @@ -297,15 +297,15 @@ typedef struct { lp2 = 4; static void iv_Decode_Chunk(Indeo3DecodeContext *s, - unsigned char *cur, unsigned char *ref, int width, int height, - const unsigned char *buf1, long fflags2, const unsigned char *hdr, - const unsigned char *buf2, int min_width_160) + uint8_t *cur, uint8_t *ref, int width, int height, + const uint8_t *buf1, long fflags2, const uint8_t *hdr, + const uint8_t *buf2, int min_width_160) { - unsigned char bit_buf; + uint8_t bit_buf; unsigned long bit_pos, lv, lv1, lv2; long *width_tbl, width_tbl_arr[10]; const signed char *ref_vectors; - unsigned char *cur_frm_pos, *ref_frm_pos, *cp, *cp2; + uint8_t *cur_frm_pos, *ref_frm_pos, *cp, *cp2; uint32_t *cur_lp, *ref_lp; const uint32_t *correction_lp[2], *correctionloworder_lp[2], *correctionhighorder_lp[2]; uint8_t *correction_type_sp[2]; @@ -1065,10 +1065,10 @@ static av_cold int indeo3_decode_init(AV static int indeo3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const unsigned char *buf, int buf_size) + const uint8_t *buf, int buf_size) { Indeo3DecodeContext *s=avctx->priv_data; - unsigned char *src, *dest; + uint8_t *src, *dest; int y; iv_decode_frame(s, buf, buf_size);

1 0

r15472 - trunk/libavcodec/indeo3.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: benoit Date: Tue Sep 30 11:26:49 2008 New Revision: 15472 Log: Corrector type fits in 8 bits. Modified: trunk/libavcodec/indeo3.c Modified: trunk/libavcodec/indeo3.c ============================================================================== --- trunk/libavcodec/indeo3.c (original) +++ trunk/libavcodec/indeo3.c Tue Sep 30 11:26:49 2008 @@ -51,7 +51,7 @@ typedef struct Indeo3DecodeContext { YUVBufs *ref_frame; unsigned char *ModPred; - unsigned short *corrector_type; + uint8_t *corrector_type; } Indeo3DecodeContext; static const uint8_t corrector_type_0[24] = { @@ -80,7 +80,7 @@ static av_cold void build_modpred(Indeo3 s->ModPred[i+7*128] = 2*((i + 5) - ((i + 4) % 9)); } - s->corrector_type = av_malloc(24 * 256 * sizeof(*s->corrector_type)); + s->corrector_type = av_malloc(24 * 256); for (i=0; i < 24; ++i) { for (j=0; j < 256; ++j) { @@ -308,7 +308,7 @@ static void iv_Decode_Chunk(Indeo3Decode unsigned char *cur_frm_pos, *ref_frm_pos, *cp, *cp2; uint32_t *cur_lp, *ref_lp; const uint32_t *correction_lp[2], *correctionloworder_lp[2], *correctionhighorder_lp[2]; - unsigned short *correction_type_sp[2]; + uint8_t *correction_type_sp[2]; ustr_t strip_tbl[20], *strip; int i, j, k, lp1, lp2, flag1, cmd, blks_width, blks_height, region_160_width, rle_v1, rle_v2, rle_v3;

1 0

r15471 - trunk/libavcodec/indeo3.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: benoit Date: Tue Sep 30 11:08:27 2008 New Revision: 15471 Log: Remove useless casts and use variable instead of its type in sizeof. Modified: trunk/libavcodec/indeo3.c Modified: trunk/libavcodec/indeo3.c ============================================================================== --- trunk/libavcodec/indeo3.c (original) +++ trunk/libavcodec/indeo3.c Tue Sep 30 11:08:27 2008 @@ -66,7 +66,7 @@ static av_cold void build_modpred(Indeo3 { int i, j; - s->ModPred = (unsigned char *) av_malloc (8 * 128); + s->ModPred = av_malloc(8 * 128); for (i=0; i < 128; ++i) { s->ModPred[i+0*128] = (i > 126) ? 254 : 2*((i + 1) - ((i + 1) % 2)); @@ -80,7 +80,7 @@ static av_cold void build_modpred(Indeo3 s->ModPred[i+7*128] = 2*((i + 5) - ((i + 4) % 9)); } - s->corrector_type = (unsigned short *) av_malloc (24 * 256 * sizeof(unsigned short)); + s->corrector_type = av_malloc(24 * 256 * sizeof(*s->corrector_type)); for (i=0; i < 24; ++i) { for (j=0; j < 256; ++j) {

1 0

r15470 - trunk/libavcodec/indeo3.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: benoit Date: Tue Sep 30 11:05:34 2008 New Revision: 15470 Log: Change table types to uint8_t Modified: trunk/libavcodec/indeo3.c Modified: trunk/libavcodec/indeo3.c ============================================================================== --- trunk/libavcodec/indeo3.c (original) +++ trunk/libavcodec/indeo3.c Tue Sep 30 11:05:34 2008 @@ -54,13 +54,13 @@ typedef struct Indeo3DecodeContext { unsigned short *corrector_type; } Indeo3DecodeContext; -static const int corrector_type_0[24] = { +static const uint8_t corrector_type_0[24] = { 195, 159, 133, 115, 101, 93, 87, 77, 195, 159, 133, 115, 101, 93, 87, 77, 128, 79, 79, 79, 79, 79, 79, 79 }; -static const int corrector_type_2[8] = { 9, 7, 6, 8, 5, 4, 3, 2 }; +static const uint8_t corrector_type_2[8] = { 9, 7, 6, 8, 5, 4, 3, 2 }; static av_cold void build_modpred(Indeo3DecodeContext *s) {

1 0

r15469 - trunk/libavcodec/vp3.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: conrad Date: Tue Sep 30 06:18:22 2008 New Revision: 15469 Log: Downgrade severity of leftover bits in header packets, and don't check for the comment header Modified: trunk/libavcodec/vp3.c Modified: trunk/libavcodec/vp3.c ============================================================================== --- trunk/libavcodec/vp3.c (original) +++ trunk/libavcodec/vp3.c Tue Sep 30 06:18:22 2008 @@ -2596,8 +2596,8 @@ static int theora_decode_init(AVCodecCon av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80); break; } - if(8*header_len[i] != get_bits_count(&gb)) - av_log(avctx, AV_LOG_ERROR, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype); + if(ptype != 0x81 && 8*header_len[i] != get_bits_count(&gb)) + av_log(avctx, AV_LOG_WARNING, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype); if (s->theora < 0x030200) break; }

1 0

r15468 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: bcoudurier Date: Tue Sep 30 04:44:57 2008 New Revision: 15468 Log: support negative ctts in some way, unset wrong dts Modified: trunk/libavformat/mov.c Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Tue Sep 30 04:44:57 2008 @@ -133,6 +133,7 @@ typedef struct MOVStreamContext { unsigned drefs_count; MOV_dref_t *drefs; int dref_id; + int wrong_dts; ///< dts are wrong due to negative ctts } MOVStreamContext; typedef struct MOVContext { @@ -1166,15 +1167,13 @@ static int mov_read_ctts(MOVContext *c, int duration =get_be32(pb); if (duration < 0) { - av_log(c->fc, AV_LOG_WARNING, "negative ctts, ignoring\n"); - sc->ctts_count = 0; - url_fskip(pb, 8 * (entries - i - 1)); - break; + sc->wrong_dts = 1; + st->codec->has_b_frames = 1; } sc->ctts_data[i].count = count; sc->ctts_data[i].duration= duration; - sc->time_rate= ff_gcd(sc->time_rate, duration); + sc->time_rate= ff_gcd(sc->time_rate, FFABS(duration)); } return 0; } @@ -1882,6 +1881,8 @@ static int mov_read_packet(AVFormatConte sc->sample_to_ctime_index++; sc->sample_to_ctime_sample = 0; } + if (sc->wrong_dts) + pkt->dts = AV_NOPTS_VALUE; } else { AVStream *st = s->streams[sc->ffindex]; int64_t next_dts = (sc->current_sample < sc->sample_count) ?

1 0

r15467 - trunk/libavcodec/utils.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: michael Date: Tue Sep 30 03:45:53 2008 New Revision: 15467 Log: Allocate 1 line more in the chroma plane for H.264, this avoids some out of array reads with mmx/sse2 code. Fixes issue327. Modified: trunk/libavcodec/utils.c Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c (original) +++ trunk/libavcodec/utils.c Tue Sep 30 03:45:53 2008 @@ -170,6 +170,8 @@ void avcodec_align_dimensions(AVCodecCon *width = ALIGN(*width , w_align); *height= ALIGN(*height, h_align); + if(s->codec_id == CODEC_ID_H264) + *height+=2; // some of the optimized chroma MC reads one line too much } int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){

1 0

r15466 - trunk/libavcodec/utils.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: michael Date: Tue Sep 30 03:07:25 2008 New Revision: 15466 Log: Replace second (and wrong) call to avcodec_align_dimensions() by adjusting stride_align. This is not particularely pretty and ill gladly implement something else if someone has an idea! Modified: trunk/libavcodec/utils.c Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c (original) +++ trunk/libavcodec/utils.c Tue Sep 30 03:07:25 2008 @@ -229,6 +229,7 @@ int avcodec_default_get_buffer(AVCodecCo int size[4] = {0}; int tmpsize; AVPicture picture; + int stride_align[4]; avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); @@ -238,12 +239,22 @@ int avcodec_default_get_buffer(AVCodecCo w+= EDGE_WIDTH*2; h+= EDGE_WIDTH*2; } - avcodec_align_dimensions(s, &w, &h); ff_fill_linesize(&picture, s->pix_fmt, w); - for (i=0; i<4; i++) - picture.linesize[i] = ALIGN(picture.linesize[i], STRIDE_ALIGN); + for (i=0; i<4; i++){ +//STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes +//we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the +//picture size unneccessarily in some cases. The solution here is not +//pretty and better ideas are welcome! +#ifdef HAVE_MMX + if(s->codec_id == CODEC_ID_SVQ1) + stride_align[i]= 16; + else +#endif + stride_align[i] = STRIDE_ALIGN; + picture.linesize[i] = ALIGN(picture.linesize[i], stride_align[i]); + } tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h); @@ -269,7 +280,7 @@ int avcodec_default_get_buffer(AVCodecCo if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) buf->data[i] = buf->base[i]; else - buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), STRIDE_ALIGN); + buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), stride_align[i]); } buf->width = s->width; buf->height = s->height;

1 0

r15465 - trunk/libavcodec/error_resilience.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: michael Date: Tue Sep 30 02:28:13 2008 New Revision: 15465 Log: Do not attempt to perform error concealment in lowres mode as this is not supported currently. Modified: trunk/libavcodec/error_resilience.c Modified: trunk/libavcodec/error_resilience.c ============================================================================== --- trunk/libavcodec/error_resilience.c (original) +++ trunk/libavcodec/error_resilience.c Tue Sep 30 02:28:13 2008 @@ -680,7 +680,7 @@ void ff_er_frame_end(MpegEncContext *s){ int size = s->b8_stride * 2 * s->mb_height; Picture *pic= s->current_picture_ptr; - if(!s->error_recognition || s->error_count==0 || + if(!s->error_recognition || s->error_count==0 || s->avctx->lowres || s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return; if(s->current_picture.motion_val[0] == NULL){

1 0

r15464 - trunk/libavcodec/atrac3.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: aurel Date: Tue Sep 30 00:22:46 2008 New Revision: 15464 Log: atrac3: ensure input frame is not overwritten (it is const) this fixes the following warning: atrac3.c:889: warning: assignment discards qualifiers from pointer target type Modified: trunk/libavcodec/atrac3.c Modified: trunk/libavcodec/atrac3.c ============================================================================== --- trunk/libavcodec/atrac3.c (original) +++ trunk/libavcodec/atrac3.c Tue Sep 30 00:22:46 2008 @@ -778,11 +778,11 @@ static int decodeChannelSoundUnit (ATRAC * @param databuf the input data */ -static int decodeFrame(ATRAC3Context *q, uint8_t* databuf) +static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf) { int result, i; float *p1, *p2, *p3, *p4; - uint8_t *ptr1, *ptr2; + uint8_t *ptr1; if (q->codingMode == JOINT_STEREO) { @@ -796,14 +796,20 @@ static int decodeFrame(ATRAC3Context *q, /* Framedata of the su2 in the joint-stereo mode is encoded in * reverse byte order so we need to swap it first. */ - ptr1 = databuf; - ptr2 = databuf+q->bytes_per_frame-1; + if (databuf == q->decoded_bytes_buffer) { + uint8_t *ptr2 = q->decoded_bytes_buffer+q->bytes_per_frame-1; + ptr1 = q->decoded_bytes_buffer; for (i = 0; i < (q->bytes_per_frame/2); i++, ptr1++, ptr2--) { FFSWAP(uint8_t,*ptr1,*ptr2); } + } else { + const uint8_t *ptr2 = databuf+q->bytes_per_frame-1; + for (i = 0; i < q->bytes_per_frame; i++) + q->decoded_bytes_buffer[i] = *ptr2--; + } /* Skip the sync codes (0xF8). */ - ptr1 = databuf; + ptr1 = q->decoded_bytes_buffer; for (i = 4; *ptr1 == 0xF8; i++, ptr1++) { if (i >= q->bytes_per_frame) return -1; @@ -875,7 +881,7 @@ static int atrac3_decode_frame(AVCodecCo const uint8_t *buf, int buf_size) { ATRAC3Context *q = avctx->priv_data; int result = 0, i; - uint8_t* databuf; + const uint8_t* databuf; int16_t* samples = data; if (buf_size < avctx->block_align)

1 0

r15463 - trunk/libavcodec/vp3.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: conrad Date: Tue Sep 30 00:04:35 2008 New Revision: 15463 Log: Use skip_frame for keyframe-only decoding rather than #ifdef Modified: trunk/libavcodec/vp3.c Modified: trunk/libavcodec/vp3.c ============================================================================== --- trunk/libavcodec/vp3.c (original) +++ trunk/libavcodec/vp3.c Tue Sep 30 00:04:35 2008 @@ -49,7 +49,6 @@ * Define one or more of the following compile-time variables to 1 to obtain * elaborate information about certain aspects of the decoding process. * - * KEYFRAMES_ONLY: set this to 1 to only see keyframes (VP3 slideshow mode) * DEBUG_VP3: high-level decoding flow * DEBUG_INIT: initialization parameters * DEBUG_DEQUANTIZERS: display how the dequanization tables are built @@ -62,8 +61,6 @@ * DEBUG_IDCT: show every detail of the IDCT process */ -#define KEYFRAMES_ONLY 0 - #define DEBUG_VP3 0 #define DEBUG_INIT 0 #define DEBUG_DEQUANTIZERS 0 @@ -2176,6 +2173,9 @@ static int vp3_decode_frame(AVCodecConte init_loop_filter(s); } + if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe) + return buf_size; + if (s->keyframe) { if (!s->theora) { @@ -2242,19 +2242,6 @@ static int vp3_decode_frame(AVCodecConte init_frame(s, &gb); -#if KEYFRAMES_ONLY -if (!s->keyframe) { - - memcpy(s->current_frame.data[0], s->golden_frame.data[0], - s->current_frame.linesize[0] * s->height); - memcpy(s->current_frame.data[1], s->golden_frame.data[1], - s->current_frame.linesize[1] * s->height / 2); - memcpy(s->current_frame.data[2], s->golden_frame.data[2], - s->current_frame.linesize[2] * s->height / 2); - -} else { -#endif - if (unpack_superblocks(s, &gb)){ av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n"); return -1; @@ -2284,9 +2271,6 @@ if (!s->keyframe) { render_slice(s, i); apply_loop_filter(s); -#if KEYFRAMES_ONLY -} -#endif *data_size=sizeof(AVFrame); *(AVFrame*)data= s->current_frame;

1 0

[propchange]: r15423 - svn:log
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Revision: 15423 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -sync to latest mingw api, remove no more needed struct definitions \ No newline at end of file +sync to latest mingw api, remove unneeded struct definitions

1 0

[ffmpeg.org]: r196 - trunk/src/shame
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Date: Mon Sep 29 09:18:34 2008 New Revision: 196 Log: VoltaicHD for Mac Modified: trunk/src/shame Modified: trunk/src/shame ============================================================================== --- trunk/src/shame (original) +++ trunk/src/shame Mon Sep 29 09:18:34 2008 @@ -67,6 +67,8 @@ <a href="http://roundup.mplayerhq.hu/roundup/ffmpeg/issue321">issue tracker entry</a></li> <li><a href="http://www.video-convert-master.com/index.htm">Video Convert Master</a>, <a href="http://roundup.mplayerhq.hu/roundup/ffmpeg/issue413">issue tracker entry</a></li> +<li><a href="http://shedworx.com/volmac-home">VoltaicHD for Mac</a>, +<a href="http://roundup.mplayerhq.hu/roundup/ffmpeg/issue660">issue tracker entry</a></li> </ul>

1 0

r15461 - trunk/ffserver.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Date: Mon Sep 29 09:15:49 2008 New Revision: 15461 Log: Remove some format string warnings. patch by Diego Petten?, flameeyes gmail com Modified: trunk/ffserver.c Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c (original) +++ trunk/ffserver.c Mon Sep 29 09:15:49 2008 @@ -1367,8 +1367,8 @@ static int http_parse_request(HTTPContex "\r\n" "<html><head><title>Too busy</title></head><body>\r\n" "The server is too busy to serve your request at this time.\r\n" - "The bandwidth being served (including your stream) is %lldkbit/sec, " - "and this exceeds the limit of %lldkbit/sec.\r\n" + "The bandwidth being served (including your stream) is %" PRIu64 "kbit/sec, " + "and this exceeds the limit of %" PRIu64 "kbit/sec.\r\n" "</body></html>\r\n", current_bandwidth, max_bandwidth); /* prepare output buffer */ c->buffer_ptr = c->buffer; @@ -1860,7 +1860,7 @@ static void compute_status(HTTPContext * url_fprintf(pb, "Number of connections: %d / %d \n", nb_connections, nb_max_connections); - url_fprintf(pb, "Bandwidth in use: %lldk / %lldk \n", + url_fprintf(pb, "Bandwidth in use: %" PRIu64 "k / %" PRIu64 "k \n", current_bandwidth, max_bandwidth); url_fprintf(pb, "<TABLE>\n");

1 0

r15460 - in trunk: ffmpeg.c libavcodec/utils.c libavformat/rtpdec.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Date: Mon Sep 29 08:22:12 2008 New Revision: 15460 Log: Uniformly define _XOPEN_SOURCE to 600. The feature_tests.h header from Sun systems (Solaris/OpenSolaris) will abort the build if _XOPEN_SOURCE is defined to 500, and C99 is requested (as well as POSIX.1-2001), and will only accept it to be defined to 600. inspired by a patch from Diego Petten?, flameeyes gmail com Modified: trunk/ffmpeg.c trunk/libavcodec/utils.c trunk/libavformat/rtpdec.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Mon Sep 29 08:22:12 2008 @@ -20,7 +20,7 @@ */ /* needed for usleep() */ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include "config.h" #include <ctype.h> Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c (original) +++ trunk/libavcodec/utils.c Mon Sep 29 08:22:12 2008 @@ -26,7 +26,7 @@ */ /* needed for mkstemp() */ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include "libavutil/integer.h" #include "libavutil/crc.h" Modified: trunk/libavformat/rtpdec.c ============================================================================== --- trunk/libavformat/rtpdec.c (original) +++ trunk/libavformat/rtpdec.c Mon Sep 29 08:22:12 2008 @@ -20,7 +20,7 @@ */ /* needed for gethostname() */ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include "libavcodec/bitstream.h" #include "avformat.h"

1 0

r15459 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Date: Mon Sep 29 08:15:51 2008 New Revision: 15459 Log: cosmetics: Consistently use #ifdef in preprocessor directives. Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Mon Sep 29 08:15:51 2008 @@ -52,7 +52,7 @@ #include <sys/select.h> #endif -#if defined(HAVE_TERMIOS_H) +#ifdef HAVE_TERMIOS_H #include <fcntl.h> #include <sys/ioctl.h> #include <sys/time.h>

1 0

r27673 - trunk/libswscale/swscale-example.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Date: Mon Sep 29 08:06:19 2008 New Revision: 27673 Log: Remove unused function fast_memcpy. Modified: trunk/libswscale/swscale-example.c Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c (original) +++ trunk/libswscale/swscale-example.c Mon Sep 29 08:06:19 2008 @@ -154,10 +154,6 @@ static int doTest(uint8_t *ref[3], int r return res; } -void fast_memcpy(void *a, void *b, int s){ //FIXME - memcpy(a, b, s); -} - static void selfTest(uint8_t *src[3], int stride[3], int w, int h){ enum PixelFormat srcFormat, dstFormat; int srcW, srcH, dstW, dstH;

1 0

r27672 - trunk/libswscale/swscale-example.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: diego Date: Mon Sep 29 07:41:54 2008 New Revision: 27672 Log: cosmetics: indentation Modified: trunk/libswscale/swscale-example.c Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c (original) +++ trunk/libswscale/swscale-example.c Mon Sep 29 07:41:54 2008 @@ -133,12 +133,11 @@ static int doTest(uint8_t *ref[3], int r ssdU/= w*h/4; ssdV/= w*h/4; - printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n", - sws_format_name(srcFormat), srcW, srcH, - sws_format_name(dstFormat), dstW, dstH, - flags, - ssdY, ssdU, ssdV); - fflush(stdout); + printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n", + sws_format_name(srcFormat), srcW, srcH, + sws_format_name(dstFormat), dstW, dstH, + flags, ssdY, ssdU, ssdV); + fflush(stdout); end:

1 0

r27671 - trunk/libswscale/swscale-example.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: michael Date: Mon Sep 29 03:15:54 2008 New Revision: 27671 Log: Revert mistakely commited hunk. Modified: trunk/libswscale/swscale-example.c Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c (original) +++ trunk/libswscale/swscale-example.c Mon Sep 29 03:15:54 2008 @@ -27,7 +27,7 @@ #undef HAVE_AV_CONFIG_H #include "libavutil/avutil.h" #include "swscale.h" -//#include "swscale_internal.h" +#include "swscale_internal.h" #include "rgb2rgb.h" static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){

1 0

r27670 - trunk/libswscale/swscale-example.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: michael Date: Mon Sep 29 03:14:27 2008 New Revision: 27670 Log: Print all cases that are tested, not just the ones that are bad. Modified: trunk/libswscale/swscale-example.c Modified: trunk/libswscale/swscale-example.c ============================================================================== --- trunk/libswscale/swscale-example.c (original) +++ trunk/libswscale/swscale-example.c Mon Sep 29 03:14:27 2008 @@ -27,7 +27,7 @@ #undef HAVE_AV_CONFIG_H #include "libavutil/avutil.h" #include "swscale.h" -#include "swscale_internal.h" +//#include "swscale_internal.h" #include "rgb2rgb.h" static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){ @@ -133,14 +133,12 @@ static int doTest(uint8_t *ref[3], int r ssdU/= w*h/4; ssdV/= w*h/4; - if (ssdY>100 || ssdU>100 || ssdV>100){ printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n", sws_format_name(srcFormat), srcW, srcH, sws_format_name(dstFormat), dstW, dstH, flags, ssdY, ssdU, ssdV); fflush(stdout); - } end:

1 0

r27669 - trunk/libswscale/swscale.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: michael Date: Mon Sep 29 03:08:01 2008 New Revision: 27669 Log: Fix infinite loop with spline, bug was introduced in r27612 by me. Modified: trunk/libswscale/swscale.c Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c (original) +++ trunk/libswscale/swscale.c Mon Sep 29 03:08:01 2008 @@ -1229,7 +1229,7 @@ static inline int initFilter(int16_t **o else if (flags & SWS_SPLINE) { double p=-2.196152422706632; - coeff = getSplineCoeff(1.0, 0.0, p, -p-1.0, d) * fone; + coeff = getSplineCoeff(1.0, 0.0, p, -p-1.0, floatd) * fone; } else { coeff= 0.0; //GCC warning killer

1 0

r15458 - trunk/configure
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: aurel Date: Mon Sep 29 01:29:23 2008 New Revision: 15458 Log: fix -uninstalled.pc includedir for out-of-tree builds patch by Diego 'Flameeyes' Petten? flameeyes _at_ gmail Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Sep 29 01:29:23 2008 @@ -2251,7 +2251,7 @@ cat <<EOF > $name/$name-uninstalled.pc prefix= exec_prefix= libdir=\${pcfiledir} -includedir=\${pcfiledir}/.. +includedir=${source_path} Name: $name Description: $comment

1 0

r15457 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: aurel Date: Mon Sep 29 01:24:32 2008 New Revision: 15457 Log: set video_enc->sample_aspect_ratio to fix stream copy patch by Wolfram Gloger wmglo _at_ dent.med.uni-muenchen _dot_ de Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Mon Sep 29 01:24:32 2008 @@ -2972,6 +2972,7 @@ static void new_video_stream(AVFormatCon if (video_stream_copy) { st->stream_copy = 1; video_enc->codec_type = CODEC_TYPE_VIDEO; + video_enc->sample_aspect_ratio = st->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); } else { const char *p;

1 0

r15456 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: michael Date: Mon Sep 29 01:19:12 2008 New Revision: 15456 Log: Guess picture type from picture coding extension when the main header is damaged. Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Mon Sep 29 01:19:12 2008 @@ -1501,13 +1501,28 @@ static void mpeg_decode_quant_matrix_ext } } -static void mpeg_decode_picture_coding_extension(MpegEncContext *s) +static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) { + MpegEncContext *s= &s1->mpeg_enc_ctx; + s->full_pel[0] = s->full_pel[1] = 0; s->mpeg_f_code[0][0] = get_bits(&s->gb, 4); s->mpeg_f_code[0][1] = get_bits(&s->gb, 4); s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); + if(!s->pict_type && s1->mpeg_enc_ctx_allocated){ + av_log(s->avctx, AV_LOG_ERROR, "Missing picture start code, guessing missing values\n"); + if(s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1]==15){ + if(s->mpeg_f_code[0][0] == 15 && s->mpeg_f_code[0][1] == 15) + s->pict_type= FF_I_TYPE; + else + s->pict_type= FF_P_TYPE; + }else + s->pict_type= FF_B_TYPE; + s->current_picture.pict_type= s->pict_type; + s->current_picture.key_frame= s->pict_type == FF_I_TYPE; + s->first_slice= 1; + } s->intra_dc_precision = get_bits(&s->gb, 2); s->picture_structure = get_bits(&s->gb, 2); s->top_field_first = get_bits1(&s->gb); @@ -1573,7 +1588,7 @@ static void mpeg_decode_extension(AVCode mpeg_decode_picture_display_extension(s1); break; case 0x8: - mpeg_decode_picture_coding_extension(s); + mpeg_decode_picture_coding_extension(s1); break; } } @@ -2293,6 +2308,7 @@ static int decode_chunks(AVCodecContext *data_size = sizeof(AVPicture); } } + s2->pict_type= 0; return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); } @@ -2311,8 +2327,9 @@ static int decode_chunks(AVCodecContext case PICTURE_START_CODE: /* we have a complete image: we try to decompress it */ - mpeg1_decode_picture(avctx, - buf_ptr, input_size); + if(mpeg1_decode_picture(avctx, + buf_ptr, input_size) < 0) + s2->pict_type=0; break; case EXT_START_CODE: mpeg_decode_extension(avctx, @@ -2356,6 +2373,11 @@ static int decode_chunks(AVCodecContext break; } + if(!s2->pict_type){ + av_log(avctx, AV_LOG_ERROR, "Missing picture start code\n"); + break; + } + if(s2->first_slice){ s2->first_slice=0; if(mpeg_field_start(s2) < 0)

1 0

r15455 - trunk/libavformat/matroskadec.c
by subversion＠mplayerhq.hu 29 Sep '08

29 Sep '08

Author: aurel Date: Mon Sep 29 01:06:25 2008 New Revision: 15455 Log: matroskadec: merge ASS events which share the same pts in the same AVPavket Modified: trunk/libavformat/matroskadec.c Modified: trunk/libavformat/matroskadec.c ============================================================================== --- trunk/libavformat/matroskadec.c (original) +++ trunk/libavformat/matroskadec.c Mon Sep 29 01:06:25 2008 @@ -205,6 +205,7 @@ typedef struct { /* the packet queue */ AVPacket **packets; int num_packets; + AVPacket *prev_pkt; int done; int has_cluster_id; @@ -964,6 +965,15 @@ static void matroska_fix_ass_packet(Matr } } +static void matroska_merge_packets(AVPacket *out, AVPacket *in) +{ + out->data = av_realloc(out->data, out->size+in->size); + memcpy(out->data+out->size, in->data, in->size); + out->size += in->size; + av_destruct_packet(in); + av_free(in); +} + static void matroska_convert_tags(AVFormatContext *s, EbmlList *list) { MatroskaTag *tags = list->elem; @@ -1629,7 +1639,14 @@ static int matroska_parse_block(Matroska if (st->codec->codec_id == CODEC_ID_SSA) matroska_fix_ass_packet(matroska, pkt, duration); + if (matroska->prev_pkt && + matroska->prev_pkt->pts == timecode && + matroska->prev_pkt->stream_index == st->index) + matroska_merge_packets(matroska->prev_pkt, pkt); + else { dynarray_add(&matroska->packets, &matroska->num_packets, pkt); + matroska->prev_pkt = pkt; + } } if (timecode != AV_NOPTS_VALUE) @@ -1649,6 +1666,7 @@ static int matroska_parse_cluster(Matros MatroskaBlock *blocks; int i, res; offset_t pos = url_ftell(matroska->ctx->pb); + matroska->prev_pkt = NULL; if (matroska->has_cluster_id){ /* For the first cluster we parse, its ID was already read as part of matroska_read_header(), so don't read it again */

1 0