September 2010 - ffmpeg-cvslog

r18533 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 10 Jan '11

10 Jan '11

Author: michael Date: Thu Apr 16 06:46:44 2009 New Revision: 18533 Log: Support broken avc nal encapsulation. Fixes issue987. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Apr 16 04:28:49 2009 (r18532) +++ trunk/libavcodec/h264.c Thu Apr 16 06:46:44 2009 (r18533) @@ -7461,6 +7461,7 @@ static int decode_nal_units(H264Context int buf_index=0; H264Context *hx; ///< thread context int context_count = 0; + int next_avc= h->is_avc ? 0 : buf_size; h->max_contexts = avctx->thread_count; #if 0 @@ -7484,7 +7485,7 @@ static int decode_nal_units(H264Context int i, nalsize = 0; int err; - if(h->is_avc) { + if(buf_index >= next_avc) { if(buf_index >= buf_size) break; nalsize = 0; for(i = 0; i < h->nal_length_size; i++) @@ -7498,6 +7499,7 @@ static int decode_nal_units(H264Context break; } } + next_avc= buf_index + nalsize; } else { // start code prefix search for(; buf_index + 3 < buf_size; buf_index++){ @@ -7513,7 +7515,7 @@ static int decode_nal_units(H264Context hx = h->thread_context[context_count]; - ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); + ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index); if (ptr==NULL || dst_length < 0){ return -1; } @@ -7525,13 +7527,12 @@ static int decode_nal_units(H264Context av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); } - if (h->is_avc && (nalsize != consumed)){ + if (h->is_avc && (nalsize != consumed) && nalsize){ int i, debug_level = AV_LOG_DEBUG; for (i = consumed; i < nalsize; i++) if (buf[buf_index+i]) debug_level = AV_LOG_ERROR; av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); - consumed= nalsize; } buf_index += consumed;

3 7

r24645 - in trunk: Makefile tests/lavfi-regression.sh
by subversion＠mplayerhq.hu 29 Dec '10

29 Dec '10

Author: stefano Date: Sun Aug 1 12:27:04 2010 New Revision: 24645 Log: Fix fate-lavfi-pixfmts test cross-compilation. Add the lavfi-showfiltfmts dependency in the Makefile, and correctly use the $target_exec and $target_path variables for invoking the lavfi-showfiltfmts tool. Modified: trunk/Makefile trunk/tests/lavfi-regression.sh Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/Makefile Sun Aug 1 12:27:04 2010 (r24645) @@ -226,6 +226,9 @@ tests/data/asynth1.sw tests/vsynth%/00.p tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + include $(SRC_PATH_BARE)/tests/fate.mak include $(SRC_PATH_BARE)/tests/fate2.mak @@ -248,7 +251,7 @@ FATE = $(FATE_ACODEC) $(FATE_ACODEC): $(AREF) $(FATE_VCODEC): $(VREF) $(FATE_LAVF): $(REFS) -$(FATE_LAVFI): $(REFS) +$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) $(FATE_ACODEC): CMD = codectest acodec Modified: trunk/tests/lavfi-regression.sh ============================================================================== --- trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:04 2010 (r24645) @@ -66,15 +66,16 @@ vflip " if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then + showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts" # exclude pixel formats which are not supported as input excluded_pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)" - scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) + scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts") for filter_args in $filters_args; do filter=$(echo $filter_args | sed -e 's/$[^=]\+$=.*/\1/') - in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) + in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts") for pix_fmt in $pix_fmts; do

3 2

r15641 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 23 Dec '10

23 Dec '10

Author: michael Date: Sun Oct 19 03:02:48 2008 New Revision: 15641 Log: Check for pts==dts on I/P frames in the presence of non low delay decoding and discard these invalid timestamps. fixes issue171. Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Sun Oct 19 03:02:48 2008 @@ -838,6 +838,14 @@ static void compute_pkt_fields(AVFormatC pkt->dts -= 1LL<<st->pts_wrap_bits; } + // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg) + // we take the conservative approach and discard both + // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. + if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ + av_log(s, AV_LOG_ERROR, "invalid dts/pts combination\n"); + pkt->dts= pkt->pts= AV_NOPTS_VALUE; + } + if (pkt->duration == 0) { compute_frame_duration(&num, &den, st, pc, pkt); if (den && num) {

