From 3f77c41171267462b5269ef6dadc6fe591201d71 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 11 Feb 2012 19:44:05 +0100 Subject: [PATCH 1/9] bmpenc: switch to encode2(). --- libavcodec/bmpenc.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index ca2951ab37..3747784183 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "bytestream.h" #include "bmp.h" +#include "internal.h" static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF }; static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F }; @@ -63,16 +64,16 @@ static av_cold int bmp_encode_init(AVCodecContext *avctx){ return 0; } -static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ +static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) +{ BMPContext *s = avctx->priv_data; - AVFrame *pict = data; AVFrame * const p= (AVFrame*)&s->picture; - int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize; + int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret; const uint32_t *pal = NULL; int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB; int bit_count = avctx->bits_per_coded_sample; - uint8_t *ptr; - unsigned char* buf0 = buf; + uint8_t *ptr, *buf; *p = *pict; p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; @@ -111,10 +112,11 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s #define SIZE_BITMAPINFOHEADER 40 hsize = SIZE_BITMAPFILEHEADER + SIZE_BITMAPINFOHEADER + (pal_entries << 2); n_bytes = n_bytes_image + hsize; - if(n_bytes>buf_size) { - av_log(avctx, AV_LOG_ERROR, "buf size too small (need %d, got %d)\n", n_bytes, buf_size); - return -1; + if ((ret = ff_alloc_packet(pkt, n_bytes)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; } + buf = pkt->data; bytestream_put_byte(&buf, 'B'); // BITMAPFILEHEADER.bfType bytestream_put_byte(&buf, 'M'); // do. bytestream_put_le32(&buf, n_bytes); // BITMAPFILEHEADER.bfSize @@ -136,7 +138,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s bytestream_put_le32(&buf, pal[i] & 0xFFFFFF); // BMP files are bottom-to-top so we start from the end... ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; - buf = buf0 + hsize; + buf = pkt->data + hsize; for(i = 0; i < avctx->height; i++) { if (bit_count == 16) { const uint16_t *src = (const uint16_t *) ptr; @@ -151,7 +153,10 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s buf += pad_bytes_per_row; ptr -= p->linesize[0]; // ... and go back } - return n_bytes; + + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; } AVCodec ff_bmp_encoder = { @@ -160,7 +165,7 @@ AVCodec ff_bmp_encoder = { .id = CODEC_ID_BMP, .priv_data_size = sizeof(BMPContext), .init = bmp_encode_init, - .encode = bmp_encode_frame, + .encode2 = bmp_encode_frame, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_RGB444, PIX_FMT_RGB565, From 89829242a633789fa614ec7ca9ffb912b5f02765 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 11 Feb 2012 20:03:42 +0100 Subject: [PATCH 2/9] dnxhdenc: switch to encode2. --- libavcodec/dnxhdenc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 2b7089b946..322151324c 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "dsputil.h" +#include "internal.h" #include "mpegvideo.h" #include "mpegvideo_common.h" #include "dnxhdenc.h" @@ -903,18 +904,21 @@ static void dnxhd_load_picture(DNXHDEncContext *ctx, const AVFrame *frame) ctx->cur_field = frame->interlaced_frame && !frame->top_field_first; } -static int dnxhd_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) +static int dnxhd_encode_picture(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *frame, int *got_packet) { DNXHDEncContext *ctx = avctx->priv_data; int first_field = 1; int offset, i, ret; + uint8_t *buf; - if (buf_size < ctx->cid_table->frame_size) { + if ((ret = ff_alloc_packet(pkt, ctx->cid_table->frame_size)) < 0) { av_log(avctx, AV_LOG_ERROR, "output buffer is too small to compress picture\n"); - return -1; + return ret; } + buf = pkt->data; - dnxhd_load_picture(ctx, data); + dnxhd_load_picture(ctx, frame); encode_coding_unit: for (i = 0; i < 3; i++) { @@ -955,13 +959,14 @@ static int dnxhd_encode_picture(AVCodecContext *avctx, unsigned char *buf, int b first_field = 0; ctx->cur_field ^= 1; buf += ctx->cid_table->coding_unit_size; - buf_size -= ctx->cid_table->coding_unit_size; goto encode_coding_unit; } ctx->frame.quality = ctx->qscale*FF_QP2LAMBDA; - return ctx->cid_table->frame_size; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; } static int dnxhd_encode_end(AVCodecContext *avctx) @@ -999,7 +1004,7 @@ AVCodec ff_dnxhd_encoder = { .id = CODEC_ID_DNXHD, .priv_data_size = sizeof(DNXHDEncContext), .init = dnxhd_encode_init, - .encode = dnxhd_encode_picture, + .encode2 = dnxhd_encode_picture, .close = dnxhd_encode_end, .capabilities = CODEC_CAP_SLICE_THREADS, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_YUV422P10, PIX_FMT_NONE}, From 177bb4bf50d762fcc1ace3e357a2a2bba54744ee Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 11 Feb 2012 20:37:41 +0100 Subject: [PATCH 3/9] cljr: set the properties of the coded_frame, not input frame. --- libavcodec/cljr.c | 4 ++-- tests/ref/vsynth1/cljr | 2 +- tests/ref/vsynth2/cljr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index cf307bb06a..a3bb66c500 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -135,8 +135,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, AVFrame *p = data; int x, y; - p->pict_type = AV_PICTURE_TYPE_I; - p->key_frame = 1; + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + avctx->coded_frame->key_frame = 1; init_put_bits(&pb, buf, buf_size / 8); diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr index 9865726ccc..4978344bd3 100644 --- a/tests/ref/vsynth1/cljr +++ b/tests/ref/vsynth1/cljr @@ -1,4 +1,4 @@ -d149cadc43100d8e98ff04e57fdaa31f *./tests/data/vsynth1/cljr.avi +b4d3d31da0b4b6873ad8239d113c91d2 *./tests/data/vsynth1/cljr.avi 5075660 ./tests/data/vsynth1/cljr.avi 4debaab994c2c7273bebaa0c5733017b *./tests/data/cljr.vsynth1.out.yuv stddev: 30.75 PSNR: 18.37 MAXDIFF: 225 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/cljr b/tests/ref/vsynth2/cljr index 6f8670ca71..562f35fa22 100644 --- a/tests/ref/vsynth2/cljr +++ b/tests/ref/vsynth2/cljr @@ -1,4 +1,4 @@ -86250984790dd745a932f36cf229cef7 *./tests/data/vsynth2/cljr.avi +416ddcf73d2d993456f3c49f3eed4f1a *./tests/data/vsynth2/cljr.avi 5075660 ./tests/data/vsynth2/cljr.avi 3a70ba2a535ef9c7fc6478b27a2cb58a *./tests/data/cljr.vsynth2.out.yuv stddev: 10.48 PSNR: 27.72 MAXDIFF: 64 bytes: 7603200/ 7603200 From 3dffa1b46c6a03c2f58d88da2b83f1a467575a72 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 11 Feb 2012 20:39:12 +0100 Subject: [PATCH 4/9] cljr: implement encode2. --- libavcodec/cljr.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index a3bb66c500..40d8a4c449 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "get_bits.h" +#include "internal.h" #include "put_bits.h" typedef struct CLJRContext { @@ -128,17 +129,21 @@ AVCodec ff_cljr_decoder = { #endif #if CONFIG_CLJR_ENCODER -static int encode_frame(AVCodecContext *avctx, unsigned char *buf, - int buf_size, void *data) +static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *p, int *got_packet) { PutBitContext pb; - AVFrame *p = data; - int x, y; + int x, y, ret; + + if ((ret = ff_alloc_packet(pkt, 32*avctx->height*avctx->width/4)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; + } avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; - init_put_bits(&pb, buf, buf_size / 8); + init_put_bits(&pb, pkt->data, pkt->size); for (y = 0; y < avctx->height; y++) { uint8_t *luma = &p->data[0][y * p->linesize[0]]; @@ -157,7 +162,10 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, flush_put_bits(&pb); - return put_bits_count(&pb) / 8; + pkt->size = put_bits_count(&pb) / 8; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; } AVCodec ff_cljr_encoder = { @@ -166,7 +174,7 @@ AVCodec ff_cljr_encoder = { .id = CODEC_ID_CLJR, .priv_data_size = sizeof(CLJRContext), .init = common_init, - .encode = encode_frame, + .encode2 = encode_frame, .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV411P, PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), From c22e2ec9d1ffe7fd59be2198520b9a746de62e91 Mon Sep 17 00:00:00 2001 From: Andrey Utkin Date: Sun, 5 Feb 2012 16:49:14 +0200 Subject: [PATCH 5/9] avconv: set AVFormatContext.duration from '-t' Set output files duration to recording_time option, if given. Rationale: to save duration into metadata for file that is written to non-seekable output, for formats like FLV (with metadata at beginning). Signed-off-by: Anton Khirnov --- avconv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/avconv.c b/avconv.c index 418e1fde8b..92ffd0fd0d 100644 --- a/avconv.c +++ b/avconv.c @@ -3955,6 +3955,8 @@ static void opt_output_file(void *optctx, const char *filename) output_files[nb_output_files - 1].ctx = oc; output_files[nb_output_files - 1].ost_index = nb_output_streams - oc->nb_streams; output_files[nb_output_files - 1].recording_time = o->recording_time; + if (o->recording_time != INT64_MAX) + oc->duration = o->recording_time; output_files[nb_output_files - 1].start_time = o->start_time; output_files[nb_output_files - 1].limit_filesize = o->limit_filesize; av_dict_copy(&output_files[nb_output_files - 1].opts, format_opts, 0); From e3cc61726343a908cf9d286d7b23820caba49e91 Mon Sep 17 00:00:00 2001 From: Andrey Utkin Date: Sun, 12 Feb 2012 16:46:46 +0200 Subject: [PATCH 6/9] lavf: fix aspect ratio mismatch message. Signed-off-by: Anton Khirnov --- libavformat/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index e10348df60..33775b9a2b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2783,8 +2783,8 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) goto fail; } if(av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)){ - av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between encoder " - "(%d/%d) and muxer layer (%d/%d)\n", + av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer " + "(%d/%d) and encoder layer (%d/%d)\n", st->sample_aspect_ratio.num, st->sample_aspect_ratio.den, st->codec->sample_aspect_ratio.num, st->codec->sample_aspect_ratio.den); From ef66a0ed2e94fe2e7b70b5787fdbb5b2b49d8994 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 11 Feb 2012 17:02:29 -0800 Subject: [PATCH 7/9] swscale: use named registers in yuv2yuv1_plane() place. Most of the function had been converted before, but I forgot this particular location. --- libswscale/x86/output.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index c8e60981bd..a76c127435 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -278,7 +278,7 @@ yuv2planeX_fn 10, 7, 5 psraw m0, 7 psraw m1, 7 packuswb m0, m1 - mov%2 [r1+r2], m0 + mov%2 [dstq+dstwq], m0 %elif %1 == 16 paddd m0, m4, [srcq+dstwq*4+mmsize*0] paddd m1, m4, [srcq+dstwq*4+mmsize*1] From 8c433d8a03279703b6ef1b4645ae06b570011ccd Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 11 Feb 2012 18:46:12 -0800 Subject: [PATCH 8/9] swscale: rename "dstw" to "w" to prevent name collisions. "dstw" can collide with the word-version of the "dst" argument, causing all kind of weird stuff down the pipe. --- libswscale/x86/output.asm | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index a76c127435..7cb00c2b86 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -273,17 +273,17 @@ yuv2planeX_fn 10, 7, 5 %macro yuv2plane1_mainloop 2 .loop_%2: %if %1 == 8 - paddsw m0, m2, [srcq+dstwq*2+mmsize*0] - paddsw m1, m3, [srcq+dstwq*2+mmsize*1] + paddsw m0, m2, [srcq+wq*2+mmsize*0] + paddsw m1, m3, [srcq+wq*2+mmsize*1] psraw m0, 7 psraw m1, 7 packuswb m0, m1 - mov%2 [dstq+dstwq], m0 + mov%2 [dstq+wq], m0 %elif %1 == 16 - paddd m0, m4, [srcq+dstwq*4+mmsize*0] - paddd m1, m4, [srcq+dstwq*4+mmsize*1] - paddd m2, m4, [srcq+dstwq*4+mmsize*2] - paddd m3, m4, [srcq+dstwq*4+mmsize*3] + paddd m0, m4, [srcq+wq*4+mmsize*0] + paddd m1, m4, [srcq+wq*4+mmsize*1] + paddd m2, m4, [srcq+wq*4+mmsize*2] + paddd m3, m4, [srcq+wq*4+mmsize*3] psrad m0, 3 psrad m1, 3 psrad m2, 3 @@ -297,40 +297,40 @@ yuv2planeX_fn 10, 7, 5 paddw m0, m5 paddw m2, m5 %endif ; mmx/sse2/sse4/avx - mov%2 [dstq+dstwq*2+mmsize*0], m0 - mov%2 [dstq+dstwq*2+mmsize*1], m2 + mov%2 [dstq+wq*2+mmsize*0], m0 + mov%2 [dstq+wq*2+mmsize*1], m2 %else ; %1 == 9/10 - paddsw m0, m2, [srcq+dstwq*2+mmsize*0] - paddsw m1, m2, [srcq+dstwq*2+mmsize*1] + paddsw m0, m2, [srcq+wq*2+mmsize*0] + paddsw m1, m2, [srcq+wq*2+mmsize*1] psraw m0, 15 - %1 psraw m1, 15 - %1 pmaxsw m0, m4 pmaxsw m1, m4 pminsw m0, m3 pminsw m1, m3 - mov%2 [dstq+dstwq*2+mmsize*0], m0 - mov%2 [dstq+dstwq*2+mmsize*1], m1 + mov%2 [dstq+wq*2+mmsize*0], m0 + mov%2 [dstq+wq*2+mmsize*1], m1 %endif - add dstwq, mmsize + add wq, mmsize jl .loop_%2 %endmacro %macro yuv2plane1_fn 3 -cglobal yuv2plane1_%1, %3, %3, %2, src, dst, dstw, dither, offset - movsxdifnidn dstwq, dstwd - add dstwq, mmsize - 1 - and dstwq, ~(mmsize - 1) +cglobal yuv2plane1_%1, %3, %3, %2, src, dst, w, dither, offset + movsxdifnidn wq, wd + add wq, mmsize - 1 + and wq, ~(mmsize - 1) %if %1 == 8 - add dstq, dstwq + add dstq, wq %else ; %1 != 8 - lea dstq, [dstq+dstwq*2] + lea dstq, [dstq+wq*2] %endif ; %1 == 8 %if %1 == 16 - lea srcq, [srcq+dstwq*4] + lea srcq, [srcq+wq*4] %else ; %1 != 16 - lea srcq, [srcq+dstwq*2] + lea srcq, [srcq+wq*2] %endif ; %1 == 16 - neg dstwq + neg wq %if %1 == 8 pxor m4, m4 ; zero From 3e23badd83edc021e8a830db109a08c5553988b0 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 11 Feb 2012 17:51:52 -0800 Subject: [PATCH 9/9] swscale: convert yuv2yuvX() to using named arguments. --- libswscale/x86/output.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 7cb00c2b86..6017bf13e0 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -59,14 +59,14 @@ SECTION .text %macro yuv2planeX_fn 3 %if ARCH_X86_32 -%define cntr_reg r1 +%define cntr_reg filterq %define movsx mov %else %define cntr_reg r11 %define movsx movsxd %endif -cglobal yuv2planeX_%1, %3, 7, %2 +cglobal yuv2planeX_%1, %3, 7, %2, filter, fltsize, src, dst, w, dither, offset %if %1 == 8 || %1 == 9 || %1 == 10 pxor m6, m6 %endif ; %1 == 8/9/10 @@ -81,8 +81,8 @@ cglobal yuv2planeX_%1, %3, 7, %2 %endif ; x86-32 ; create registers holding dither - movq m_dith, [r5] ; dither - test r6d, r6d + movq m_dith, [ditherq] ; dither + test offsetd, offsetd jz .no_rot %if mmsize == 16 punpcklqdq m_dith, m_dith @@ -146,17 +146,17 @@ cglobal yuv2planeX_%1, %3, 7, %2 mova m1, [yuv2yuvX_%1_start] mova m2, m1 %endif ; %1 == 8/9/10/16 - movsx cntr_reg, r1m + movsx cntr_reg, fltsizem .filterloop_ %+ %%i: ; input pixels - mov r6, [r2+gprsize*cntr_reg-2*gprsize] + mov r6, [srcq+gprsize*cntr_reg-2*gprsize] %if %1 == 16 mova m3, [r6+r5*4] mova m5, [r6+r5*4+mmsize] %else ; %1 == 8/9/10 mova m3, [r6+r5*2] %endif ; %1 == 8/9/10/16 - mov r6, [r2+gprsize*cntr_reg-gprsize] + mov r6, [srcq+gprsize*cntr_reg-gprsize] %if %1 == 16 mova m4, [r6+r5*4] mova m6, [r6+r5*4+mmsize] @@ -165,7 +165,7 @@ cglobal yuv2planeX_%1, %3, 7, %2 %endif ; %1 == 8/9/10/16 ; coefficients - movd m0, [r0+2*cntr_reg-4]; coeff[0], coeff[1] + movd m0, [filterq+2*cntr_reg-4] ; coeff[0], coeff[1] %if %1 == 16 pshuflw m7, m0, 0 ; coeff[0] pshuflw m0, m0, 0x55 ; coeff[1] @@ -207,7 +207,7 @@ cglobal yuv2planeX_%1, %3, 7, %2 %if %1 == 8 packssdw m2, m1 packuswb m2, m2 - movh [r3+r5*1], m2 + movh [dstq+r5*1], m2 %else ; %1 == 9/10/16 %if %1 == 16 packssdw m2, m1 @@ -221,11 +221,11 @@ cglobal yuv2planeX_%1, %3, 7, %2 %endif ; mmx2/sse2/sse4/avx pminsw m2, [yuv2yuvX_%1_upper] %endif ; %1 == 9/10/16 - mova [r3+r5*2], m2 + mova [dstq+r5*2], m2 %endif ; %1 == 8/9/10/16 add r5, mmsize/2 - sub r4d, mmsize/2 + sub wd, mmsize/2 %if %1 == 8 %assign %%i %%i+2 %endrep