September 2015 - ffmpeg-cvslog

tiny_psnr: Use the correct abs() version
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Tue Sep 22 13:56:48 2015 +0200| [26e8fa3b508eb047e85f4e923fc8e82a1aa656ba] | committer: Vittorio Giovara tiny_psnr: Use the correct abs() version > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26e8fa3b508eb047e… --- tests/tiny_psnr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c index 66eaf82..d06baf6 100644 --- a/tests/tiny_psnr.c +++ b/tests/tiny_psnr.c @@ -208,7 +208,7 @@ int main(int argc, char *argv[]) b = buf[1][j]; } sse += (a - b) * (a - b); - dist = abs(a - b); + dist = llabs(a - b); if (dist > maxdist) maxdist = dist; break;

1 0

vf_framepack: Use av_image_copy() where appropriate
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Tue Sep 22 14:22:15 2015 +0200| [c9943f00cfa2471d1b8a3a9ddc7a21049a71090e] | committer: Vittorio Giovara vf_framepack: Use av_image_copy() where appropriate This correctly adjust chroma subsampling for column interleaved mode, and allows future high bitdepth support. Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9943f00cfa2471d1… --- libavfilter/vf_framepack.c | 157 +++++++++++++++++++++++++++----------------- 1 file changed, 96 insertions(+), 61 deletions(-) diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c index f5c761a..e9806ba 100644 --- a/libavfilter/vf_framepack.c +++ b/libavfilter/vf_framepack.c @@ -130,92 +130,127 @@ static int config_output(AVFilterLink *outlink) return 0; } -static void horizontal_frame_pack(FramepackContext *s, - AVFrame *dst, +static void horizontal_frame_pack(AVFilterLink *outlink, + AVFrame *out, int interleaved) { - int plane, i; - int length = dst->width / 2; - int lines = dst->height; - - for (plane = 0; plane < s->pix_desc->nb_components; plane++) { - const uint8_t *leftp = s->input_views[LEFT]->data[plane]; - const uint8_t *rightp = s->input_views[RIGHT]->data[plane]; - uint8_t *dstp = dst->data[plane]; - - if (plane == 1 || plane == 2) { - length = -(-(dst->width / 2) >> s->pix_desc->log2_chroma_w); - lines = -(-(dst->height) >> s->pix_desc->log2_chroma_h); - } - - if (interleaved) { + AVFilterContext *ctx = outlink->src; + FramepackContext *s = ctx->priv; + int i, plane; + + if (interleaved) { + const uint8_t *leftp = s->input_views[LEFT]->data[0]; + const uint8_t *rightp = s->input_views[RIGHT]->data[0]; + uint8_t *dstp = out->data[0]; + int length = out->width / 2; + int lines = out->height; + + for (plane = 0; plane < s->pix_desc->nb_components; plane++) { + if (plane == 1 || plane == 2) { + length = -(-(out->width / 2) >> s->pix_desc->log2_chroma_w); + lines = -(-(out->height) >> s->pix_desc->log2_chroma_h); + } for (i = 0; i < lines; i++) { int j; - int k = 0; - + leftp = s->input_views[LEFT]->data[plane] + + s->input_views[LEFT]->linesize[plane] * i; + rightp = s->input_views[RIGHT]->data[plane] + + s->input_views[RIGHT]->linesize[plane] * i; + dstp = out->data[plane] + out->linesize[plane] * i; for (j = 0; j < length; j++) { - dstp[k++] = leftp[j]; - dstp[k++] = rightp[j]; + // interpolate chroma as necessary + if ((s->pix_desc->log2_chroma_w || + s->pix_desc->log2_chroma_h) && + (plane == 1 || plane == 2)) { + *dstp++ = (*leftp + *rightp) / 2; + *dstp++ = (*leftp + *rightp) / 2; + } else { + *dstp++ = *leftp; + *dstp++ = *rightp; + } + leftp += 1; + rightp += 1; } - - dstp += dst->linesize[plane]; - leftp += s->input_views[LEFT]->linesize[plane]; - rightp += s->input_views[RIGHT]->linesize[plane]; } - } else { - av_image_copy_plane(dst->data[plane], dst->linesize[plane], - leftp, s->input_views[LEFT]->linesize[plane], - length, lines); - av_image_copy_plane(dst->data[plane] + length, dst->linesize[plane], - rightp, s->input_views[RIGHT]->linesize[plane], - length, lines); + } + } else { + for (i = 0; i < 2; i++) { + const uint8_t *src[4]; + uint8_t *dst[4]; + int sub_w = s->input_views[i]->width >> s->pix_desc->log2_chroma_w; + + src[0] = s->input_views[i]->data[0]; + src[1] = s->input_views[i]->data[1]; + src[2] = s->input_views[i]->data[2]; + + dst[0] = out->data[0] + i * s->input_views[i]->width; + dst[1] = out->data[1] + i * sub_w; + dst[2] = out->data[2] + i * sub_w; + + av_image_copy(dst, out->linesize, src, s->input_views[i]->linesize, + s->input_views[i]->format, + s->input_views[i]->width, + s->input_views[i]->height); } } } -static void vertical_frame_pack(FramepackContext *s, - AVFrame *dst, +static void vertical_frame_pack(AVFilterLink *outlink, + AVFrame *out, int interleaved) { - int plane, offset; - int length = dst->width; - int lines = dst->height / 2; - - for (plane = 0; plane < s->pix_desc->nb_components; plane++) { - if (plane == 1 || plane == 2) { - length = -(-(dst->width) >> s->pix_desc->log2_chroma_w); - lines = -(-(dst->height / 2) >> s->pix_desc->log2_chroma_h); - } + AVFilterContext *ctx = outlink->src; + FramepackContext *s = ctx->priv; + int i; - offset = interleaved ? dst->linesize[plane] : dst->linesize[plane] * lines; - - av_image_copy_plane(dst->data[plane], - dst->linesize[plane] << interleaved, - s->input_views[LEFT]->data[plane], - s->input_views[LEFT]->linesize[plane], - length, lines); - av_image_copy_plane(dst->data[plane] + offset, - dst->linesize[plane] << interleaved, - s->input_views[RIGHT]->data[plane], - s->input_views[RIGHT]->linesize[plane], - length, lines); + for (i = 0; i < 2; i++) { + const uint8_t *src[4]; + uint8_t *dst[4]; + int linesizes[4]; + int sub_h = s->input_views[i]->height >> s->pix_desc->log2_chroma_h; + + src[0] = s->input_views[i]->data[0]; + src[1] = s->input_views[i]->data[1]; + src[2] = s->input_views[i]->data[2]; + + dst[0] = out->data[0] + i * out->linesize[0] * + (interleaved + s->input_views[i]->height * (1 - interleaved)); + dst[1] = out->data[1] + i * out->linesize[1] * + (interleaved + sub_h * (1 - interleaved)); + dst[2] = out->data[2] + i * out->linesize[2] * + (interleaved + sub_h * (1 - interleaved)); + + linesizes[0] = out->linesize[0] + + interleaved * out->linesize[0]; + linesizes[1] = out->linesize[1] + + interleaved * out->linesize[1]; + linesizes[2] = out->linesize[2] + + interleaved * out->linesize[2]; + + av_image_copy(dst, linesizes, src, s->input_views[i]->linesize, + s->input_views[i]->format, + s->input_views[i]->width, + s->input_views[i]->height); } } -static av_always_inline void spatial_frame_pack(FramepackContext *s, AVFrame *dst) +static av_always_inline void spatial_frame_pack(AVFilterLink *outlink, + AVFrame *dst) { + AVFilterContext *ctx = outlink->src; + FramepackContext *s = ctx->priv; switch (s->format) { case AV_STEREO3D_SIDEBYSIDE: - horizontal_frame_pack(s, dst, 0); + horizontal_frame_pack(outlink, dst, 0); break; case AV_STEREO3D_COLUMNS: - horizontal_frame_pack(s, dst, 1); + horizontal_frame_pack(outlink, dst, 1); break; case AV_STEREO3D_TOPBOTTOM: - vertical_frame_pack(s, dst, 0); + vertical_frame_pack(outlink, dst, 0); break; case AV_STEREO3D_LINES: - vertical_frame_pack(s, dst, 1); + vertical_frame_pack(outlink, dst, 1); break; } } @@ -276,7 +311,7 @@ static int request_frame(AVFilterLink *outlink) if (!dst) return AVERROR(ENOMEM); - spatial_frame_pack(s, dst); + spatial_frame_pack(outlink, dst); // get any property from the original frame ret = av_frame_copy_props(dst, s->input_views[LEFT]);

1 0

Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:44:14 2015 +0200| [f35c4ede9e0e360143a5b81adbbbec23f37fdce2] | committer: Hendrik Leppkes Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e' * commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e': vf_framepack: Use av_image_copy() where appropriate Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f35c4ede9e0e36014… ---

1 0

Merge commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:38:05 2015 +0200| [b03260fde08ca9759d7560df60bb6286420aad65] | committer: Hendrik Leppkes Merge commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c' * commit 'e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c': dnxhddec: Enable frame threading FFmpeg has much more threading modes for DNxHD Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b03260fde08ca9759… ---

1 0

dnxhddec: Enable frame threading
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sat Sep 26 17:38:23 2015 +0200| [e94e651c762f90ac5fd2dc9bd3ba1336a77d5b5c] | committer: Vittorio Giovara dnxhddec: Enable frame threading Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e94e651c762f90ac5… --- libavcodec/dnxhddec.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index c1bf3af..50747ea 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -30,6 +30,7 @@ #include "dnxhddata.h" #include "idctdsp.h" #include "internal.h" +#include "thread.h" typedef struct DNXHDContext { AVCodecContext *avctx; @@ -427,14 +428,16 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; DNXHDContext *ctx = avctx->priv_data; - AVFrame *picture = data; + ThreadFrame tf; int first_field = 1; int ret; + tf.f = data; + ff_dlog(avctx, "frame size %d\n", buf_size); decode_coding_unit: - if ((ret = dnxhd_decode_header(ctx, picture, buf, buf_size, first_field)) < 0) + if ((ret = dnxhd_decode_header(ctx, tf.f, buf, buf_size, first_field)) < 0) return ret; if ((avctx->width || avctx->height) && @@ -449,17 +452,17 @@ decode_coding_unit: return ret; if (first_field) { - if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) { + if ((ret = ff_thread_get_buffer(avctx, &tf, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - picture->pict_type = AV_PICTURE_TYPE_I; - picture->key_frame = 1; + tf.f->pict_type = AV_PICTURE_TYPE_I; + tf.f->key_frame = 1; } - dnxhd_decode_macroblocks(ctx, picture, buf + 0x280, buf_size - 0x280); + dnxhd_decode_macroblocks(ctx, tf.f, buf + 0x280, buf_size - 0x280); - if (first_field && picture->interlaced_frame) { + if (first_field && tf.f->interlaced_frame) { buf += ctx->cid_table->coding_unit_size; buf_size -= ctx->cid_table->coding_unit_size; first_field = 0; @@ -489,5 +492,5 @@ AVCodec ff_dnxhd_decoder = { .init = dnxhd_decode_init, .close = dnxhd_decode_close, .decode = dnxhd_decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, };

1 0

Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:31:29 2015 +0200| [b3bf41cb75d434b2622433a96dcb617a58e9fca6] | committer: Hendrik Leppkes Merge commit 'c5e5e6306223623de8352a3ecd224956aa5beb37' * commit 'c5e5e6306223623de8352a3ecd224956aa5beb37': riff: Add support for RV40 codec in AVI Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3bf41cb75d434b26… ---

1 0

Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:36:06 2015 +0200| [1342d7b2f9413c7f3fa6e51795922f57d1ed70c6] | committer: Hendrik Leppkes Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e' * commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e': dnxhddec: Decode and use interlace mb flag Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1342d7b2f9413c7f3… ---

1 0

dnxhddec: Decode and use interlace mb flag
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Sat Sep 26 17:38:22 2015 +0200| [c49cbecbae5a42f4ca004197b0118cc50aaaca2e] | committer: Vittorio Giovara dnxhddec: Decode and use interlace mb flag This bit is 1 in some samples, and seems to coincide with interlaced mbs and CID1260. 2008 specs do not know about it, and maintain qscale is 11 bits. This looks oversized, but may help larger bitdepths. Currently, it leads to an obviously incorrect qscale value, meaning its syntax is shifted by 1. However, reading 11 bits also leads to obviously incorrect decoding: qscale seems to be 10 bits. However, as most profiles still have 11bits qscale, the feature is restricted to the CID1260 profile (this flag is dependent on a higher-level flag located in the header). The encoder writes 12 bits of syntax, last and first bits always 0, which is now somewhat inconsistent with the decoder, but ends up with the same effect (progressive + reserved bit). Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c49cbecbae5a42f4c… --- libavcodec/dnxhddec.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 72f63e0..c1bf3af 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -48,6 +48,7 @@ typedef struct DNXHDContext { const CIDEntry *cid_table; int bit_depth; // 8, 10 or 0 if not initialized at all. int is_444; + int mbaff; void (*decode_dct_block)(struct DNXHDContext *ctx, int16_t *block, int n, int qscale); } DNXHDContext; @@ -131,6 +132,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, av_log(ctx->avctx, AV_LOG_DEBUG, "interlaced %d, cur field %d\n", buf[5] & 3, ctx->cur_field); } + ctx->mbaff = buf[0x6] & 32; ctx->height = AV_RB16(buf + 0x18); ctx->width = AV_RB16(buf + 0x1a); @@ -168,6 +170,9 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, if ((ret = dnxhd_init_vlc(ctx, cid)) < 0) return ret; + if (ctx->mbaff && ctx->cid_table->cid != 1260) + av_log(ctx->avctx, AV_LOG_WARNING, + "Adaptive MB interlace flag in an unsupported profile.\n"); // make sure profile size constraints are respected // DNx100 allows 1920->1440 and 1280->960 subsampling @@ -321,8 +326,14 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, uint8_t *dest_y, *dest_u, *dest_v; int dct_y_offset, dct_x_offset; int qscale, i; + int interlaced_mb = 0; - qscale = get_bits(&ctx->gb, 11); + if (ctx->mbaff) { + interlaced_mb = get_bits1(&ctx->gb); + qscale = get_bits(&ctx->gb, 10); + } else { + qscale = get_bits(&ctx->gb, 11); + } skip_bits1(&ctx->gb); for (i = 0; i < 8; i++) { @@ -350,8 +361,12 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, dest_u += frame->linesize[1]; dest_v += frame->linesize[2]; } + if (interlaced_mb) { + dct_linesize_luma <<= 1; + dct_linesize_chroma <<= 1; + } - dct_y_offset = dct_linesize_luma << 3; + dct_y_offset = interlaced_mb ? frame->linesize[0] : (dct_linesize_luma << 3); dct_x_offset = 8 << shift1; if (!ctx->is_444) { ctx->idsp.idct_put(dest_y, dct_linesize_luma, ctx->blocks[0]); @@ -360,7 +375,7 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, ctx->idsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[5]); if (!(ctx->avctx->flags & AV_CODEC_FLAG_GRAY)) { - dct_y_offset = dct_linesize_chroma << 3; + dct_y_offset = interlaced_mb ? frame->linesize[1] : (dct_linesize_chroma << 3); ctx->idsp.idct_put(dest_u, dct_linesize_chroma, ctx->blocks[2]); ctx->idsp.idct_put(dest_v, dct_linesize_chroma, ctx->blocks[3]); ctx->idsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[6]); @@ -373,7 +388,7 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, AVFrame *frame, ctx->idsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[7]); if (!(ctx->avctx->flags & AV_CODEC_FLAG_GRAY)) { - dct_y_offset = dct_linesize_chroma << 3; + dct_y_offset = interlaced_mb ? frame->linesize[1] : (dct_linesize_chroma << 3); ctx->idsp.idct_put(dest_u, dct_linesize_chroma, ctx->blocks[2]); ctx->idsp.idct_put(dest_u + dct_x_offset, dct_linesize_chroma, ctx->blocks[3]); ctx->idsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[8]);

1 0

riff: Add support for RV40 codec in AVI
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Thierry Foucu <tfoucu(a)gmail.com> | Sat Sep 26 16:21:06 2015 +0200| [c5e5e6306223623de8352a3ecd224956aa5beb37] | committer: Vittorio Giovara riff: Add support for RV40 codec in AVI Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5e5e6306223623de… --- libavformat/riff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/riff.c b/libavformat/riff.c index 9093b3a..1746297 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -359,6 +359,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_HQX, MKTAG('C', 'H', 'Q', 'X') }, { AV_CODEC_ID_TDSC, MKTAG('T', 'D', 'S', 'C') }, { AV_CODEC_ID_HQ_HQA, MKTAG('C', 'U', 'V', 'C') }, + { AV_CODEC_ID_RV40, MKTAG('R', 'V', '4', '0') }, { AV_CODEC_ID_NONE, 0 } };

1 0

Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'
by git＠videolan.org 29 Sep '15

29 Sep '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Tue Sep 29 15:30:48 2015 +0200| [7255cf003ef17c5223d6748f25be592ba30933f0] | committer: Hendrik Leppkes Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60' * commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60': avconv: Make the private options discovery more manifest Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7255cf003ef17c522… ---

1 0