January 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r7766 - trunk/libavformat/aviobuf.c
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: gpoirier Date: Tue Jan 30 11:48:39 2007 New Revision: 7766 Modified: trunk/libavformat/aviobuf.c Log: Fix misbehaviour in url_fseek() when seeking fails. The return value of the seek function is -1 on error, not -EPIPE (the return value in url_seek() if no seek function pointer is set) Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net % Original thread: date: Dec 31, 2006 9:25 PM subject: [Ffmpeg-devel] Re: [PATCH] file length handling Modified: trunk/libavformat/aviobuf.c ============================================================================== --- trunk/libavformat/aviobuf.c (original) +++ trunk/libavformat/aviobuf.c Tue Jan 30 11:48:39 2007 @@ -136,6 +136,8 @@ fill_buffer(s); s->buf_ptr = s->buf_end + offset - s->pos; } else { + offset_t res = -EPIPE; + #if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) if (s->write_flag) { flush_buffer(s); @@ -146,8 +148,8 @@ s->buf_end = s->buffer; } s->buf_ptr = s->buffer; - if (!s->seek || s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) - return -EPIPE; + if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0) + return res; s->pos = offset; } s->eof_reached = 0;

1 0

r7765 - trunk/libavformat/avio.c
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: gpoirier Date: Tue Jan 30 11:37:52 2007 New Revision: 7765 Modified: trunk/libavformat/avio.c Log: protect the size=seek(SEEK_END,-1)+1 results with an if (.. < 0), else the return value may still end up being zero (if the seek returns -1, which is e.g. what file.c will return on error), which is a valid (but incorrect) filesize. Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net % Original thread: date: Jan 2, 2007 2:11 AM subject: [Ffmpeg-devel] Re: [PATCH] file length handling Modified: trunk/libavformat/avio.c ============================================================================== --- trunk/libavformat/avio.c (original) +++ trunk/libavformat/avio.c Tue Jan 30 11:37:52 2007 @@ -154,7 +154,9 @@ size= url_seek(h, 0, AVSEEK_SIZE); if(size<0){ pos = url_seek(h, 0, SEEK_CUR); - size = url_seek(h, -1, SEEK_END)+1; + if ((size = url_seek(h, -1, SEEK_END)) < 0) + return size; + size++; url_seek(h, pos, SEEK_SET); } return size;

1 0

r7764 - in trunk/libavcodec: dsputil.h i386/dsputil_mmx.c i386/snowdsp_mmx.c snow.c snow.h
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: takis Date: Tue Jan 30 11:31:34 2007 New Revision: 7764 Modified: trunk/libavcodec/dsputil.h trunk/libavcodec/i386/dsputil_mmx.c trunk/libavcodec/i386/snowdsp_mmx.c trunk/libavcodec/snow.c trunk/libavcodec/snow.h Log: Add the const specifier as needed to reduce the number of warnings. Modified: trunk/libavcodec/dsputil.h ============================================================================== --- trunk/libavcodec/dsputil.h (original) +++ trunk/libavcodec/dsputil.h Tue Jan 30 11:31:34 2007 @@ -388,7 +388,7 @@ /* snow wavelet */ void (*vertical_compose97i)(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width); void (*horizontal_compose97i)(DWTELEM *b, int width); - void (*inner_add_yblock)(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); + void (*inner_add_yblock)(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); void (*prefetch)(void *mem, int stride, int h); Modified: trunk/libavcodec/i386/dsputil_mmx.c ============================================================================== --- trunk/libavcodec/i386/dsputil_mmx.c (original) +++ trunk/libavcodec/i386/dsputil_mmx.c Tue Jan 30 11:31:34 2007 @@ -3042,9 +3042,9 @@ extern void ff_snow_horizontal_compose97i_mmx(DWTELEM *b, int width); extern void ff_snow_vertical_compose97i_sse2(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width); extern void ff_snow_vertical_compose97i_mmx(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width); -extern void ff_snow_inner_add_yblock_sse2(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, +extern void ff_snow_inner_add_yblock_sse2(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); -extern void ff_snow_inner_add_yblock_mmx(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, +extern void ff_snow_inner_add_yblock_mmx(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); #endif Modified: trunk/libavcodec/i386/snowdsp_mmx.c ============================================================================== --- trunk/libavcodec/i386/snowdsp_mmx.c (original) +++ trunk/libavcodec/i386/snowdsp_mmx.c Tue Jan 30 11:31:34 2007 @@ -708,7 +708,7 @@ "dec %2 \n\t"\ snow_inner_add_yblock_sse2_end_common2 -static void inner_add_yblock_bw_8_obmc_16_bh_even_sse2(uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, +static void inner_add_yblock_bw_8_obmc_16_bh_even_sse2(const uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, int src_x, int src_y, long src_stride, slice_buffer * sb, int add, uint8_t * dst8){ snow_inner_add_yblock_sse2_header snow_inner_add_yblock_sse2_start_8("xmm1", "xmm5", "3", "0") @@ -756,7 +756,7 @@ snow_inner_add_yblock_sse2_end_8 } -static void inner_add_yblock_bw_16_obmc_32_sse2(uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, +static void inner_add_yblock_bw_16_obmc_32_sse2(const uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, int src_x, int src_y, long src_stride, slice_buffer * sb, int add, uint8_t * dst8){ snow_inner_add_yblock_sse2_header snow_inner_add_yblock_sse2_start_16("xmm1", "xmm5", "3", "0") @@ -868,7 +868,7 @@ "rm"((long)(src_x<<2)),"m"(obmc),"a"(block),"m"((long)b_h),"m"((long)src_stride):\ "%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d""); -static void inner_add_yblock_bw_8_obmc_16_mmx(uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, +static void inner_add_yblock_bw_8_obmc_16_mmx(const uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, int src_x, int src_y, long src_stride, slice_buffer * sb, int add, uint8_t * dst8){ snow_inner_add_yblock_mmx_header snow_inner_add_yblock_mmx_start("mm1", "mm5", "3", "0", "0") @@ -879,7 +879,7 @@ snow_inner_add_yblock_mmx_end("16") } -static void inner_add_yblock_bw_16_obmc_32_mmx(uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, +static void inner_add_yblock_bw_16_obmc_32_mmx(const uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h, int src_x, int src_y, long src_stride, slice_buffer * sb, int add, uint8_t * dst8){ snow_inner_add_yblock_mmx_header snow_inner_add_yblock_mmx_start("mm1", "mm5", "3", "0", "0") @@ -896,7 +896,7 @@ snow_inner_add_yblock_mmx_end("32") } -void ff_snow_inner_add_yblock_sse2(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, +void ff_snow_inner_add_yblock_sse2(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){ if (b_w == 16) @@ -910,7 +910,7 @@ ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8); } -void ff_snow_inner_add_yblock_mmx(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, +void ff_snow_inner_add_yblock_mmx(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){ if (b_w == 16) inner_add_yblock_bw_16_obmc_32_mmx(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8); Modified: trunk/libavcodec/snow.c ============================================================================== --- trunk/libavcodec/snow.c (original) +++ trunk/libavcodec/snow.c Tue Jan 30 11:31:34 2007 @@ -2521,16 +2521,16 @@ } } -void ff_snow_inner_add_yblock(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, +void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8){ int y, x; DWTELEM * dst; for(y=0; y<b_h; y++){ //FIXME ugly missue of obmc_stride - uint8_t *obmc1= obmc + y*obmc_stride; - uint8_t *obmc2= obmc1+ (obmc_stride>>1); - uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1); - uint8_t *obmc4= obmc3+ (obmc_stride>>1); + const uint8_t *obmc1= obmc + y*obmc_stride; + const uint8_t *obmc2= obmc1+ (obmc_stride>>1); + const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1); + const uint8_t *obmc4= obmc3+ (obmc_stride>>1); dst = slice_buffer_get_line(sb, src_y + y); for(x=0; x<b_w; x++){ int v= obmc1[x] * block[3][x + y*src_stride] @@ -2687,10 +2687,10 @@ }else for(y=0; y<b_h; y++){ //FIXME ugly missue of obmc_stride - uint8_t *obmc1= obmc + y*obmc_stride; - uint8_t *obmc2= obmc1+ (obmc_stride>>1); - uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1); - uint8_t *obmc4= obmc3+ (obmc_stride>>1); + const uint8_t *obmc1= obmc + y*obmc_stride; + const uint8_t *obmc2= obmc1+ (obmc_stride>>1); + const uint8_t *obmc3= obmc1+ obmc_stride*(obmc_stride>>1); + const uint8_t *obmc4= obmc3+ (obmc_stride>>1); for(x=0; x<b_w; x++){ int v= obmc1[x] * block[3][x + y*src_stride] +obmc2[x] * block[2][x + y*src_stride] Modified: trunk/libavcodec/snow.h ============================================================================== --- trunk/libavcodec/snow.h (original) +++ trunk/libavcodec/snow.h Tue Jan 30 11:31:34 2007 @@ -125,7 +125,7 @@ extern void ff_snow_vertical_compose97i(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *b3, DWTELEM *b4, DWTELEM *b5, int width); extern void ff_snow_horizontal_compose97i(DWTELEM *b, int width); -extern void ff_snow_inner_add_yblock(uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); +extern void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); #ifdef CONFIG_SNOW_ENCODER int w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h);

1 0

r7763 - trunk/libavcodec/armv4l/mpegvideo_armv5te.c
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: mru Date: Mon Jan 29 23:27:27 2007 New Revision: 7763 Modified: trunk/libavcodec/armv4l/mpegvideo_armv5te.c Log: typo fix by Dmitry Antipov dmantipov =a= yandex =d= ru Modified: trunk/libavcodec/armv4l/mpegvideo_armv5te.c ============================================================================== --- trunk/libavcodec/armv4l/mpegvideo_armv5te.c (original) +++ trunk/libavcodec/armv4l/mpegvideo_armv5te.c Mon Jan 29 23:27:27 2007 @@ -72,7 +72,7 @@ int xqmul = xxqmul, xqadd = xxqadd, xcount = xxcount, xtmp; \ int xdata1, xdata2; \ __asm__ __volatile__( \ - "subs %[count], #2 \n\t" \ + "subs %[count], %[count], #2 \n\t" \ "ble 2f \n\t" \ "ldrd r4, [%[block], #0] \n\t" \ "1: \n\t" \ @@ -128,11 +128,11 @@ "strh r7, [%[block]], #2 \n\t" \ "strh %[data2], [%[block]], #2 \n\t" \ \ - "subs %[count], #8 \n\t" \ + "subs %[count], %[count], #8 \n\t" \ "ldrgtd r4, [%[block], #0] \n\t" /* load data early to avoid load/use pipeline stall */ \ "bgt 1b \n\t" \ \ - "adds %[count], #2 \n\t" \ + "adds %[count], %[count], #2 \n\t" \ "ble 3f \n\t" \ "2: \n\t" \ "ldrsh %[data1], [%[block], #0] \n\t" \

1 0

r7762 - trunk/libavcodec/armv4l/simple_idct_armv6.S
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: mru Date: Mon Jan 29 23:25:54 2007 New Revision: 7762 Modified: trunk/libavcodec/armv4l/simple_idct_armv6.S Log: theoretically save one cycle Modified: trunk/libavcodec/armv4l/simple_idct_armv6.S ============================================================================== --- trunk/libavcodec/armv4l/simple_idct_armv6.S (original) +++ trunk/libavcodec/armv4l/simple_idct_armv6.S Mon Jan 29 23:25:54 2007 @@ -72,13 +72,13 @@ ldr lr, [a1, #12] /* lr = row[7,5] */ pkhtb a3, ip, v7, asr #16 /* a4 = W7 | (W3 << 16) */ pkhbt a2, ip, v7, lsl #16 /* a2 = W1 | (W5 << 16) */ + smusdx v6, a3, a4 /* v6 = -B1 = W7*row[3] - W3*row[1] */ smlad v5, lr, v7, v5 /* B0 += W5*row[5] + W7*row[7] */ smusdx v7, a4, a2 /* v7 = B2 = W5*row[1] - W1*row[3] */ - smusdx v6, a3, a4 /* v6 = -B1 = W7*row[3] - W3*row[1] */ + ldr a4, [pc, #(w42n-.-8)] /* a4 = -W4 | (-W2 << 16) */ smlad v7, lr, a3, v7 /* B2 += W7*row[5] + W3*row[7] */ ldr a3, [a1, #4] /* a3 = row[6,4] */ - ldr a4, [pc, #(w42n-.-8)] /* a4 = -W4 | (-W2 << 16) */ smlsdx fp, lr, ip, fp /* B3 += W3*row[5] - W1*row[7] */ ldr ip, [pc, #(w46-.-8)] /* ip = W4 | (W6 << 16) */ smlad v6, lr, a2, v6 /* B1 -= W1*row[5] + W5*row[7] */

1 0

r7761 - trunk/ffplay.c
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: michael Date: Mon Jan 29 23:06:55 2007 New Revision: 7761 Modified: trunk/ffplay.c Log: trigger for the audio scope vissualization Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c (original) +++ trunk/ffplay.c Mon Jan 29 23:06:55 2007 @@ -782,7 +782,23 @@ delay -= s->width / 2; if (delay < s->width) delay = s->width; - i_start = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE); + + i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE); + + h= INT_MIN; + for(i=0; i<1000; i+=channels){ + int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE; + int a= s->sample_array[idx]; + int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE]; + int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE]; + int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE]; + int score= a-d; + if(h<score && (b^c)<0){ + h= score; + i_start= idx; + } + } + s->last_i_start = i_start; } else { i_start = s->last_i_start;

1 0

r7755 - trunk/libavcodec/cook.c
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: banan Date: Mon Jan 29 11:32:14 2007 New Revision: 7755 Modified: trunk/libavcodec/cook.c Log: Get rid of the COOKextradata struct. And use valid C to parse the extradata. Modified: trunk/libavcodec/cook.c ============================================================================== --- trunk/libavcodec/cook.c (original) +++ trunk/libavcodec/cook.c Mon Jan 29 11:32:14 2007 @@ -51,6 +51,7 @@ #include "bitstream.h" #include "dsputil.h" #include "common.h" +#include "bytestream.h" #include "cookdata.h" @@ -69,19 +70,6 @@ int qidx_table2[8]; } COOKgain; -typedef struct __attribute__((__packed__)){ - /* codec data start */ - uint32_t cookversion; //in network order, bigendian - uint16_t samples_per_frame; //amount of samples per frame per channel, bigendian - uint16_t subbands; //amount of bands used in the frequency domain, bigendian - /* Mono extradata ends here. */ - uint32_t unused; - uint16_t js_subband_start; //bigendian - uint16_t js_vlc_bits; //bigendian - /* Stereo extradata ends here. */ -} COOKextradata; - - typedef struct { GetBitContext gb; /* stream data */ @@ -98,6 +86,7 @@ int total_subbands; int num_vectors; int bits_per_subpacket; + int cookversion; /* states */ int random_state; @@ -1083,15 +1072,15 @@ } #ifdef COOKDEBUG -static void dump_cook_context(COOKContext *q, COOKextradata *e) +static void dump_cook_context(COOKContext *q) { //int i=0; #define PRINT(a,b) av_log(NULL,AV_LOG_ERROR," %s = %d\n", a, b); av_log(NULL,AV_LOG_ERROR,"COOKextradata\n"); - av_log(NULL,AV_LOG_ERROR,"cookversion=%x\n",e->cookversion); - if (e->cookversion > STEREO) { - PRINT("js_subband_start",e->js_subband_start); - PRINT("js_vlc_bits",e->js_vlc_bits); + av_log(NULL,AV_LOG_ERROR,"cookversion=%x\n",q->cookversion); + if (q->cookversion > STEREO) { + PRINT("js_subband_start",q->js_subband_start); + PRINT("js_vlc_bits",q->js_vlc_bits); } av_log(NULL,AV_LOG_ERROR,"COOKContext\n"); PRINT("nb_channels",q->nb_channels); @@ -1117,8 +1106,8 @@ static int cook_decode_init(AVCodecContext *avctx) { - COOKextradata *e = (COOKextradata *)avctx->extradata; COOKContext *q = avctx->priv_data; + uint8_t *edata_ptr = avctx->extradata; /* Take care of the codec specific extradata. */ if (avctx->extradata_size <= 0) { @@ -1129,13 +1118,14 @@ Swap to right endianness so we don't need to care later on. */ av_log(avctx,AV_LOG_DEBUG,"codecdata_length=%d\n",avctx->extradata_size); if (avctx->extradata_size >= 8){ - e->cookversion = be2me_32(e->cookversion); - e->samples_per_frame = be2me_16(e->samples_per_frame); - e->subbands = be2me_16(e->subbands); + q->cookversion = be2me_32(bytestream_get_le32(&edata_ptr)); + q->samples_per_frame = be2me_16(bytestream_get_le16(&edata_ptr)); + q->subbands = be2me_16(bytestream_get_le16(&edata_ptr)); } if (avctx->extradata_size >= 16){ - e->js_subband_start = be2me_16(e->js_subband_start); - e->js_vlc_bits = be2me_16(e->js_vlc_bits); + bytestream_get_le32(&edata_ptr); //Unknown unused + q->js_subband_start = be2me_16(bytestream_get_le16(&edata_ptr)); + q->js_vlc_bits = be2me_16(bytestream_get_le16(&edata_ptr)); } } @@ -1148,20 +1138,17 @@ q->random_state = 1; /* Initialize extradata related variables. */ - q->samples_per_channel = e->samples_per_frame / q->nb_channels; - q->samples_per_frame = e->samples_per_frame; - q->subbands = e->subbands; + q->samples_per_channel = q->samples_per_frame / q->nb_channels; q->bits_per_subpacket = avctx->block_align * 8; /* Initialize default data states. */ - q->js_subband_start = 0; q->log2_numvector_size = 5; q->total_subbands = q->subbands; /* Initialize version-dependent variables */ - av_log(NULL,AV_LOG_DEBUG,"e->cookversion=%x\n",e->cookversion); + av_log(NULL,AV_LOG_DEBUG,"q->cookversion=%x\n",q->cookversion); q->joint_stereo = 0; - switch (e->cookversion) { + switch (q->cookversion) { case MONO: if (q->nb_channels != 1) { av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n"); @@ -1182,10 +1169,8 @@ } av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n"); if (avctx->extradata_size >= 16){ - q->total_subbands = q->subbands + e->js_subband_start; - q->js_subband_start = e->js_subband_start; + q->total_subbands = q->subbands + q->js_subband_start; q->joint_stereo = 1; - q->js_vlc_bits = e->js_vlc_bits; } if (q->samples_per_channel > 256) { q->log2_numvector_size = 6; @@ -1262,7 +1247,7 @@ } #ifdef COOKDEBUG - dump_cook_context(q,e); + dump_cook_context(q); #endif return 0; }

3 3

r7760 - trunk/libavformat/rtp.h
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: lu_zero Date: Mon Jan 29 16:02:57 2007 New Revision: 7760 Modified: trunk/libavformat/rtp.h Log: Missing prototype added Modified: trunk/libavformat/rtp.h ============================================================================== --- trunk/libavformat/rtp.h (original) +++ trunk/libavformat/rtp.h Mon Jan 29 16:02:57 2007 @@ -41,6 +41,7 @@ int rtp_get_local_port(URLContext *h); int rtp_set_remote_url(URLContext *h, const char *uri); void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd); +int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count); extern URLProtocol rtp_protocol;

