diff options
Diffstat (limited to 'libavcodec/asvenc.c')
-rw-r--r-- | libavcodec/asvenc.c | 102 |
1 files changed, 70 insertions, 32 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index a96521258e..4b390b047a 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2003 Michael Niedermayer * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,8 +26,10 @@ #include "libavutil/attributes.h" #include "libavutil/mem.h" +#include "aandcttab.h" #include "asv.h" #include "avcodec.h" +#include "dct.h" #include "fdctdsp.h" #include "internal.h" #include "mathops.h" @@ -50,7 +52,7 @@ static inline void asv1_put_level(PutBitContext *pb, int level) } } -static inline void asv2_put_level(PutBitContext *pb, int level) +static inline void asv2_put_level(ASV1Context *a, PutBitContext *pb, int level) { unsigned int index = level + 31; @@ -58,6 +60,10 @@ static inline void asv2_put_level(PutBitContext *pb, int level) put_bits(pb, ff_asv2_level_tab[index][1], ff_asv2_level_tab[index][0]); } else { put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]); + if (level < -128 || level > 127) { + av_log(a->avctx, AV_LOG_WARNING, "Cliping level %d, increase qscale\n", level); + level = av_clip_int8(level); + } asv2_put_bits(pb, 8, level & 0xFF); } } @@ -108,7 +114,7 @@ static inline void asv1_encode_block(ASV1Context *a, int16_t block[64]) put_bits(&a->pb, ff_asv_ccp_tab[16][1], ff_asv_ccp_tab[16][0]); } -static inline int asv2_encode_block(ASV1Context *a, int16_t block[64]) +static inline void asv2_encode_block(ASV1Context *a, int16_t block[64]) { int i; int count = 0; @@ -142,8 +148,7 @@ static inline int asv2_encode_block(ASV1Context *a, int16_t block[64]) a->q_intra_matrix[index + 9] + (1 << 15)) >> 16)) ccp |= 1; - if (!i && ccp >= 8) - return AVERROR_BUG; + av_assert2(i || ccp < 8); if (i) put_bits(&a->pb, ff_asv_ac_ccp_tab[ccp][1], ff_asv_ac_ccp_tab[ccp][0]); else @@ -151,24 +156,22 @@ static inline int asv2_encode_block(ASV1Context *a, int16_t block[64]) if (ccp) { if (ccp & 8) - asv2_put_level(&a->pb, block[index + 0]); + asv2_put_level(a, &a->pb, block[index + 0]); if (ccp & 4) - asv2_put_level(&a->pb, block[index + 8]); + asv2_put_level(a, &a->pb, block[index + 8]); if (ccp & 2) - asv2_put_level(&a->pb, block[index + 1]); + asv2_put_level(a, &a->pb, block[index + 1]); if (ccp & 1) - asv2_put_level(&a->pb, block[index + 9]); + asv2_put_level(a, &a->pb, block[index + 9]); } } - - return 0; } #define MAX_MB_SIZE (30 * 16 * 16 * 3 / 2 / 8) static inline int encode_mb(ASV1Context *a, int16_t block[6][64]) { - int i, ret; + int i; if (a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb) >> 3) < MAX_MB_SIZE) { av_log(a->avctx, AV_LOG_ERROR, "encoded frame too large\n"); @@ -180,9 +183,7 @@ static inline int encode_mb(ASV1Context *a, int16_t block[6][64]) asv1_encode_block(a, block[i]); } else { for (i = 0; i < 6; i++) { - ret = asv2_encode_block(a, block[i]); - if (ret < 0) - return ret; + asv2_encode_block(a, block[i]); } } return 0; @@ -221,13 +222,52 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int size, ret; int mb_x, mb_y; - if (!pkt->data && - (ret = av_new_packet(pkt, a->mb_height * a->mb_width * MAX_MB_SIZE + - FF_MIN_BUFFER_SIZE)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + if (pict->width % 16 || pict->height % 16) { + AVFrame *clone = av_frame_alloc(); + int i; + + if (!clone) + return AVERROR(ENOMEM); + clone->format = pict->format; + clone->width = FFALIGN(pict->width, 16); + clone->height = FFALIGN(pict->height, 16); + ret = av_frame_get_buffer(clone, 32); + if (ret < 0) { + av_frame_free(&clone); + return ret; + } + + ret = av_frame_copy(clone, pict); + if (ret < 0) { + av_frame_free(&clone); + return ret; + } + + for (i = 0; i<3; i++) { + int x, y; + int w = FF_CEIL_RSHIFT(pict->width, !!i); + int h = FF_CEIL_RSHIFT(pict->height, !!i); + int w2 = FF_CEIL_RSHIFT(clone->width, !!i); + int h2 = FF_CEIL_RSHIFT(clone->height, !!i); + for (y=0; y<h; y++) + for (x=w; x<w2; x++) + clone->data[i][x + y*clone->linesize[i]] = + clone->data[i][w - 1 + y*clone->linesize[i]]; + for (y=h; y<h2; y++) + for (x=0; x<w2; x++) + clone->data[i][x + y*clone->linesize[i]] = + clone->data[i][x + (h-1)*clone->linesize[i]]; + } + ret = encode_frame(avctx, pkt, clone, got_packet); + + av_frame_free(&clone); return ret; } + if ((ret = ff_alloc_packet2(avctx, pkt, a->mb_height * a->mb_width * MAX_MB_SIZE + + FF_MIN_BUFFER_SIZE, 0)) < 0) + return ret; + init_put_bits(&a->pb, pkt->data, pkt->size); for (mb_y = 0; mb_y < a->mb_height2; mb_y++) { @@ -282,18 +322,11 @@ static av_cold int encode_init(AVCodecContext *avctx) int i; const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_asv_common_init(avctx); ff_fdctdsp_init(&a->fdsp, avctx); ff_pixblockdsp_init(&a->pdsp, avctx); - if (avctx->global_quality == 0) + if (avctx->global_quality <= 0) avctx->global_quality = 4 * FF_QUALITY_SCALE; a->inv_qscale = (32 * scale * FF_QUALITY_SCALE + @@ -307,8 +340,13 @@ FF_ENABLE_DEPRECATION_WARNINGS ((uint32_t *) avctx->extradata)[1] = av_le2ne32(AV_RL32("ASUS")); for (i = 0; i < 64; i++) { - int q = 32 * scale * ff_mpeg1_default_intra_matrix[i]; - a->q_intra_matrix[i] = ((a->inv_qscale << 16) + q / 2) / q; + if (a->fdsp.fdct == ff_fdct_ifast) { + int q = 32LL * scale * ff_mpeg1_default_intra_matrix[i] * ff_aanscales[i]; + a->q_intra_matrix[i] = (((int64_t)a->inv_qscale << 30) + q / 2) / q; + } else { + int q = 32 * scale * ff_mpeg1_default_intra_matrix[i]; + a->q_intra_matrix[i] = ((a->inv_qscale << 16) + q / 2) / q; + } } return 0; |