From 488a5b3fddce6714cfa7ccd4a5c91cd2dd355033 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 18 Dec 2011 16:17:07 +0200 Subject: tmv decoder: set correct pix_fmt Previously the decoder only worked if the user had set avctx->pix_fmt manually. For some reason the libavformat tmv demuxer sets this, so the problem was not visible in avplay etc. Signed-off-by: Ronald S. Bultje --- libavcodec/tmv.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavcodec') diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index 870f571..be809b3 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -82,6 +82,12 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, return avpkt->size; } +static av_cold int tmv_decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt = PIX_FMT_PAL8; + return 0; +} + static av_cold int tmv_decode_close(AVCodecContext *avctx) { TMVContext *tmv = avctx->priv_data; @@ -97,6 +103,7 @@ AVCodec ff_tmv_decoder = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_TMV, .priv_data_size = sizeof(TMVContext), + .init = tmv_decode_init, .close = tmv_decode_close, .decode = tmv_decode_frame, .capabilities = CODEC_CAP_DR1, -- cgit v1.1 From bc78ceec2be6613c265387017221c7ceda15aa7d Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 18 Dec 2011 13:21:27 -0500 Subject: 4xm: remove unneeded check for remaining unused data. This is unnecessary complication that only prints a message and does not affect decoding. --- libavcodec/4xm.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 21bde52..0ae10d5 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -415,15 +415,6 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){ dst += 8*stride; } - if( bitstream_size != (get_bits_count(&f->gb)+31)/32*4 - || (((const char*)f->wordstream - (const char*)buf + 2)&~2) != extra + bitstream_size + wordstream_size - || (((const char*)f->bytestream - (const char*)buf + 3)&~3) != extra + bitstream_size + wordstream_size + bytestream_size) - av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n", - bitstream_size - (get_bits_count(&f->gb)+31)/32*4, - -(((const char*)f->bytestream - (const char*)buf + 3)&~3) + (extra + bitstream_size + wordstream_size + bytestream_size), - -(((const char*)f->wordstream - (const char*)buf + 2)&~2) + (extra + bitstream_size + wordstream_size) - ); - return 0; } -- cgit v1.1 From 8400b126acb153329c418433c377d96afd1d1e02 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 18 Dec 2011 20:41:42 +0000 Subject: avcodec: deprecate AVFrame.age This was intended as an optimisation for skipped blocks in MPEG2 P-frames and never used elsewhere. Removing this "optimisation" speeds up MPEG2 decoding by 1-2% (ARM Cortex-A9). Signed-off-by: Mans Rullgard --- libavcodec/avcodec.h | 9 ++++----- libavcodec/internal.h | 1 - libavcodec/mpegvideo.c | 36 +++++------------------------------- libavcodec/mpegvideo.h | 2 -- libavcodec/pthread.c | 7 ------- libavcodec/utils.c | 10 +--------- libavcodec/version.h | 5 ++++- 7 files changed, 14 insertions(+), 56 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1715bbb..7f4651b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1004,13 +1004,12 @@ typedef struct AVFrame { */ int quality; +#if FF_API_AVFRAME_AGE /** - * buffer age (1->was last buffer and dint change, 2->..., ...). - * Set to INT_MAX if the buffer has not been used yet. - * - encoding: unused - * - decoding: MUST be set by get_buffer() for video. + * @deprecated unused */ - int age; + attribute_deprecated int age; +#endif /** * is this picture used as reference diff --git a/libavcodec/internal.h b/libavcodec/internal.h index fb011c7..b5a0454 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -30,7 +30,6 @@ #include "avcodec.h" typedef struct InternalBuffer { - int last_pic_num; uint8_t *base[AV_NUM_DATA_POINTERS]; uint8_t *data[AV_NUM_DATA_POINTERS]; int linesize[AV_NUM_DATA_POINTERS]; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ab57b51..d190606 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -263,9 +263,9 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) else r = avcodec_default_get_buffer(s->avctx, (AVFrame *) pic); - if (r < 0 || !pic->f.age || !pic->f.type || !pic->f.data[0]) { - av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", - r, pic->f.age, pic->f.type, pic->f.data[0]); + if (r < 0 || !pic->f.type || !pic->f.data[0]) { + av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %p)\n", + r, pic->f.type, pic->f.data[0]); av_freep(&pic->f.hwaccel_picture_private); return -1; } @@ -369,15 +369,6 @@ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared) 1 * sizeof(AVPanScan), fail) } - /* It might be nicer if the application would keep track of these - * but it would require an API change. */ - memmove(s->prev_pict_types + 1, s->prev_pict_types, - PREV_PICT_TYPES_BUFFER_SIZE-1); - s->prev_pict_types[0] = s->dropable ? AV_PICTURE_TYPE_B : s->pict_type; - if (pic->f.age < PREV_PICT_TYPES_BUFFER_SIZE && - s->prev_pict_types[pic->f.age] == AV_PICTURE_TYPE_B) - pic->f.age = INT_MAX; // Skipped MBs in B-frames are quite rare in MPEG-1/2 - // and it is a bit tricky to skip them anyway. pic->owner2 = s; return 0; @@ -574,9 +565,6 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, s->current_picture_ptr = REBASE_PICTURE(s1->current_picture_ptr, s, s1); s->next_picture_ptr = REBASE_PICTURE(s1->next_picture_ptr, s, s1); - memcpy(s->prev_pict_types, s1->prev_pict_types, - PREV_PICT_TYPES_BUFFER_SIZE); - // Error/bug resilience s->next_p_frame_damaged = s1->next_p_frame_damaged; s->workaround_bugs = s1->workaround_bugs; @@ -880,8 +868,6 @@ av_cold int MPV_common_init(MpegEncContext *s) /* init macroblock skip table */ FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail); // Note the + 1 is for a quicker mpeg4 slice_end detection - FF_ALLOCZ_OR_GOTO(s->avctx, s->prev_pict_types, - PREV_PICT_TYPES_BUFFER_SIZE, fail); s->parse_context.state = -1; if ((s->avctx->debug & (FF_DEBUG_VIS_QP | FF_DEBUG_VIS_MB_TYPE)) || @@ -981,7 +967,6 @@ void MPV_common_end(MpegEncContext *s) av_freep(&s->pred_dir_table); av_freep(&s->mbskip_table); - av_freep(&s->prev_pict_types); av_freep(&s->bitstream_buffer); s->allocated_bitstream_buffer_size = 0; @@ -2215,24 +2200,13 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], /* skip only during decoding as we might trash the buffers during encoding a bit */ if(!s->encoding){ uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; - const int age = s->current_picture.f.age; - - assert(age); if (s->mb_skipped) { s->mb_skipped= 0; assert(s->pict_type!=AV_PICTURE_TYPE_I); - - (*mbskip_ptr) ++; /* indicate that this time we skipped it */ - if(*mbskip_ptr >99) *mbskip_ptr= 99; - - /* if previous was skipped too, then nothing to do ! */ - if (*mbskip_ptr >= age && s->current_picture.f.reference){ - return; - } + *mbskip_ptr = 1; } else if(!s->current_picture.f.reference) { - (*mbskip_ptr) ++; /* increase counter so the age can be compared cleanly */ - if(*mbskip_ptr >99) *mbskip_ptr= 99; + *mbskip_ptr = 1; } else{ *mbskip_ptr = 0; /* not skipped */ } diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 38bbd12..6483893 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -309,8 +309,6 @@ typedef struct MpegEncContext { uint8_t *coded_block; ///< used for coded block pattern prediction (msmpeg4v3, wmv1) int16_t (*ac_val_base)[16]; int16_t (*ac_val[3])[16]; ///< used for for mpeg4 AC prediction, all 3 arrays must be continuous - uint8_t *prev_pict_types; ///< previous picture types in bitstream order, used for mb skip -#define PREV_PICT_TYPES_BUFFER_SIZE 256 int mb_skipped; ///< MUST BE SET only during DECODING uint8_t *mbskip_table; /**< used to avoid copy if macroblock skipped (for black regions for example) and used for b-frame encoding & decoding (contains skip table of next P Frame) */ diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 5f427c0..7e03c64 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -855,13 +855,6 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f) pthread_mutex_unlock(&p->parent->buffer_mutex); - /* - * Buffer age is difficult to keep track of between - * multiple threads, and the optimizations it allows - * are not worth the effort. It is disabled for now. - */ - f->age = INT_MAX; - return err; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 68fc525..9d17ee4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -346,7 +346,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) int w= s->width; int h= s->height; InternalBuffer *buf; - int *picture_number; AVCodecInternal *avci = s->internal; if(pic->data[0]!=NULL) { @@ -367,8 +366,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) } buf = &avci->buffer[avci->buffer_count]; - picture_number = &(avci->buffer[INTERNAL_BUFFER_SIZE]).last_pic_num; //FIXME ugly hack - (*picture_number)++; if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){ if(s->active_thread_type&FF_THREAD_FRAME) { @@ -382,10 +379,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) } } - if(buf->base[0]){ - pic->age= *picture_number - buf->last_pic_num; - buf->last_pic_num= *picture_number; - }else{ + if (!buf->base[0]) { int h_chroma_shift, v_chroma_shift; int size[4] = {0}; int tmpsize; @@ -424,7 +418,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) size[i] = picture.data[i+1] - picture.data[i]; size[i] = tmpsize - (picture.data[i] - picture.data[0]); - buf->last_pic_num= -256*256*256*64; memset(buf->base, 0, sizeof(buf->base)); memset(buf->data, 0, sizeof(buf->data)); @@ -453,7 +446,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) buf->width = s->width; buf->height = s->height; buf->pix_fmt= s->pix_fmt; - pic->age= 256*256*256*64; } pic->type= FF_BUFFER_TYPE_INTERNAL; diff --git a/libavcodec/version.h b/libavcodec/version.h index d15fb48..e958251 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -22,7 +22,7 @@ #define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MINOR 28 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -116,5 +116,8 @@ #ifndef FF_API_OLD_DECODE_AUDIO #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 54) #endif +#ifndef FF_API_AVFRAME_AGE +#define FF_API_AVFRAME_AGE (LIBAVCODEC_VERSION_MAJOR < 54) +#endif #endif /* AVCODEC_VERSION_H */ -- cgit v1.1