1 0

r7759 - trunk/libavformat/asf.c
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: michael Date: Mon Jan 29 15:54:55 2007 New Revision: 7759 Modified: trunk/libavformat/asf.c Log: fix seeking in wma Modified: trunk/libavformat/asf.c ============================================================================== --- trunk/libavformat/asf.c (original) +++ trunk/libavformat/asf.c Mon Jan 29 15:54:55 2007 @@ -673,7 +673,8 @@ asf->packet_multi_size -= asf->packet_obj_size; //printf("COMPRESS size %d %d %d ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size); } - if (asf_st->pkt.size != asf->packet_obj_size) { //FIXME is this condition sufficient? + if ( asf_st->pkt.size != asf->packet_obj_size + || asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { //FIXME is this condition sufficient? if(asf_st->pkt.data){ av_log(s, AV_LOG_INFO, "freeing incomplete packet size %d, new %d\n", asf_st->pkt.size, asf->packet_obj_size); asf_st->frag_offset = 0;

1 0

r7758 - trunk/libavcodec/vc1.c
by subversion＠mplayerhq.hu 29 Jan '07

29 Jan '07

Author: kostya Date: Mon Jan 29 15:23:00 2007 New Revision: 7758 Modified: trunk/libavcodec/vc1.c Log: Fix BI-frames decoding for Adv. profile Modified: trunk/libavcodec/vc1.c ============================================================================== --- trunk/libavcodec/vc1.c (original) +++ trunk/libavcodec/vc1.c Mon Jan 29 15:23:00 2007 @@ -1834,7 +1834,7 @@ } /* DC Syntax */ v->s.dc_table_index = get_bits(gb, 1); - if (v->s.pict_type == I_TYPE && v->dquant) { + if ((v->s.pict_type == I_TYPE || v->s.pict_type == BI_TYPE) && v->dquant) { av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n"); vop_dquant_decoding(v); } @@ -4083,9 +4083,12 @@ vc1_decode_p_blocks(v); break; case B_TYPE: - if(v->bi_type) - vc1_decode_i_blocks(v); - else + if(v->bi_type){ + if(v->profile == PROFILE_ADVANCED) + vc1_decode_i_blocks_adv(v); + else + vc1_decode_i_blocks(v); + }else vc1_decode_b_blocks(v); break; }

1 0