July 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r12487 - trunk/configure
by subversion＠mplayerhq.hu 09 Mar '09

09 Mar '09

Author: diego Date: Tue Mar 18 13:32:55 2008 New Revision: 12487 Log: Check for and set HAVE_MMX2, it is used in several places. patch by Alexander Strange, astrange ithinksw com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Mar 18 13:32:55 2008 @@ -699,6 +699,7 @@ ARCH_EXT_LIST=' iwmmxt mmi mmx + mmx2 ssse3 vis ' @@ -780,6 +781,7 @@ armv6_deps="armv4l" iwmmxt_deps="armv4l" mmi_deps="mips" mmx_deps="x86" +mmx2_deps="x86" ssse3_deps="x86" vis_deps="sparc" @@ -1517,8 +1519,9 @@ EOF # check wether EBX is available on x86 check_asm ebx_available '"":::"%ebx"' - # check whether binutils is new enough to compile SSSE3 + # check whether binutils is new enough to compile SSSE3/MMX2 enabled ssse3 && check_asm ssse3 '"pabsw %xmm0, %xmm0"' + enabled mmx2 && check_asm mmx2 '"movss %xmm0, %xmm0"' check_asm bswap '"bswap %%eax" ::: "%eax"' fi

4 4

r14339 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 30 Sep '08

30 Sep '08