2 1

r20814 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 15 Dec '10

15 Dec '10

Author: michael Date: Sat Dec 12 20:44:01 2009 New Revision: 20814 Log: Be less picky on invalid invalid frame_pred_frame_dct values. Fixed issue1615. Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Sat Dec 12 20:15:56 2009 (r20813) +++ trunk/libavcodec/mpeg12.c Sat Dec 12 20:44:01 2009 (r20814) @@ -1557,7 +1557,7 @@ static void mpeg_decode_picture_coding_e s->picture_structure= PICT_FRAME; } - if(s->progressive_frame && !s->frame_pred_frame_dct){ + if(s->progressive_sequence && !s->frame_pred_frame_dct){ av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); s->frame_pred_frame_dct= 1; }

3 3

r25017 - in trunk/tests: codec-regression.sh ref/vsynth1/qtrle ref/vsynth2/qtrle
by subversion＠mplayerhq.hu 14 Dec '10

14 Dec '10

Author: vitor Date: Wed Sep 1 14:38:36 2010 New Revision: 25017 Log: QTRLE regtest Added: trunk/tests/ref/vsynth1/qtrle trunk/tests/ref/vsynth2/qtrle Modified: trunk/tests/codec-regression.sh Modified: trunk/tests/codec-regression.sh ============================================================================== --- trunk/tests/codec-regression.sh Wed Sep 1 12:26:28 2010 (r25016) +++ trunk/tests/codec-regression.sh Wed Sep 1 14:38:36 2010 (r25017) @@ -248,6 +248,11 @@ do_video_encoding roqav.roq "" "-vframes do_video_decoding "" "-pix_fmt yuv420p" fi +if [ -n "$do_qtrle" ] ; then +do_video_encoding qtrle.mov "" "" +do_video_decoding "" "" +fi + if [ -n "$do_rgb" ] ; then do_video_encoding rgb.avi "" "-an -vcodec rawvideo -pix_fmt bgr24" do_video_decoding "" "-pix_fmt yuv420p" Added: trunk/tests/ref/vsynth1/qtrle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/vsynth1/qtrle Wed Sep 1 14:38:36 2010 (r25017) @@ -0,0 +1,4 @@ +3f070779d7deb54626515ac7f7002e63 *./tests/data/vsynth1/qtrle.mov +387772 ./tests/data/vsynth1/qtrle.mov +a3c2610e2c069c3ad22ec03da83f774f *./tests/data/qtrle.vsynth1.out.yuv +stddev: 15.14 PSNR: 24.53 MAXDIFF: 174 bytes: 7603200/ 7603200 Added: trunk/tests/ref/vsynth2/qtrle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/vsynth2/qtrle Wed Sep 1 14:38:36 2010 (r25017) @@ -0,0 +1,4 @@ +5346bba8e03e7de72b482efbcf712a2e *./tests/data/vsynth2/qtrle.mov +141533 ./tests/data/vsynth2/qtrle.mov +f967b290c7e6d015c0e78175db828249 *./tests/data/qtrle.vsynth2.out.yuv +stddev: 5.75 PSNR: 32.93 MAXDIFF: 92 bytes: 7603200/ 7603200

2 1

r25243 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 04 Oct '10

04 Oct '10

