January 2012 - ffmpeg-devel - lists.ffmpeg.org

New timecode API attempt
by Clément Bœsch 02 Feb '12

02 Feb '12

Hi, The main changes since last time: - use of av_timecode_ prefix for all the functions - use of AV_TIMECODE_ for cpp related - regression tests; at the beginning of the patchset so we can check if the patchset doesn't break anything. The most sensible patches are the first one, and mpeg12enc, dv and mxf patches. Since this is somehow a bit too much changes, I can wait until we release 0.10. Any comment on the API is still appreciate. Baptiste, anything to add?

4 28

[PATCH 1/2] proresdec: Fix read via negative index in a global array.
by Michael Niedermayer 02 Feb '12

02 Feb '12

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/proresdec2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index fe4cfd0..9f801e4 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -302,7 +302,7 @@ static av_always_inline void decode_dc_coeffs(GetBitContext *gb, DCTELEM *out, code = 5; sign = 0; for (i = 1; i < blocks_per_slice; i++, out += 64) { - DECODE_CODEWORD(code, dc_codebook[FFMIN(code, 6)]); + DECODE_CODEWORD(code, dc_codebook[FFMIN(code, 6U)]); if(code) sign ^= -(code & 1); else sign = 0; prev_dc += (((code + 1) >> 1) ^ sign) - sign; -- 1.7.5.4

1 3

[PATCH]Add some v4l raw codecs
by Carl Eugen Hoyos 01 Feb '12

01 Feb '12

Hi! I tested attached on Intel hardware, and it makes me wonder if the existing RGB15 and RGB16 mappings are correct... The order of fmt_conversion_table[] also seems strange to me, less bpp is preferred over more bpp. Should this be changed? Finally, passing fourccs instead of pix_fmts would allow to support YV12. Is it a bug that libswscale does not remove transparency for RGB0 -> RGBA? Or should the user (application) realize that this is not a useful conversion? Please comment, Carl Eugen (My v4l hardware does not support Y41P.)

3 3

[PATCH] libopenjpeg decoder GRAY8A support
by Michael Bradshaw 01 Feb '12

01 Feb '12

Hi, attached patch addes GRAY8A decoding support for libopenjpeg. Michael

2 1

[PATCH] libopenjpeg decoder RGBA64 support
by Michael Bradshaw 01 Feb '12

01 Feb '12

Hi, attached patch adds RGBA64 decoding support for libopenjpeg. Michael

2 3

cancelling my subscription.
by Michelle Getlevog 31 Jan '12

31 Jan '12

To whom it concerns.I would like to cancel this subscription please.Thanking you Michelle Getlevog..

2 1

[PATCH] ffv1dec: use correct linesize
by Paul B Mahol 31 Jan '12

31 Jan '12

Apparently this did not break anything. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavcodec/ffv1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 7a88688..3f69910 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1435,7 +1435,7 @@ static int decode_slice(AVCodecContext *c, void *arg){ decode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0); decode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1); - decode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[2], 1); + decode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1); if (fs->transparency) decode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2); }else{ -- 1.7.7

2 1

[PATCH] mpeg/h264: update thread context even if it is not initialized.
by Michael Niedermayer 31 Jan '12

31 Jan '12

Fixes decoding of Ticket952 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/h264.c | 13 ++++++++----- libavcodec/mpegvideo.c | 10 ++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a4892ac..a3343da 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1224,7 +1224,7 @@ static int decode_update_thread_context(AVCodecContext *dst, const AVCodecContex int inited = s->context_initialized, err; int i; - if(dst == src || !s1->context_initialized) return 0; + if(dst == src) return 0; err = ff_mpeg_update_thread_context(dst, src); if(err) return err; @@ -1240,12 +1240,19 @@ static int decode_update_thread_context(AVCodecContext *dst, const AVCodecContex memcpy(&h->s + 1, &h1->s + 1, sizeof(H264Context) - sizeof(MpegEncContext)); //copy all fields after MpegEnc memset(h->sps_buffers, 0, sizeof(h->sps_buffers)); memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); + + if (s1->context_initialized) { if (ff_h264_alloc_tables(h) < 0) { av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n"); return AVERROR(ENOMEM); } context_init(h); + // frame_start may not be called for the next thread (if it's decoding a bottom field) + // so this has to be allocated here + h->s.obmc_scratchpad = av_malloc(16*6*s->linesize); + } + for(i=0; i<2; i++){ h->rbsp_buffer[i] = NULL; h->rbsp_buffer_size[i] = 0; @@ -1253,10 +1260,6 @@ static int decode_update_thread_context(AVCodecContext *dst, const AVCodecContex h->thread_context[0] = h; - // frame_start may not be called for the next thread (if it's decoding a bottom field) - // so this has to be allocated here - h->s.obmc_scratchpad = av_malloc(16*6*s->linesize); - s->dsp.clear_blocks(h->mb); s->dsp.clear_blocks(h->mb+(24*16<<h->pixel_shift)); } diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 04c149a..f197bd7 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -531,7 +531,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, { MpegEncContext *s = dst->priv_data, *s1 = src->priv_data; - if (dst == src || !s1->context_initialized) + if (dst == src) return 0; // FIXME can parameters change on I-frames? @@ -540,12 +540,14 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, memcpy(s, s1, sizeof(MpegEncContext)); s->avctx = dst; - s->picture_range_start += MAX_PICTURE_COUNT; - s->picture_range_end += MAX_PICTURE_COUNT; s->bitstream_buffer = NULL; s->bitstream_buffer_size = s->allocated_bitstream_buffer_size = 0; - MPV_common_init(s); + if (s1->context_initialized){ + s->picture_range_start += MAX_PICTURE_COUNT; + s->picture_range_end += MAX_PICTURE_COUNT; + MPV_common_init(s); + } } s->avctx->coded_height = s1->avctx->coded_height; -- 1.7.5.4

1 1

[PATCH 1/4] ffv1enc: PIX_FMT_YUVA420P support
by Paul B Mahol 31 Jan '12

31 Jan '12

Signed-off-by: Paul B Mahol <onemda(a)gmail.com> --- libavcodec/ffv1.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index c3034d3..2ba8845 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -935,6 +935,10 @@ static av_cold int encode_init(AVCodecContext *avctx) case PIX_FMT_YUV410P: s->colorspace= 0; break; + case PIX_FMT_YUVA420P: + s->colorspace= 0; + s->transparency= 1; + break; case PIX_FMT_RGB32: s->colorspace= 1; s->transparency= 1; @@ -1097,6 +1101,8 @@ static int encode_slice(AVCodecContext *c, void *arg){ encode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1); encode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1); + if (fs->transparency) + encode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2); }else{ encode_rgb_frame(fs, (uint32_t*)(p->data[0]) + ps*x + y*(p->linesize[0]/4), width, height, p->linesize[0]/4); } @@ -1798,7 +1804,7 @@ AVCodec ff_ffv1_encoder = { .encode = encode_frame, .close = common_end, .capabilities = CODEC_CAP_SLICE_THREADS, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUVA420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_0RGB32, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_YUV420P9, PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), }; #endif -- 1.7.7

2 8

[PATCH] libpostprocess: remove cruft from before major bump.
by Reimar Döffinger 31 Jan '12

31 Jan '12

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- libpostproc/postprocess.c | 4 ---- libpostproc/postprocess.h | 6 ------ 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index ed5c240..230020d 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -666,11 +666,7 @@ static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[] /* -pp Command line Help */ -#if LIBPOSTPROC_VERSION_INT < (52<<16) -const char *const pp_help= -#else const char pp_help[] = -#endif "Available postprocessing filters:\n" "Filters Options\n" "short long name short long option Description\n" diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index c2c5c73..76fcf44 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -69,13 +69,7 @@ const char *postproc_license(void); typedef void pp_context; typedef void pp_mode; -#if LIBPOSTPROC_VERSION_INT < (52<<16) -typedef pp_context pp_context_t; -typedef pp_mode pp_mode_t; -extern const char *const pp_help; ///< a simple help text -#else extern const char pp_help[]; ///< a simple help text -#endif void pp_postprocess(const uint8_t * src[3], const int srcStride[3], uint8_t * dst[3], const int dstStride[3], -- 1.7.8.3

3 3