Author: michael Date: Wed Jul 23 04:12:54 2008 New Revision: 14339 Log: Support gaps in the frame num. Fixes at least: MR3_TANDBERG_B.264 MR4_TANDBERG_C.264 MR5_TANDBERG_C.264 Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c (original) +++ trunk/libavcodec/h264.c Wed Jul 23 04:12:54 2008 @@ -3539,6 +3539,12 @@ static int execute_ref_pic_marking(H264C pic= remove_long(h, j); if(pic) unreference_pic(h, pic, 0); } + s->current_picture_ptr->poc= + s->current_picture_ptr->field_poc[0]= + s->current_picture_ptr->field_poc[1]= + h->poc_lsb= + h->poc_msb= + h->frame_num= s->current_picture_ptr->frame_num= 0; break; default: assert(0); @@ -3599,7 +3605,7 @@ static int execute_ref_pic_marking(H264C "number of reference frames exceeds max (probably " "corrupt input), discarding one\n"); - if (h->long_ref_count) { + if (h->long_ref_count && !h->short_ref_count) { for (i = 0; i < 16; ++i) if (h->long_ref[i]) break; @@ -4018,6 +4024,16 @@ static int decode_slice_header(H264Conte } if(h0->current_slice == 0){ + while(h->frame_num != h->prev_frame_num && + h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){ + av_log(NULL, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); + frame_start(h); + h->prev_frame_num++; + h->prev_frame_num %= 1<<h->sps.log2_max_frame_num; + s->current_picture_ptr->frame_num= h->prev_frame_num; + execute_ref_pic_marking(h, NULL, 0); + } + /* See if we have a decoded first field looking for a pair... */ if (s0->first_field) { assert(s0->current_picture_ptr); @@ -7738,7 +7754,7 @@ static int decode_frame(AVCodecContext * //FIXME factorize this with the output code below out = h->delayed_pic[0]; out_idx = 0; - for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) + for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && h->delayed_pic[i]->poc; i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i; @@ -7821,13 +7837,13 @@ static int decode_frame(AVCodecContext * s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264; s->current_picture_ptr->pict_type= s->pict_type; - h->prev_frame_num_offset= h->frame_num_offset; - h->prev_frame_num= h->frame_num; if(!s->dropable) { + execute_ref_pic_marking(h, h->mmco, h->mmco_index); h->prev_poc_msb= h->poc_msb; h->prev_poc_lsb= h->poc_lsb; - execute_ref_pic_marking(h, h->mmco, h->mmco_index); } + h->prev_frame_num_offset= h->frame_num_offset; + h->prev_frame_num= h->frame_num; /* * FIXME: Error handling code does not seem to support interlaced @@ -7887,7 +7903,7 @@ static int decode_frame(AVCodecContext * out = h->delayed_pic[0]; out_idx = 0; - for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) + for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && h->delayed_pic[i]->poc; i++) if(h->delayed_pic[i]->poc < out->poc){ out = h->delayed_pic[i]; out_idx = i;

4 7

r12894 - in trunk/libavcodec: aac_ac3_parser.c aac_ac3_parser.h aac_parser.c ac3_parser.c
by subversion＠mplayerhq.hu 22 Sep '08

22 Sep '08

Author: michael Date: Sat Apr 19 03:50:40 2008 New Revision: 12894 Log: Change aac and ac3 parsers to use ff_combine_frame(). Modified: trunk/libavcodec/aac_ac3_parser.c trunk/libavcodec/aac_ac3_parser.h trunk/libavcodec/aac_parser.c trunk/libavcodec/ac3_parser.c Modified: trunk/libavcodec/aac_ac3_parser.c ============================================================================== --- trunk/libavcodec/aac_ac3_parser.c (original) +++ trunk/libavcodec/aac_ac3_parser.c Sat Apr 19 03:50:40 2008 @@ -29,34 +29,40 @@ int ff_aac_ac3_parse(AVCodecParserContex const uint8_t *buf, int buf_size) { AACAC3ParseContext *s = s1->priv_data; - const uint8_t *buf_ptr; - int len; + ParseContext *pc = &s->pc; + int len, i; - *poutbuf = NULL; - *poutbuf_size = 0; + i=END_NOT_FOUND; + if(s->remaining_size <= buf_size){ + if(s->remaining_size){ + i= s->remaining_size; + s->remaining_size = 0; + }else{ //we need a header first + len=0; + for(i=s->remaining_size; i<buf_size; i++){ + s->state = (s->state<<8) + buf[i]; + if((len=s->sync(s->state, s))) + break; + } + if(len<=0){ + i=END_NOT_FOUND; + }else{ + i-= s->header_size -1; + s->remaining_size = len + i; + } + } + } - buf_ptr = buf; - while (buf_size > 0) { - int size_needed= s->frame_size ? s->frame_size : s->header_size; - len = s->inbuf_ptr - s->inbuf; + if(ff_combine_frame(pc, i, &buf, &buf_size)<0){ + s->remaining_size -= FFMIN(s->remaining_size, buf_size); + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } - if(len<size_needed){ - len = FFMIN(size_needed - len, buf_size); - memcpy(s->inbuf_ptr, buf_ptr, len); - buf_ptr += len; - s->inbuf_ptr += len; - buf_size -= len; - } + *poutbuf = buf; + *poutbuf_size = buf_size; - if (s->frame_size == 0) { - if ((s->inbuf_ptr - s->inbuf) == s->header_size) { - len = s->sync(s); - if (len == 0) { - /* no sync found : move by one byte (inefficient, but simple!) */ - memmove(s->inbuf, s->inbuf + 1, s->header_size - 1); - s->inbuf_ptr--; - } else { - s->frame_size = len; /* update codec info */ avctx->sample_rate = s->sample_rate; /* allow downmixing to stereo (or mono for AC3) */ @@ -71,17 +77,6 @@ int ff_aac_ac3_parse(AVCodecParserContex } avctx->bit_rate = s->bit_rate; avctx->frame_size = s->samples; - } - } - } else { - if(s->inbuf_ptr - s->inbuf == s->frame_size){ - *poutbuf = s->inbuf; - *poutbuf_size = s->frame_size; - s->inbuf_ptr = s->inbuf; - s->frame_size = 0; - break; - } - } - } - return buf_ptr - buf; + + return i; } Modified: trunk/libavcodec/aac_ac3_parser.h ============================================================================== --- trunk/libavcodec/aac_ac3_parser.h (original) +++ trunk/libavcodec/aac_ac3_parser.h Sat Apr 19 03:50:40 2008 @@ -27,16 +27,18 @@ #include "avcodec.h" typedef struct AACAC3ParseContext { - uint8_t *inbuf_ptr; int frame_size; int header_size; - int (*sync)(struct AACAC3ParseContext *hdr_info); - uint8_t inbuf[8192]; /* input buffer */ + int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info); int channels; int sample_rate; int bit_rate; int samples; + + ParseContext pc; + int remaining_size; + uint64_t state; } AACAC3ParseContext; int ff_aac_ac3_parse(AVCodecParserContext *s1, Modified: trunk/libavcodec/aac_parser.c ============================================================================== --- trunk/libavcodec/aac_parser.c (original) +++ trunk/libavcodec/aac_parser.c Sat Apr 19 03:50:40 2008 @@ -27,12 +27,13 @@ #define AAC_HEADER_SIZE 7 -static int aac_sync(AACAC3ParseContext *hdr_info) +static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info) { GetBitContext bits; int size, rdb, ch, sr; + uint64_t tmp = be2me_64(state); - init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8); + init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); if(get_bits(&bits, 12) != 0xfff) return 0; @@ -72,7 +73,6 @@ static int aac_sync(AACAC3ParseContext * static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AAC_HEADER_SIZE; s->sync = aac_sync; return 0; Modified: trunk/libavcodec/ac3_parser.c ============================================================================== --- trunk/libavcodec/ac3_parser.c (original) +++ trunk/libavcodec/ac3_parser.c Sat Apr 19 03:50:40 2008 @@ -123,12 +123,13 @@ int ff_ac3_parse_header(const uint8_t bu return 0; } -static int ac3_sync(AACAC3ParseContext *hdr_info) +static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info) { int err; + uint64_t tmp = be2me_64(state); AC3HeaderInfo hdr; - err = ff_ac3_parse_header(hdr_info->inbuf, &hdr); + err = ff_ac3_parse_header(((uint8_t *)&tmp)+8-AC3_HEADER_SIZE, &hdr); if(err < 0) return 0; @@ -144,7 +145,6 @@ static int ac3_sync(AACAC3ParseContext * static av_cold int ac3_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AC3_HEADER_SIZE; s->sync = ac3_sync; return 0;

6 15

r12212 - trunk/libavcodec/faandct.c
by subversion＠mplayerhq.hu 06 Sep '08

06 Sep '08

Author: michael Date: Mon Feb 25 15:42:12 2008 New Revision: 12212 Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap). Modified: trunk/libavcodec/faandct.c Modified: trunk/libavcodec/faandct.c ============================================================================== --- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */ /**

5 8

r14484 - in trunk/libavcodec: audioconvert.c audioconvert.h
by subversion＠mplayerhq.hu 05 Aug '08

05 Aug '08

Author: pross Date: Thu Jul 31 14:55:06 2008 New Revision: 14484 Log: Add sample format support functions: avcodec_get_sample_fmt_name(), avcodec_get_sample_fmt(), avcodec_sample_fmt_string() Added: trunk/libavcodec/audioconvert.h Modified: trunk/libavcodec/audioconvert.c Modified: trunk/libavcodec/audioconvert.c ============================================================================== --- trunk/libavcodec/audioconvert.c (original) +++ trunk/libavcodec/audioconvert.c Thu Jul 31 14:55:06 2008 @@ -25,7 +25,49 @@ * @author Michael Niedermayer <michaelni at gmx.at> */ -#include "avcodec.h" +#include "audioconvert.h" + +typedef struct SampleFmtInfo { + const char *name; + int bits; +} SampleFmtInfo; + +/** this table gives more information about formats */ +static const SampleFmtInfo sample_fmt_info[SAMPLE_FMT_NB] = { + [SAMPLE_FMT_U8] = { .name = "u8", .bits = 8 }, + [SAMPLE_FMT_S16] = { .name = "s16", .bits = 16 }, + [SAMPLE_FMT_S24] = { .name = "s24", .bits = 24 }, + [SAMPLE_FMT_S32] = { .name = "s32", .bits = 32 }, + [SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32 } +}; + +const char *avcodec_get_sample_fmt_name(int sample_fmt) +{ + if (sample_fmt < 0 || sample_fmt >= SAMPLE_FMT_NB) + return NULL; + return sample_fmt_info[sample_fmt].name; +} + +enum SampleFormat avcodec_get_sample_fmt(const char* name) +{ + int i; + + for (i=0; i < SAMPLE_FMT_NB; i++) + if (!strcmp(sample_fmt_info[i].name, name)) + return i; + return SAMPLE_FMT_NONE; +} + +void avcodec_sample_fmt_string (char *buf, int buf_size, int sample_fmt) +{ + /* print header */ + if (sample_fmt < 0) + snprintf (buf, buf_size, "name " " depth"); + else if (sample_fmt < SAMPLE_FMT_NB) { + SampleFmtInfo info= sample_fmt_info[sample_fmt]; + snprintf (buf, buf_size, "%-6s" " %2d ", info.name, info.bits); + } +} int av_audio_convert(void *maybe_dspcontext_or_something_av_convert_specific, void *out[6], int out_stride[6], enum SampleFormat out_fmt, Added: trunk/libavcodec/audioconvert.h ============================================================================== --- (empty file) +++ trunk/libavcodec/audioconvert.h Thu Jul 31 14:55:06 2008 @@ -0,0 +1,57 @@ +/* + * audio conversion + * Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at> + * Copyright (c) 2008 Peter Ross + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef FFMPEG_AUDIOCONVERT_H +#define FFMPEG_AUDIOCONVERT_H + +/** + * @file audioconvert.h + * Audio format conversion routines + */ + + +#include "avcodec.h" + + +/** + * Generate string corresponding to the sample format with + * number sample_fmt, or a header if sample_fmt is negative. + * + * @param[in] buf the buffer where to write the string + * @param[in] buf_size the size of buf + * @param[in] sample_fmt the number of the sample format to print the corresponding info string, or + * a negative value to print the corresponding header. + * Meaningful values for obtaining a sample format info vary from 0 to SAMPLE_FMT_NB -1. + */ +void avcodec_sample_fmt_string(char *buf, int buf_size, int sample_fmt); + +/** + * @return NULL on error + */ +const char *avcodec_get_sample_fmt_name(int sample_fmt); + +/** + * @return SAMPLE_FMT_NONE on error + */ +enum SampleFormat avcodec_get_sample_fmt(const char* name); + +#endif /* FFMPEG_AUDIOCONVERT_H */

14 93

r14493 - trunk/libavcodec/mpegvideo.c
by subversion＠mplayerhq.hu 31 Jul '08

31 Jul '08

Author: bcoudurier Date: Thu Jul 31 21:51:19 2008 New Revision: 14493 Log: fix mpeg 4:2:2 vis_qp and vis_mb_type debug, fix issue #471 Modified: trunk/libavcodec/mpegvideo.c Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c (original) +++ trunk/libavcodec/mpegvideo.c Thu Jul 31 21:51:19 2008 @@ -560,8 +560,8 @@ int MPV_common_init(MpegEncContext *s) s->parse_context.state= -1; if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ s->visualization_buffer[0] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH); - s->visualization_buffer[1] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH); - s->visualization_buffer[2] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH); + s->visualization_buffer[1] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH); + s->visualization_buffer[2] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH); } s->context_initialized = 1; @@ -1164,7 +1164,7 @@ void ff_print_debug_info(MpegEncContext int mb_y; uint8_t *ptr; int i; - int h_chroma_shift, v_chroma_shift; + int h_chroma_shift, v_chroma_shift, block_height; const int width = s->avctx->width; const int height= s->avctx->height; const int mv_sample_log2= 4 - pict->motion_subsample_log2; @@ -1178,6 +1178,7 @@ void ff_print_debug_info(MpegEncContext } pict->type= FF_BUFFER_TYPE_COPY; ptr= pict->data[0]; + block_height = 16>>v_chroma_shift; for(mb_y=0; mb_y<s->mb_height; mb_y++){ int mb_x; @@ -1255,9 +1256,9 @@ void ff_print_debug_info(MpegEncContext if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){ uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL; int y; - for(y=0; y<8; y++){ - *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c; - *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c; + for(y=0; y<block_height; y++){ + *(uint64_t*)(pict->data[1] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[1])= c; + *(uint64_t*)(pict->data[2] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[2])= c; } } if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){ @@ -1297,9 +1298,9 @@ v= (int)(128 + r*sin(theta*3.141592/180) u*= 0x0101010101010101ULL; v*= 0x0101010101010101ULL; - for(y=0; y<8; y++){ - *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u; - *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v; + for(y=0; y<block_height; y++){ + *(uint64_t*)(pict->data[1] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[1])= u; + *(uint64_t*)(pict->data[2] + 8*mb_x + (block_height*mb_y + y)*pict->linesize[2])= v; } //segmentation

1 0

r14492 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 31 Jul '08

31 Jul '08

Author: bcoudurier Date: Thu Jul 31 21:44:42 2008 New Revision: 14492 Log: downgrade mov negative ctts log message to warning, patch by Art Clarke, aclarke at vlideshow dot com Modified: trunk/libavformat/mov.c Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c (original) +++ trunk/libavformat/mov.c Thu Jul 31 21:44:42 2008 @@ -1125,7 +1125,7 @@ static int mov_read_ctts(MOVContext *c, int duration =get_be32(pb); if (duration < 0) { - av_log(c->fc, AV_LOG_ERROR, "negative ctts, ignoring\n"); + av_log(c->fc, AV_LOG_WARNING, "negative ctts, ignoring\n"); sc->ctts_count = 0; url_fskip(pb, 8 * (entries - i - 1)); break;

1 0

r14491 - in trunk: libavformat/aviobuf.c tests/seek.regression.ref
by subversion＠mplayerhq.hu 31 Jul '08

31 Jul '08

Author: bcoudurier Date: Thu Jul 31 21:40:06 2008 New Revision: 14491 Log: only reset buffer state if seeking is sucessfull, update seek reg ref Modified: trunk/libavformat/aviobuf.c trunk/tests/seek.regression.ref Modified: trunk/libavformat/aviobuf.c ============================================================================== --- trunk/libavformat/aviobuf.c (original) +++ trunk/libavformat/aviobuf.c Thu Jul 31 21:40:06 2008 @@ -163,14 +163,13 @@ offset_t url_fseek(ByteIOContext *s, off if (s->write_flag) { flush_buffer(s); s->must_flush = 1; - } else -#endif /* defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) */ - { - s->buf_end = s->buffer; } - s->buf_ptr = s->buffer; +#endif /* defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) */ if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0) return res; + if (!s->write_flag) + s->buf_end = s->buffer; + s->buf_ptr = s->buffer; s->pos = offset; } s->eof_reached = 0; Modified: trunk/tests/seek.regression.ref ============================================================================== --- trunk/tests/seek.regression.ref (original) +++ trunk/tests/seek.regression.ref Thu Jul 31 21:40:06 2008 @@ -42,22 +42,19 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 p ---------------- tests/data/a-adpcm_ima.wav ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:60 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 0 dts:-0.960000 pts:-0.960000 pos:65536 size:4096 flags:1 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.856009 pts:1.856009 pos:29756 size:4096 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.831995 pts:0.831995 pos:13372 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret: 0 st: 0 dts:-0.320000 pts:-0.320000 pos:46140 size:4096 flags:1 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:2.623991 pts:2.623991 pos:42044 size:4096 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.408005 pts:1.408005 pos:22588 size:4096 flags:1 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.383991 pts:0.383991 pos:6204 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.768005 pts:-0.768005 pos:38972 size:4096 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:2.176009 pts:2.176009 pos:34876 size:4096 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 @@ -70,104 +67,89 @@ ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.791995 pts:1.791995 pos:28732 size:4096 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.576009 pts:0.576009 pos:9276 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.448005 pts:-0.448005 pos:42044 size:4096 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret: 0 st: 0 dts:2.368005 pts:2.368005 pos:37948 size:4096 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.343991 pts:1.343991 pos:21564 size:4096 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.191995 pts:0.191995 pos:3132 size:4096 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.896009 pts:-0.896009 pos:35900 size:4096 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret: 0 st: 0 dts:1.983991 pts:1.983991 pos:31804 size:4096 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.896009 pts:0.896009 pos:14396 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret: 0 st: 0 dts:-0.256009 pts:-0.256009 pos:47164 size:4096 flags:1 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret: 0 st: 0 dts:2.688005 pts:2.688005 pos:43068 size:4096 flags:1 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:1.536009 pts:1.536009 pos:24636 size:4096 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8252 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41020 size:4096 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-adpcm_qt.aiff ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:72 size:4080 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret:-5 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.894059 pts:1.894059 pos:88812 size:4080 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.789546 pts:0.789546 pos:37064 size:4080 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret: 0 st: 0 dts:-0.317846 pts:-0.317846 pos:69832 size:4080 flags:1 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:2.577642 pts:2.577642 pos:120840 size:4080 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.470249 pts:1.470249 pos:68956 size:4080 flags:1 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.365737 pts:0.365737 pos:17208 size:4080 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.741655 pts:-0.741655 pos:49976 size:4080 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:2.153855 pts:2.153855 pos:100984 size:4080 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:1.046440 pts:1.046440 pos:49100 size:4080 flags:1 -ret: 0 st: 0 ts:-0.058322 flags:0 -ret: 0 st: 0 dts:-0.058050 pts:-0.058050 pos:81868 size:4080 flags:1 +ret:-1 st: 0 ts:-0.058322 flags:0 ret: 0 st: 0 ts:2.835828 flags:1 ret: 0 st: 0 dts:2.834535 pts:2.834535 pos:132876 size:4080 flags:1 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.730045 pts:1.730045 pos:81128 size:4080 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624082 pts:0.624082 pos:29312 size:4080 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.480408 pts:-0.480408 pos:62080 size:4080 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret: 0 st: 0 dts:2.412200 pts:2.412200 pos:113088 size:4080 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.307687 pts:1.307687 pos:61340 size:4080 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200295 pts:0.200295 pos:9456 size:4080 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.904218 pts:-0.904218 pos:42224 size:4080 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret: 0 st: 0 dts:1.988390 pts:1.988390 pos:93232 size:4080 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883900 pts:0.883900 pos:41484 size:4080 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret: 0 st: 0 dts:-0.223515 pts:-0.223515 pos:74252 size:4080 flags:1 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret: 0 st: 0 dts:2.671995 pts:2.671995 pos:125260 size:4080 flags:1 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:1.564580 pts:1.564580 pos:73376 size:4080 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460091 pts:0.460091 pos:21628 size:4080 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.645873 pts:-0.645873 pos:54396 size:4080 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-adpcm_ms.wav ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 0 dts:-0.960000 pts:-0.960000 pos:65536 size:4096 flags:1 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.856009 pts:1.856009 pos:29752 size:4096 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.831995 pts:0.831995 pos:13368 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret: 0 st: 0 dts:-0.320000 pts:-0.320000 pos:46136 size:4096 flags:1 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:2.623991 pts:2.623991 pos:42040 size:4096 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.408005 pts:1.408005 pos:22584 size:4096 flags:1 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.383991 pts:0.383991 pos:6200 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.768005 pts:-0.768005 pos:38968 size:4096 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:2.176009 pts:2.176009 pos:34872 size:4096 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 @@ -180,30 +162,26 @@ ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.791995 pts:1.791995 pos:28728 size:4096 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.576009 pts:0.576009 pos:9272 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.448005 pts:-0.448005 pos:42040 size:4096 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret: 0 st: 0 dts:2.368005 pts:2.368005 pos:37944 size:4096 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.343991 pts:1.343991 pos:21560 size:4096 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.191995 pts:0.191995 pos:3128 size:4096 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.896009 pts:-0.896009 pos:35896 size:4096 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret: 0 st: 0 dts:1.983991 pts:1.983991 pos:31800 size:4096 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.896009 pts:0.896009 pos:14392 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret: 0 st: 0 dts:-0.256009 pts:-0.256009 pos:47160 size:4096 flags:1 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret: 0 st: 0 dts:2.688005 pts:2.688005 pos:43064 size:4096 flags:1 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:1.536009 pts:1.536009 pos:24632 size:4096 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8248 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41016 size:4096 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-adpcm_swf.flv ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:184 size:2053 flags:1 @@ -258,22 +236,19 @@ ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-adpcm_yam.wav ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 0 dts:-0.960000 pts:-0.960000 pos:65536 size:4096 flags:1 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.856009 pts:1.856009 pos:29752 size:4096 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.831995 pts:0.831995 pos:13368 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret: 0 st: 0 dts:-0.320000 pts:-0.320000 pos:46136 size:4096 flags:1 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:2.623991 pts:2.623991 pos:42040 size:4096 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.408005 pts:1.408005 pos:22584 size:4096 flags:1 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.383991 pts:0.383991 pos:6200 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.768005 pts:-0.768005 pos:38968 size:4096 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:2.176009 pts:2.176009 pos:34872 size:4096 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 @@ -286,30 +261,26 @@ ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.791995 pts:1.791995 pos:28728 size:4096 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.576009 pts:0.576009 pos:9272 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.448005 pts:-0.448005 pos:42040 size:4096 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret: 0 st: 0 dts:2.368005 pts:2.368005 pos:37944 size:4096 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.343991 pts:1.343991 pos:21560 size:4096 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.191995 pts:0.191995 pos:3128 size:4096 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.896009 pts:-0.896009 pos:35896 size:4096 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret: 0 st: 0 dts:1.983991 pts:1.983991 pos:31800 size:4096 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.896009 pts:0.896009 pos:14392 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret: 0 st: 0 dts:-0.256009 pts:-0.256009 pos:47160 size:4096 flags:1 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret: 0 st: 0 dts:2.688005 pts:2.688005 pos:43064 size:4096 flags:1 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:1.536009 pts:1.536009 pos:24632 size:4096 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.511995 pts:0.511995 pos:8248 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.703991 pts:-0.703991 pos:41016 size:4096 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-asv1.avi ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5668 size:14316 flags:1 @@ -740,58 +711,50 @@ ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-g726.wav ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:56 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret:-5 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.894000 pts:1.894000 pos:7632 size:4096 flags:1 ret: 0 st: 0 ts:0.788375 flags:0 ret: 0 st: 0 dts:0.788500 pts:0.788500 pos:3210 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317500 flags:1 -ret:-5 +ret:-1 st: 0 ts:-0.317500 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:2.576750 pts:2.576750 pos:10363 size:4096 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.470750 pts:1.470750 pos:5939 size:4096 flags:1 ret: 0 st: 0 ts:0.365000 flags:0 ret: 0 st: 0 dts:0.365000 pts:0.365000 pos:1516 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740875 flags:1 -ret:-5 +ret:-1 st: 0 ts:-0.740875 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:2.153500 pts:2.153500 pos:8670 size:4096 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:1.047500 pts:1.047500 pos:4246 size:4096 flags:1 -ret: 0 st: 0 ts:-0.058375 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.058375 flags:0 ret: 0 st: 0 ts:2.835875 flags:1 ret: 0 st: 0 dts:2.835750 pts:2.835750 pos:11399 size:4096 flags:1 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.730000 pts:1.730000 pos:6976 size:4096 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624000 pts:0.624000 pos:2552 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481625 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.481625 flags:0 ret: 0 st: 0 ts:2.412500 flags:1 ret: 0 st: 0 dts:2.412500 pts:2.412500 pos:9706 size:4096 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.306750 pts:1.306750 pos:5283 size:4096 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200750 pts:0.200750 pos:859 size:4096 flags:1 -ret: 0 st: 0 ts:-0.905000 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.905000 flags:0 ret: 0 st: 0 ts:1.989125 flags:1 ret: 0 st: 0 dts:1.989000 pts:1.989000 pos:8012 size:4096 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883500 pts:0.883500 pos:3590 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret:-5 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671625 flags:0 ret: 0 st: 0 dts:2.671750 pts:2.671750 pos:10743 size:4096 flags:1 ret: 0 st: 0 ts:1.565875 flags:1 ret: 0 st: 0 dts:1.565750 pts:1.565750 pos:6319 size:4096 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:1896 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret:-5 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/a-h261.avi ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:15314 size:9645 flags:1 @@ -2510,113 +2473,97 @@ ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.aif ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:54 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret:-5 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:167120 size:0 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:69586 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:89142 size:0 flags:1 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:227316 size:0 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:129782 size:0 flags:1 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.365011 pts:0.365011 pos:32248 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.740839 pts:-0.740839 pos:65016 size:4096 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:189978 size:0 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:92444 size:0 flags:1 -ret: 0 st: 0 ts:-0.058322 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.058322 flags:0 ret: 0 st: 0 ts:2.835828 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:250174 size:0 flags:1 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:152640 size:0 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:55106 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.481655 pts:-0.481655 pos:87874 size:1268 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:212836 size:0 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:115302 size:0 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200839 pts:0.200839 pos:17768 size:4096 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.904989 pts:-0.904989 pos:50536 size:4096 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:175500 size:0 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883333 pts:0.883333 pos:77964 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:89142 size:0 flags:1 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:235696 size:0 flags:1 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:138162 size:0 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40626 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73394 size:4096 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.al ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 0 dts:1.486077 pts:1.486077 pos:32768 size:1024 flags:1 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.894150 pts:1.894150 pos:41766 size:1024 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:17383 size:1024 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret:-5 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret:-5 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.470839 pts:1.470839 pos:32432 size:1024 flags:1 ret: 0 st: 0 ts:0.364989 flags:0 ret: 0 st: 0 dts:0.364989 pts:0.364989 pos:8048 size:1024 flags:1 -ret: 0 st: 0 ts:-0.740816 flags:1 -ret: 0 st: 0 dts:1.851066 pts:1.851066 pos:40816 size:1024 flags:1 +ret:-1 st: 0 ts:-0.740816 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret:-5 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:1.047483 pts:1.047483 pos:23097 size:1024 flags:1 -ret: 0 st: 0 ts:-0.058322 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.058322 flags:0 ret: 0 st: 0 ts:2.835828 flags:1 ret:-5 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.730023 pts:1.730023 pos:38147 size:1024 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:13763 size:1024 flags:1 -ret: 0 st: 0 ts:-0.481678 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.481678 flags:0 ret: 0 st: 0 ts:2.412517 flags:1 ret:-5 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.306667 pts:1.306667 pos:28812 size:1024 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:1.686893 pts:1.686893 pos:37196 size:1024 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989161 flags:1 ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret:-5 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671655 flags:0 ret:-5 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:1.565850 pts:1.565850 pos:34527 size:1024 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:10143 size:1024 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:1.946077 pts:1.946077 pos:42911 size:1024 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.asf ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:575 size:28874 flags:1 @@ -2675,58 +2622,50 @@ ret: 0 st: 0 dts:3.100000 pts:3.100000 p ---------------- tests/data/b-libav.au ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:24 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret:-5 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:167090 size:0 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:69556 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:89112 size:0 flags:1 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:227286 size:0 flags:1 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:129752 size:0 flags:1 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.365011 pts:0.365011 pos:32218 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.740839 pts:-0.740839 pos:64986 size:4096 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:189948 size:0 flags:1 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:92414 size:0 flags:1 -ret: 0 st: 0 ts:-0.058322 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.058322 flags:0 ret: 0 st: 0 ts:2.835828 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:250144 size:0 flags:1 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:152610 size:0 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:55076 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.481655 pts:-0.481655 pos:87844 size:1268 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:212806 size:0 flags:1 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:115272 size:0 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200839 pts:0.200839 pos:17738 size:4096 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.904989 pts:-0.904989 pos:50506 size:4096 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:175470 size:0 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883333 pts:0.883333 pos:77934 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:89112 size:0 flags:1 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:235666 size:0 flags:1 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:-209146758205323.718750 pts:-209146758205323.718750 pos:138132 size:0 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40596 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73364 size:4096 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.avi ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:9908 size:28118 flags:1 @@ -3537,58 +3476,50 @@ ret: 0 st: 0 dts:0.000000 pts:-102481911 ---------------- tests/data/b-libav.ul ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret: 0 st: 0 dts:1.486077 pts:1.486077 pos:32768 size:1024 flags:1 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret: 0 st: 0 dts:1.894150 pts:1.894150 pos:41766 size:1024 flags:1 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:17383 size:1024 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret:-5 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret:-5 ret: 0 st:-1 ts:1.470835 flags:1 ret: 0 st: 0 dts:1.470839 pts:1.470839 pos:32432 size:1024 flags:1 ret: 0 st: 0 ts:0.364989 flags:0 ret: 0 st: 0 dts:0.364989 pts:0.364989 pos:8048 size:1024 flags:1 -ret: 0 st: 0 ts:-0.740816 flags:1 -ret: 0 st: 0 dts:1.851066 pts:1.851066 pos:40816 size:1024 flags:1 +ret:-1 st: 0 ts:-0.740816 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret:-5 ret: 0 st:-1 ts:1.047503 flags:1 ret: 0 st: 0 dts:1.047483 pts:1.047483 pos:23097 size:1024 flags:1 -ret: 0 st: 0 ts:-0.058322 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.058322 flags:0 ret: 0 st: 0 ts:2.835828 flags:1 ret:-5 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.730023 pts:1.730023 pos:38147 size:1024 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:13763 size:1024 flags:1 -ret: 0 st: 0 ts:-0.481678 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.481678 flags:0 ret: 0 st: 0 ts:2.412517 flags:1 ret:-5 ret: 0 st:-1 ts:1.306672 flags:0 ret: 0 st: 0 dts:1.306667 pts:1.306667 pos:28812 size:1024 flags:1 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:1.686893 pts:1.686893 pos:37196 size:1024 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989161 flags:1 ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret:-5 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671655 flags:0 ret:-5 ret: 0 st: 0 ts:1.565850 flags:1 ret: 0 st: 0 dts:1.565850 pts:1.565850 pos:34527 size:1024 flags:1 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:10143 size:1024 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:1.946077 pts:1.946077 pos:42911 size:1024 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.voc ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:32 size:512 flags:1 @@ -3621,58 +3552,50 @@ ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.wav ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:44 size:4096 flags:1 -ret: 0 st:-1 ts:-1.000000 flags:0 -ret:-5 +ret:-1 st:-1 ts:-1.000000 flags:0 ret: 0 st:-1 ts:1.894167 flags:1 ret:-5 ret: 0 st: 0 ts:0.788345 flags:0 ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:69576 size:4096 flags:1 -ret: 0 st: 0 ts:-0.317506 flags:1 -ret:-5 +ret:-1 st: 0 ts:-0.317506 flags:1 ret: 0 st:-1 ts:2.576668 flags:0 ret:-5 ret: 0 st:-1 ts:1.470835 flags:1 ret:-5 ret: 0 st: 0 ts:0.365011 flags:0 ret: 0 st: 0 dts:0.365011 pts:0.365011 pos:32238 size:4096 flags:1 -ret: 0 st: 0 ts:-0.740839 flags:1 -ret: 0 st: 0 dts:-0.740839 pts:-0.740839 pos:65006 size:4096 flags:1 +ret:-1 st: 0 ts:-0.740839 flags:1 ret: 0 st:-1 ts:2.153336 flags:0 ret:-5 ret: 0 st:-1 ts:1.047503 flags:1 ret:-5 -ret: 0 st: 0 ts:-0.058322 flags:0 -ret:-5 +ret:-1 st: 0 ts:-0.058322 flags:0 ret: 0 st: 0 ts:2.835828 flags:1 ret:-5 ret: 0 st:-1 ts:1.730004 flags:0 ret:-5 ret: 0 st:-1 ts:0.624171 flags:1 ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:55096 size:4096 flags:1 -ret: 0 st: 0 ts:-0.481655 flags:0 -ret: 0 st: 0 dts:-0.481655 pts:-0.481655 pos:87864 size:1268 flags:1 +ret:-1 st: 0 ts:-0.481655 flags:0 ret: 0 st: 0 ts:2.412494 flags:1 ret:-5 ret: 0 st:-1 ts:1.306672 flags:0 ret:-5 ret: 0 st:-1 ts:0.200839 flags:1 ret: 0 st: 0 dts:0.200839 pts:0.200839 pos:17758 size:4096 flags:1 -ret: 0 st: 0 ts:-0.904989 flags:0 -ret: 0 st: 0 dts:-0.904989 pts:-0.904989 pos:50526 size:4096 flags:1 +ret:-1 st: 0 ts:-0.904989 flags:0 ret: 0 st: 0 ts:1.989184 flags:1 ret:-5 ret: 0 st:-1 ts:0.883340 flags:0 ret: 0 st: 0 dts:0.883333 pts:0.883333 pos:77954 size:4096 flags:1 -ret: 0 st:-1 ts:-0.222493 flags:1 -ret:-5 +ret:-1 st:-1 ts:-0.222493 flags:1 ret: 0 st: 0 ts:2.671678 flags:0 ret:-5 ret: 0 st: 0 ts:1.565850 flags:1 ret:-5 ret: 0 st:-1 ts:0.460008 flags:0 ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:40616 size:4096 flags:1 -ret: 0 st:-1 ts:-0.645825 flags:1 -ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73384 size:4096 flags:1 +ret:-1 st:-1 ts:-0.645825 flags:1 ---------------- tests/data/b-libav.y4m ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:66 size:152064 flags:1

1 0

r14490 - trunk/libavformat/raw.c
by subversion＠mplayerhq.hu 31 Jul '08

31 Jul '08

Author: bcoudurier Date: Thu Jul 31 20:12:37 2008 New Revision: 14490 Log: check url_fseek return value Modified: trunk/libavformat/raw.c Modified: trunk/libavformat/raw.c ============================================================================== --- trunk/libavformat/raw.c (original) +++ trunk/libavformat/raw.c Thu Jul 31 20:12:37 2008 @@ -221,7 +221,7 @@ int pcm_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { AVStream *st; - int block_align, byte_rate; + int block_align, byte_rate, ret; int64_t pos; st = s->streams[0]; @@ -243,7 +243,8 @@ int pcm_read_seek(AVFormatContext *s, /* recompute exact position */ st->cur_dts = av_rescale(pos, st->time_base.den, byte_rate * (int64_t)st->time_base.num); - url_fseek(s->pb, pos + s->data_offset, SEEK_SET); + if ((ret = url_fseek(s->pb, pos + s->data_offset, SEEK_SET)) < 0) + return ret; return 0; }

1 0