Author: darkshikari Date: Tue Sep 28 11:06:22 2010 New Revision: 25243 Log: Try to fix crashes introduced by r25218 r25218 made assumptions about the existence of past reference frames that weren't necessarily true. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Tue Sep 28 05:45:27 2010 (r25242) +++ trunk/libavcodec/h264.c Tue Sep 28 11:06:22 2010 (r25243) @@ -1898,6 +1898,7 @@ 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)){ + Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); if (ff_h264_frame_start(h) < 0) return -1; @@ -1912,11 +1913,15 @@ static int decode_slice_header(H264Conte * FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're * concealing a lost frame, this probably isn't noticable by comparison, but it should * be fixed. */ - av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, - (const uint8_t**)h->short_ref[1]->data, h->short_ref[1]->linesize, - PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16); - h->short_ref[0]->frame_num = h->prev_frame_num; - h->short_ref[0]->poc = h->short_ref[1]->poc+2; + if (h->short_ref_count) { + if (prev) { + av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, + (const uint8_t**)prev->data, prev->linesize, + PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16); + h->short_ref[0]->poc = prev->poc+2; + } + h->short_ref[0]->frame_num = h->prev_frame_num; + } } /* See if we have a decoded first field looking for a pair... */

2 1

r25279 - trunk/libavutil/assert.h
by subversion＠mplayerhq.hu 02 Oct '10

02 Oct '10

Author: michael Date: Fri Oct 1 00:52:29 2010 New Revision: 25279 Log: typo Modified: trunk/libavutil/assert.h Modified: trunk/libavutil/assert.h ============================================================================== --- trunk/libavutil/assert.h Thu Sep 30 23:57:31 2010 (r25278) +++ trunk/libavutil/assert.h Fri Oct 1 00:52:29 2010 (r25279) @@ -41,7 +41,7 @@ * These asserts() thus can be enabled without fearing speedloss. */ #if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 -#define av_assert1(cond) av_assert_always(cond) +#define av_assert1(cond) av_assert0(cond) #else #define av_assert1(cond) ((void)0) #endif @@ -51,7 +51,7 @@ * assert() equivalent, that does lie in speed critical code. */ #if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 -#define av_assert2(cond) av_assert_always(cond) +#define av_assert2(cond) av_assert0(cond) #else #define av_assert2(cond) ((void)0) #endif

2 1

r25258 - trunk/libavcodec/libvorbis.c
by subversion＠mplayerhq.hu 02 Oct '10

02 Oct '10

Author: michael Date: Wed Sep 29 17:09:38 2010 New Revision: 25258 Log: Allow setting the impulse block bias for libvorbis through a private codec parameter. First example and test of private codec parameters. Modified: trunk/libavcodec/libvorbis.c Modified: trunk/libavcodec/libvorbis.c ============================================================================== --- trunk/libavcodec/libvorbis.c Wed Sep 29 17:05:47 2010 (r25257) +++ trunk/libavcodec/libvorbis.c Wed Sep 29 17:09:38 2010 (r25258) @@ -26,6 +26,7 @@ #include <vorbis/vorbisenc.h> +#include "libavutil/opt.h" #include "avcodec.h" #include "bytestream.h" #include "vorbis.h" @@ -38,6 +39,7 @@ #define BUFFER_SIZE (1024*64) typedef struct OggVorbisContext { + AVClass *av_class; vorbis_info vi ; vorbis_dsp_state vd ; vorbis_block vb ; @@ -48,10 +50,18 @@ typedef struct OggVorbisContext { /* decoder */ vorbis_comment vc ; ogg_packet op; + + double iblock; } OggVorbisContext ; +static const AVOption options[]={ +{"iblock", "Sets the impulse block bias", offsetof(OggVorbisContext, iblock), FF_OPT_TYPE_DOUBLE, 0, -15, 0, AV_OPT_FLAG_ENCODING_PARAM}, +{NULL} +}; +static const AVClass class = { "libvorbis", NULL, options, LIBAVUTIL_VERSION_INT }; static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) { + OggVorbisContext *context = avccontext->priv_data ; double cfreq; if(avccontext->flags & CODEC_FLAG_QSCALE) { @@ -82,6 +92,10 @@ static av_cold int oggvorbis_init_encode return -1; } + if(context->iblock){ + vorbis_encode_ctl(vi, OV_ECTL_IBLOCK_SET, &context->iblock); + } + return vorbis_encode_setup_init(vi); } @@ -240,4 +254,5 @@ AVCodec libvorbis_encoder = { .capabilities= CODEC_CAP_DELAY, .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("libvorbis Vorbis"), + .priv_class= &class, } ;

4 3

r25241 - in trunk: cmdutils.c cmdutils.h ffplay.c
by subversion＠mplayerhq.hu 01 Oct '10

01 Oct '10

Author: astrange Date: Tue Sep 28 04:05:12 2010 New Revision: 25241 Log: Extract timestamp correction code from ffplay.c to cmdutils.c Modified: trunk/cmdutils.c trunk/cmdutils.h trunk/ffplay.c Modified: trunk/cmdutils.c ============================================================================== --- trunk/cmdutils.c Tue Sep 28 02:33:21 2010 (r25240) +++ trunk/cmdutils.c Tue Sep 28 04:05:12 2010 (r25241) @@ -677,3 +677,30 @@ int read_file(const char *filename, char fclose(f); return 0; } + +void init_pts_correction(PtsCorrectionContext *ctx) +{ + ctx->num_faulty_pts = ctx->num_faulty_dts = 0; + ctx->last_pts = ctx->last_dts = INT64_MIN; +} + +int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t reordered_pts, int64_t dts) +{ + int64_t pts = AV_NOPTS_VALUE; + + if (dts != AV_NOPTS_VALUE) { + ctx->num_faulty_dts += dts <= ctx->last_dts; + ctx->last_dts = dts; + } + if (reordered_pts != AV_NOPTS_VALUE) { + ctx->num_faulty_pts += reordered_pts <= ctx->last_pts; + ctx->last_pts = reordered_pts; + } + if ((ctx->num_faulty_pts<ctx->num_faulty_dts || dts == AV_NOPTS_VALUE) + && reordered_pts != AV_NOPTS_VALUE) + pts = reordered_pts; + else + pts = dts; + + return pts; +} Modified: trunk/cmdutils.h ============================================================================== --- trunk/cmdutils.h Tue Sep 28 02:33:21 2010 (r25240) +++ trunk/cmdutils.h Tue Sep 28 04:05:12 2010 (r25241) @@ -226,4 +226,28 @@ int read_yesno(void); */ int read_file(const char *filename, char **bufptr, size_t *size); +typedef struct { + int64_t num_faulty_pts; /// Number of incorrect PTS values so far + int64_t num_faulty_dts; /// Number of incorrect DTS values so far + int64_t last_pts; /// PTS of the last frame + int64_t last_dts; /// DTS of the last frame +} PtsCorrectionContext; + +/** + * Resets the state of the PtsCorrectionContext. + */ +void init_pts_correction(PtsCorrectionContext *ctx); + +/** + * Attempts to guess proper monotonic timestamps for decoded video frames + * which might have incorrect times. Input timestamps may wrap around, in + * which case the output will as well. + * + * @param pts The pts field of the decoded AVPacket, as passed through + * AVCodecContext.reordered_opaque + * @param dts The dts field of the decoded AVPacket + * @return One of the input values. May be AV_NOPTS_VALUE. + */ +int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts); + #endif /* FFMPEG_CMDUTILS_H */ Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Tue Sep 28 02:33:21 2010 (r25240) +++ trunk/ffplay.c Tue Sep 28 04:05:12 2010 (r25241) @@ -207,10 +207,7 @@ typedef struct VideoState { char filename[1024]; int width, height, xleft, ytop; - int64_t faulty_pts; - int64_t faulty_dts; - int64_t last_dts_for_fault_detection; - int64_t last_pts_for_fault_detection; + PtsCorrectionContext pts_ctx; #if CONFIG_AVFILTER AVFilterContext *out_video_filter; ///<the last filter in the video chain @@ -1286,7 +1283,7 @@ retry: if (is->audio_st && is->video_st) av_diff = get_audio_clock(is) - get_video_clock(is); printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64" \r", - get_master_clock(is), av_diff, FFMAX(is->skip_frames-1, 0), aqsize / 1024, vqsize / 1024, sqsize, is->faulty_dts, is->faulty_pts); + get_master_clock(is), av_diff, FFMAX(is->skip_frames-1, 0), aqsize / 1024, vqsize / 1024, sqsize, is->pts_ctx.num_faulty_dts, is->pts_ctx.num_faulty_pts); fflush(stdout); last_time = cur_time; } @@ -1565,8 +1562,7 @@ static int get_video_frame(VideoState *i is->video_current_pos= -1; SDL_UnlockMutex(is->pictq_mutex); - is->last_dts_for_fault_detection= - is->last_pts_for_fault_detection= INT64_MIN; + init_pts_correction(&is->pts_ctx); is->frame_last_pts= AV_NOPTS_VALUE; is->frame_last_delay = 0; is->frame_timer = (double)av_gettime() / 1000000.0; @@ -1583,26 +1579,19 @@ static int get_video_frame(VideoState *i pkt); if (got_picture) { - if(pkt->dts != AV_NOPTS_VALUE){ - is->faulty_dts += pkt->dts <= is->last_dts_for_fault_detection; - is->last_dts_for_fault_detection= pkt->dts; + if (decoder_reorder_pts == -1) { + *pts = guess_correct_pts(&is->pts_ctx, frame->reordered_opaque, pkt->dts); + } else if (decoder_reorder_pts) { + *pts = frame->reordered_opaque; + } else { + *pts = pkt->dts; } - if(frame->reordered_opaque != AV_NOPTS_VALUE){ - is->faulty_pts += frame->reordered_opaque <= is->last_pts_for_fault_detection; - is->last_pts_for_fault_detection= frame->reordered_opaque; + + if (*pts == AV_NOPTS_VALUE) { + *pts = 0; } } - if( ( decoder_reorder_pts==1 - || (decoder_reorder_pts && is->faulty_pts<is->faulty_dts) - || pkt->dts == AV_NOPTS_VALUE) - && frame->reordered_opaque != AV_NOPTS_VALUE) - *pts= frame->reordered_opaque; - else if(pkt->dts != AV_NOPTS_VALUE) - *pts= pkt->dts; - else - *pts= 0; - // if (len1 < 0) // break; if (got_picture){

3 3

r25278 - in trunk: ffmpeg.c libavutil/Makefile libavutil/assert.h libavutil/avutil.h libavutil/rational.c
by subversion＠mplayerhq.hu 01 Oct '10

01 Oct '10

Author: michael Date: Thu Sep 30 23:57:31 2010 New Revision: 25278 Log: av_assert() system. With this the developer can now choose if he wants an assert always enabled or at which compile time assert level. This can thus replace the #define NDEBUG hacks Added: trunk/libavutil/assert.h Modified: trunk/ffmpeg.c trunk/libavutil/Makefile trunk/libavutil/avutil.h trunk/libavutil/rational.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Thu Sep 30 22:40:10 2010 (r25277) +++ trunk/ffmpeg.c Thu Sep 30 23:57:31 2010 (r25278) @@ -79,8 +79,7 @@ #include "cmdutils.h" -#undef NDEBUG -#include <assert.h> +#include "libavutil/assert.h" const char program_name[] = "FFmpeg"; const int program_birth_year = 2000; @@ -905,7 +904,7 @@ need_realloc: } }else if(audio_sync_method>1){ int comp= av_clip(delta, -audio_sync_method, audio_sync_method); - assert(ost->audio_resample); + av_assert0(ost->audio_resample); if(verbose > 2) fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate); // fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2)); @@ -1223,10 +1222,10 @@ static void do_video_out(AVFormatContext rightBand = ((int64_t)ist->st->codec->width * ost->original_rightBand / ost->original_width) & ~1; /* sanity check to ensure no bad band sizes sneak in */ - assert(topBand <= INT_MAX && topBand >= 0); - assert(bottomBand <= INT_MAX && bottomBand >= 0); - assert(leftBand <= INT_MAX && leftBand >= 0); - assert(rightBand <= INT_MAX && rightBand >= 0); + av_assert0(topBand <= INT_MAX && topBand >= 0); + av_assert0(bottomBand <= INT_MAX && bottomBand >= 0); + av_assert0(leftBand <= INT_MAX && leftBand >= 0); + av_assert0(rightBand <= INT_MAX && rightBand >= 0); ost->topBand = topBand; ost->bottomBand = bottomBand; @@ -1696,7 +1695,7 @@ static int output_packet(AVInputStream * //ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE; if (ost->encoding_needed) { - assert(ist->decoding_needed); + av_assert0(ist->decoding_needed); switch(ost->st->codec->codec_type) { case AVMEDIA_TYPE_AUDIO: do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size); @@ -3628,7 +3627,7 @@ static void opt_new_stream(const char *o if (!strcmp(opt, "newvideo" )) new_video_stream (oc); else if (!strcmp(opt, "newaudio" )) new_audio_stream (oc); else if (!strcmp(opt, "newsubtitle")) new_subtitle_stream(oc); - else assert(0); + else av_assert0(0); } /* arg format is "output-stream-index:streamid-value". */ Modified: trunk/libavutil/Makefile ============================================================================== --- trunk/libavutil/Makefile Thu Sep 30 22:40:10 2010 (r25277) +++ trunk/libavutil/Makefile Thu Sep 30 23:57:31 2010 (r25278) @@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak NAME = avutil HEADERS = adler32.h \ + assert.h \ attributes.h \ avstring.h \ avutil.h \ Added: trunk/libavutil/assert.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavutil/assert.h Thu Sep 30 23:57:31 2010 (r25278) @@ -0,0 +1,59 @@ +/* + * copyright (c) 2010 Michael Niedermayer <michaelni at gmx.at> + * + * 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 + */ + +/** + * @file + * simple assert() macros that are a bit more flexible than ISO C assert(). + * @author Michael Niedermayer <michaelni at gmx.at> + */ + +#ifndef AVUTIL_ASSERT_H +#define AVUTIL_ASSERT_H + +#include "avutil.h" +#include "log.h" + +/** + * assert() equivalent, that is always enabled. + */ +#define av_assert0(cond) do {if(!(cond)) { av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n", AV_STRINGIFY(cond), __FILE__, __LINE__); abort(); }}while(0) + + +/** + * assert() equivalent, that does not lie in speed critical code. + * These asserts() thus can be enabled without fearing speedloss. + */ +#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0 +#define av_assert1(cond) av_assert_always(cond) +#else +#define av_assert1(cond) ((void)0) +#endif + + +/** + * assert() equivalent, that does lie in speed critical code. + */ +#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 +#define av_assert2(cond) av_assert_always(cond) +#else +#define av_assert2(cond) ((void)0) +#endif + +#endif Modified: trunk/libavutil/avutil.h ============================================================================== --- trunk/libavutil/avutil.h Thu Sep 30 22:40:10 2010 (r25277) +++ trunk/libavutil/avutil.h Thu Sep 30 23:57:31 2010 (r25278) @@ -40,7 +40,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 50 -#define LIBAVUTIL_VERSION_MINOR 31 +#define LIBAVUTIL_VERSION_MINOR 32 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ Modified: trunk/libavutil/rational.c ============================================================================== --- trunk/libavutil/rational.c Thu Sep 30 22:40:10 2010 (r25277) +++ trunk/libavutil/rational.c Thu Sep 30 23:57:31 2010 (r25278) @@ -25,7 +25,7 @@ * @author Michael Niedermayer <michaelni at gmx.at> */ -#include <assert.h> +#include "assert.h" //#include <math.h> #include <limits.h> @@ -67,7 +67,7 @@ int av_reduce(int *dst_num, int *dst_den num= den; den= next_den; } - assert(av_gcd(a1.num, a1.den) <= 1U); + av_assert2(av_gcd(a1.num, a1.den) <= 1U); *dst_num = sign ? -a1.num : a1.num; *dst_den = a1.den;

6 13