October 2022 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/9] avcodec/x86/simple_idct: Empty MMX state in ff_simple_idct_mmx
by Andreas Rheinhardt 08 Oct '22

08 Oct '22

We currently mostly do not empty the MMX state in our MMX DSP functions; instead we only do so before code that might be using x87 code. This is a violation of the System V i386 ABI (and maybe of other ABIs, too): "The CPU shall be in x87 mode upon entry to a function. Therefore, every function that uses the MMX registers is required to issue an emms or femms instruction after using MMX registers, before returning or calling another function." (See 2.2.1 in [1]) This patch does not intend to change all these functions to abide by the ABI; it only does so for ff_simple_idct_mmx(), as this function can by called by external users, because it is exported via AVDCT (i.e. via avcodec_dct_init()). Without this, the following fragment will assert (in i386): av_force_cpu_flags(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT); int16_t *blk = av_malloc(64 * sizeof(*blk)); AVDCT *avdct = avcodec_dct_alloc(); avcodec_dct_init(avdct); avdct->idct(blk); av_assert0_fpu(); [1]: https://raw.githubusercontent.com/wiki/hjl-tools/x86-psABI/intel386-psABI-1… Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/x86/simple_idct.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/x86/simple_idct.asm b/libavcodec/x86/simple_idct.asm index dcf0da6df1..e3a29efc33 100644 --- a/libavcodec/x86/simple_idct.asm +++ b/libavcodec/x86/simple_idct.asm @@ -845,6 +845,7 @@ INIT_MMX mmx cglobal simple_idct, 1, 2, 8, 128, block, t0 IDCT + emms RET INIT_XMM sse2 -- 2.34.1

2 10

[PATCH 2/2] avformat/mp3dec: remove a call to avio_tell()
by Zhao Zhili 08 Oct '22

08 Oct '22

From: Zhao Zhili <zhilizhao(a)tencent.com> --- libavformat/mp3dec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index a9e494452d..05c13228bc 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -424,15 +424,14 @@ static int mp3_read_header(AVFormatContext *s) } } if (i == 64 * 1024) { - ret = avio_seek(s->pb, off, SEEK_SET); + off = avio_seek(s->pb, off, SEEK_SET); } else { av_log(s, i > 0 ? AV_LOG_INFO : AV_LOG_VERBOSE, "Skipping %d bytes of junk at %"PRId64".\n", i, off); - ret = avio_seek(s->pb, off + i, SEEK_SET); + off = avio_seek(s->pb, off + i, SEEK_SET); } - if (ret < 0) - return ret; + if (off < 0) + return off; - off = avio_tell(s->pb); // the seek index is relative to the end of the xing vbr headers for (int i = 0; i < sti->nb_index_entries; i++) sti->index_entries[i].pos += off; -- 2.25.1

2 2

[PATCH] avformat/mpegtsenc: add pcr_at_keyframe flag
by Zhao Zhili 08 Oct '22

08 Oct '22

From: Zhao Zhili <zhilizhao(a)tencent.com> Add PCR at keyframe can be undesirable when -pcr_period is specified. Add an flag to disable this behavior. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> --- doc/muxers.texi | 2 ++ libavformat/mpegtsenc.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index b2f4326aae..0f576d8096 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1915,6 +1915,8 @@ Conform to System B (DVB) instead of System A (ATSC). Mark the initial packet of each stream as discontinuity. @item nit Emit NIT table. +@item pcr_at_keyframe +Write PCR at key frame. @end table @item mpegts_copyts @var{boolean} diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 5148a6aecd..808d2c04a2 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -112,6 +112,7 @@ typedef struct MpegTSWrite { #define MPEGTS_FLAG_SYSTEM_B 0x08 #define MPEGTS_FLAG_DISCONT 0x10 #define MPEGTS_FLAG_NIT 0x20 +#define MPEGTS_FLAG_PCR_AT_KEYFRAME 0x40 int flags; int copyts; int tables_version; @@ -1566,7 +1567,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, q = get_ts_payload_start(buf); ts_st->discontinuity = 0; } - if (key && is_start && pts != AV_NOPTS_VALUE && + if ((ts->flags & MPEGTS_FLAG_PCR_AT_KEYFRAME) && + key && is_start && pts != AV_NOPTS_VALUE && !is_dvb_teletext /* adaptation+payload forbidden for teletext (ETSI EN 300 472 V1.3.1 4.1) */) { // set Random Access for key frames if (ts_st->pcr_period) @@ -2269,7 +2271,7 @@ static const AVOption options[] = { { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, { "pes_payload_size", "Minimum PES packet payload in bytes", OFFSET(pes_payload_size), AV_OPT_TYPE_INT, { .i64 = DEFAULT_PES_PAYLOAD_SIZE }, 0, INT_MAX, ENC }, - { "mpegts_flags", "MPEG-TS muxing flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, INT_MAX, ENC, "mpegts_flags" }, + { "mpegts_flags", "MPEG-TS muxing flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = MPEGTS_FLAG_PCR_AT_KEYFRAME }, 0, INT_MAX, ENC, "mpegts_flags" }, { "resend_headers", "Reemit PAT/PMT before writing the next packet", 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_REEMIT_PAT_PMT }, 0, INT_MAX, ENC, "mpegts_flags" }, { "latm", "Use LATM packetization for AAC", @@ -2282,6 +2284,8 @@ static const AVOption options[] = { 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_DISCONT }, 0, INT_MAX, ENC, "mpegts_flags" }, { "nit", "Enable NIT transmission", 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_NIT}, 0, INT_MAX, ENC, "mpegts_flags" }, + { "pcr_at_keyframe", "Write PCR at key frame", + 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_PCR_AT_KEYFRAME }, 0, INT_MAX, ENC, "mpegts_flags" }, { "mpegts_copyts", "don't offset dts/pts", OFFSET(copyts), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC }, { "tables_version", "set PAT, PMT, SDT and NIT version", OFFSET(tables_version), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 31, ENC }, { "omit_video_pes_length", "Omit the PES packet length for video packets", -- 2.25.1

2 4

[PATCH 1/9] avcodec/opus_rc: Remove write-only waste from OpusRangeCoder
by Andreas Rheinhardt 08 Oct '22

08 Oct '22

Write-only since e7d977b446194649aa30f2aacc6c17bce7aeb90b (and local to ff_opus_rc_enc_end() before that). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/opus_rc.c | 2 -- libavcodec/opus_rc.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/libavcodec/opus_rc.c b/libavcodec/opus_rc.c index c432eb90c9..2061418e52 100644 --- a/libavcodec/opus_rc.c +++ b/libavcodec/opus_rc.c @@ -383,8 +383,6 @@ void ff_opus_rc_enc_end(OpusRangeCoder *rc, uint8_t *dst, int size) rng_bytes = rc->rng_cur - rc->buf; memcpy(dst, rc->buf, rng_bytes); - rc->waste = size*8 - (rc->rb.bytes*8 + rc->rb.cachelen) - rng_bytes*8; - /* Put the rawbits part, if any */ if (rc->rb.bytes || rc->rb.cachelen) { int i, lap; diff --git a/libavcodec/opus_rc.h b/libavcodec/opus_rc.h index 627f83229e..1b3cb93a15 100644 --- a/libavcodec/opus_rc.h +++ b/libavcodec/opus_rc.h @@ -49,9 +49,6 @@ typedef struct OpusRangeCoder { uint8_t *rng_cur; /* Current range coded byte */ int ext; /* Awaiting propagation */ int rem; /* Carryout flag */ - - /* Encoding stats */ - int waste; } OpusRangeCoder; /** -- 2.34.1

2 9

[crop support for matroska demuxer 1/3] libavcodec: Add crop related fields to structure AVCodecContext and AVCodecParameters.
by OvchinnikovDmitrii 07 Oct '22

07 Oct '22

--- libavcodec/avcodec.h | 8 ++++++++ libavcodec/codec_par.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7365eb5cc0..66df571afc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -585,6 +585,14 @@ typedef struct AVCodecContext { */ int coded_width, coded_height; + /** + * The dimensions of the crop, usually from container. + */ + int crop_top; + int crop_left; + int crop_bottom; + int crop_right; + /** * the number of pictures in a group of pictures, or 0 for intra_only * - encoding: Set by user. diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index 7660791a12..c730a79957 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -210,6 +210,14 @@ typedef struct AVCodecParameters { * Audio only. The channel layout and number of channels. */ AVChannelLayout ch_layout; + + /** + * The dimensions of the crop, usually from container. + */ + int crop_top; + int crop_left; + int crop_bottom; + int crop_right; } AVCodecParameters; /** -- 2.30.0.windows.2

6 9

[PATCH] avcodec: ViewQuest VQC decoder
by Peter Ross 07 Oct '22

07 Oct '22

--- Fixes ticket #5601 doc/general_contents.texi | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 + libavcodec/codec_id.h | 1 + libavcodec/vqcdec.c | 443 ++++++++++++++++++++++++++++++++++++++ libavformat/riff.c | 2 + 7 files changed, 456 insertions(+) create mode 100644 libavcodec/vqcdec.c diff --git a/doc/general_contents.texi b/doc/general_contents.texi index b005cb6c3e..8399fcb6b7 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -1339,6 +1339,7 @@ following image formats are supported: @item TwinVQ (VQF flavor) @tab @tab X @item VIMA @tab @tab X @tab Used in LucasArts SMUSH animations. +@item ViewQuest VQC @tab @tab X @item Vorbis @tab E @tab X @tab A native but very primitive encoder exists. @item Voxware MetaSound @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 592d9347f6..b4c28f166f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -761,6 +761,7 @@ OBJS-$(CONFIG_VP9_QSV_ENCODER) += qsvenc_vp9.o OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o OBJS-$(CONFIG_VP9_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o +OBJS-$(CONFIG_VQC_DECODER) += vqcdec.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o OBJS-$(CONFIG_WAVPACK_ENCODER) += wavpackdata.o wavpackenc.o OBJS-$(CONFIG_WBMP_DECODER) += wbmpdec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index cfeb01ac1c..46ad3b5a25 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -381,6 +381,7 @@ extern const FFCodec ff_vp9_decoder; extern const FFCodec ff_vp9_rkmpp_decoder; extern const FFCodec ff_vp9_v4l2m2m_decoder; extern const FFCodec ff_vqa_decoder; +extern const FFCodec ff_vqc_decoder; extern const FFCodec ff_wbmp_decoder; extern const FFCodec ff_wbmp_encoder; extern const FFCodec ff_webp_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 93b18f9072..24a0433dba 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1916,6 +1916,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Media 100i"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_VQC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "vqc", + .long_name = NULL_IF_CONFIG_SMALL("ViewQuest VQC"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 82874daaa3..f436a2b624 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -319,6 +319,7 @@ enum AVCodecID { AV_CODEC_ID_RADIANCE_HDR, AV_CODEC_ID_WBMP, AV_CODEC_ID_MEDIA100, + AV_CODEC_ID_VQC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/vqcdec.c b/libavcodec/vqcdec.c new file mode 100644 index 0000000000..7297c1387d --- /dev/null +++ b/libavcodec/vqcdec.c @@ -0,0 +1,443 @@ +/* + * ViewQuest VQC decoder + * Copyright (C) 2022 Peter Ross + * + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "get_bits.h" +#include "codec_internal.h" +#include "decode.h" +#include "libavutil/thread.h" + +#define VECTOR_VLC_BITS 6 + +static const uint8_t vector_codes[] = { + 0, 4, 5, 6, 7, 2, 0xc, 0xd, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f +}; + +static const uint8_t vector_nbits[] = { + 2, 4, 4, 4, 4, 2, 4, 4, + 6, 6, 6, 6, 6, 6, 6, 6 +}; + +enum { + SKIP_3 = 0x10, + SKIP_4, + SKIP_5, + SKIP_6, + STOP_RUN, + SIGNED_8BIT, + SIGNED_6BIT +}; + +static const int8_t vector_symbols[] = { + 0, SKIP_3, SKIP_4, SKIP_5, SKIP_6, STOP_RUN, 1, -1, + 2, 3, 4, SIGNED_8BIT, -2, -3, -4, SIGNED_6BIT +}; + +static VLC vector_vlc; + +static av_cold void vqc_init_static_data(void) +{ + static VLCElem code_table[64]; + + vector_vlc.table = code_table; + vector_vlc.table_allocated = FF_ARRAY_ELEMS(code_table); + ff_init_vlc_sparse(&vector_vlc, VECTOR_VLC_BITS, FF_ARRAY_ELEMS(vector_codes), + vector_nbits, 1, 1, + vector_codes, 1, 1, + vector_symbols, 1, 1, + INIT_VLC_USE_NEW_STATIC); +} + +typedef struct VqcContext { + AVFrame *frame; + int16_t codebook[4][256]; + uint8_t * vectors; + int16_t * coeff, *tmp1, *tmp2; +} VqcContext; + +static av_cold int vqc_decode_init(AVCodecContext * avctx) +{ + static AVOnce init_static_once = AV_ONCE_INIT; + VqcContext *s = avctx->priv_data; + + s->vectors = av_malloc((avctx->width * avctx->height * 3) / 2); + if (!s->vectors) + return AVERROR(ENOMEM); + + s->coeff = av_malloc(2 * avctx->width * sizeof(int16_t)); + if (!s->coeff) + return AVERROR(ENOMEM); + + s->tmp1 = av_malloc(avctx->width * sizeof(int16_t) / 2); + if (!s->tmp1) + return AVERROR(ENOMEM); + + s->tmp2 = av_malloc(avctx->width * sizeof(int16_t) / 2); + if (!s->tmp2) + return AVERROR(ENOMEM); + + avctx->pix_fmt = AV_PIX_FMT_YUV420P; + s->frame = av_frame_alloc(); + if (!s->frame) + return AVERROR(ENOMEM); + + ff_thread_once(&init_static_once, vqc_init_static_data); + + return 0; +} + +static int seed_pow1(int x) +{ + return x >= 1 && x <= 5 ? 1 << x : 0; +} + +static int seed_pow2(int x) +{ + return x >= 1 && x <= 4 ? 1 << x : 1; +} + +static int bias(int x, int c) +{ + if (x < 0) + return x - c; + else if (x > 0) + return x + c; + else + return 0; +} + +static void seed_codebooks(VqcContext * s, const int * seed) +{ + int book1 = -256 * seed[3]; + int book2 = -128 * seed[4]; + int book3 = -128 * seed[5]; + int book4 = -128 * seed[6]; + + for (int i = -128; i < 128; i++) { + s->codebook[0][(uint8_t)i] = book1; + s->codebook[1][(uint8_t)i] = bias(book2, seed[0]); + s->codebook[2][(uint8_t)i] = bias(book3, seed[1]); + s->codebook[3][(uint8_t)i] = bias(book4, seed[2]); + + book1 += 2 * seed[3]; + book2 += seed[4]; + book3 += seed[5]; + book4 += seed[6]; + } +} + +static void decode_vectors(VqcContext * s, const uint8_t * buf, int size, int width, int height) +{ + GetBitContext gb; + uint8_t * vectors = s->vectors; + uint8_t * vectors_end = s->vectors + (width * height * 3) / 2; + + memset(vectors, 0, 3 * width * height / 2); + + init_get_bits8(&gb, buf, size); + + for (int i = 0; i < 3 * width * height / 2 / 32; i++) { + uint8_t * dst = vectors; + int code; + + *dst++ = get_bits(&gb, 8); + *dst++ = get_bits(&gb, 8); + + while (show_bits(&gb, 2) != 2) { + + if (dst >= vectors_end - 1) + return; + + if (show_bits(&gb, 8) < 16) { + *dst++ = 0; + *dst++ = 0; + skip_bits(&gb, 4); + continue; + } + + code = get_vlc2(&gb, vector_vlc.table, VECTOR_VLC_BITS, 1); + switch(code) { + case SKIP_3: dst += 3; break; + case SKIP_4: dst += 4; break; + case SKIP_5: dst += 5; break; + case SKIP_6: dst += 6; break; + case SIGNED_8BIT: *dst++ = get_bits(&gb, 8); break; + case SIGNED_6BIT: *dst++ = get_sbits(&gb, 6); break; + default: + *dst++ = code; + } + } + + skip_bits(&gb, 2); + vectors += 32; + } +} + +static void load_coeffs(VqcContext * s, const uint8_t * v, int width, int coeff_width) +{ + int16_t * c0 = s->coeff; + int16_t * c1 = s->coeff + coeff_width; + int16_t * c0_125 = s->coeff + (coeff_width >> 3); + int16_t * c1_125 = s->coeff + coeff_width + (coeff_width >> 3); + int16_t * c0_25 = s->coeff + (coeff_width >> 2); + int16_t * c1_25 = s->coeff + coeff_width + (coeff_width >> 2); + int16_t * c0_5 = s->coeff + (coeff_width >> 1); + int16_t * c1_5 = s->coeff + coeff_width + (coeff_width >> 1); + + for (int i = 0; i < width; i++) { + c0[0] = s->codebook[0][v[0]]; + c0[1] = s->codebook[0][v[1]]; + c0 += 2; + + c1[0] = s->codebook[0][v[2]]; + c1[1] = s->codebook[0][v[3]]; + c1 += 2; + + c0_125[0] = s->codebook[1][v[4]]; + c0_125[1] = s->codebook[1][v[5]]; + c0_125 += 2; + + c1_125[0] = s->codebook[1][v[6]]; + c1_125[1] = s->codebook[1][v[7]]; + c1_125 += 2; + + c0_25[0] = s->codebook[2][v[8]]; + c0_25[1] = s->codebook[2][v[9]]; + c0_25[2] = s->codebook[2][v[10]]; + c0_25[3] = s->codebook[2][v[11]]; + c0_25 += 4; + + c1_25[0] = s->codebook[2][v[12]]; + c1_25[1] = s->codebook[2][v[13]]; + c1_25[2] = s->codebook[2][v[14]]; + c1_25[3] = s->codebook[2][v[15]]; + c1_25 += 4; + + if (v[16] | v[17] | v[18] | v[19]) { + c0_5[0] = s->codebook[3][v[16]]; + c0_5[1] = s->codebook[3][v[17]]; + c0_5[2] = s->codebook[3][v[18]]; + c0_5[3] = s->codebook[3][v[19]]; + } else { + c0_5[0] = c0_5[1] = c0_5[2] = c0_5[3] = 0; + } + + if (v[20] | v[21] | v[22] | v[23]) { + c0_5[4] = s->codebook[3][v[20]]; + c0_5[5] = s->codebook[3][v[21]]; + c0_5[6] = s->codebook[3][v[22]]; + c0_5[7] = s->codebook[3][v[23]]; + } else { + c0_5[4] = c0_5[5] = c0_5[6] = c0_5[7] = 0; + } + c0_5 += 8; + + if (v[24] | v[25] | v[26] | v[27]) { + c1_5[0] = s->codebook[3][v[24]]; + c1_5[1] = s->codebook[3][v[25]]; + c1_5[2] = s->codebook[3][v[26]]; + c1_5[3] = s->codebook[3][v[27]]; + } else { + c1_5[0] = c1_5[1] = c1_5[2] = c1_5[3] = 0; + } + + if (v[28] | v[29] | v[30] | v[31]) { + c1_5[4] = s->codebook[3][v[28]]; + c1_5[5] = s->codebook[3][v[29]]; + c1_5[6] = s->codebook[3][v[30]]; + c1_5[7] = s->codebook[3][v[31]]; + } else { + c1_5[4] = c1_5[5] = c1_5[6] = c1_5[7] = 0; + } + c1_5 += 8; + + v += 32; + } +} + +static void transform1(const int16_t * a, const int16_t * b, int16_t * dst, int width) +{ + int s0 = a[0] + (b[0] >> 1); + + for (int i = 0; i < width / 2 - 1; i++) { + dst[i * 2] = s0; + s0 = a[i + 1] + ((b[i] + b[i + 1]) >> 1); + dst[i * 2 + 1] = ((dst[i * 2] + s0) >> 1) - 2 * b[i]; + } + + dst[width - 2] = s0; + dst[width - 1] = a[width / 2 - 1] + ((b[width / 2 - 2] - 2 * b[width / 2 - 1]) >> 2) - b[width / 2 - 1]; +} + +static uint8_t sat1(int x) +{ + return x >= -128 ? x <= 127 ? x + 0x80 : 0xFF : 0x00; +} + +static uint8_t sat2(int x) +{ + return x >= -128 ? x <= 127 ? x + 0x80 : 0x00 : 0xFF; +} + +static void transform2(const int16_t * a, const int16_t * b, uint8_t * dst, int width) +{ + int s0 = a[0] + (b[0] >> 1); + int tmp; + + for (int i = 0; i < width / 2 - 1; i++) { + dst[i * 2] = sat1(s0); + tmp = a[i + 1] + ((b[i] + b[i + 1]) >> 1); + dst[i * 2 + 1] = sat1(((tmp + s0) >> 1) - 2 * b[i]); + s0 = tmp; + } + + dst[width - 2] = sat2(s0); + dst[width - 1] = sat2(a[width / 2 - 1] + ((b[width / 2 - 2] - 2 * b[width / 2 - 1]) >> 2) - b[width / 2 - 1]); +} + +static void decode_strip(VqcContext * s, uint8_t * dst, int stride, int width) +{ + const int16_t * coeff; + + for (int i = 0; i < width; i++) { + int v0 = s->coeff[i]; + int v1 = s->coeff[width + i]; + s->coeff[i] = v0 - v1; + s->coeff[width + i] = v0 + v1; + } + + coeff = s->coeff; + + transform1(coeff, coeff + width / 8, s->tmp1, width / 4); + transform1(s->tmp1, coeff + width / 4, s->tmp2, width / 2); + transform2(s->tmp2, coeff + width / 2, dst, width); + + coeff += width; + dst += stride; + + transform1(coeff, coeff + width / 8, s->tmp1, width / 4); + transform1(s->tmp1, coeff + width / 4, s->tmp2, width / 2); + transform2(s->tmp2, coeff + width / 2, dst, width); +} + +static void decode_frame(VqcContext * s, int width, int height) +{ + uint8_t * vectors = s->vectors; + uint8_t * y = s->frame->data[0]; + uint8_t * u = s->frame->data[1]; + uint8_t * v = s->frame->data[2]; + + for (int j = 0; j < height / 4; j++) { + load_coeffs(s, vectors, width / 16, width); + decode_strip(s, y, s->frame->linesize[0], width); + vectors += 2 * width; + y += 2 * s->frame->linesize[0]; + + load_coeffs(s, vectors, width / 32, width / 2); + decode_strip(s, u, s->frame->linesize[1], width / 2); + vectors += width; + u += 2 * s->frame->linesize[1]; + + load_coeffs(s, vectors, width / 16, width); + decode_strip(s, y, s->frame->linesize[0], width); + vectors += 2 * width; + y += 2 * s->frame->linesize[0]; + + load_coeffs(s, vectors, width / 32, width / 2); + decode_strip(s, v, s->frame->linesize[2], width / 2); + vectors += width; + v += 2 * s->frame->linesize[2]; + } +} + +static int vqc_decode_frame(AVCodecContext *avctx, AVFrame * rframe, + int * got_frame, AVPacket * avpkt) +{ + VqcContext *s = avctx->priv_data; + int ret; + uint8_t * buf = avpkt->data; + int cache, seed[7], gamma, contrast; + + if (avpkt->size < 7) + return AVERROR_INVALIDDATA; + + if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0) + return ret; + + av_log(avctx, AV_LOG_DEBUG, "VQC%d format\n", (buf[2] & 1) + 1); + + if (((buf[0] >> 1) & 7) != 5) { + avpriv_request_sample(avctx, "subversion != 5\n"); + return AVERROR_PATCHWELCOME; + } + + cache = buf[4] | (AV_RL16(buf + 5) << 8); + seed[2] = seed_pow1((cache >> 1) & 7); + seed[1] = seed_pow1((cache >> 4) & 7); + seed[0] = seed_pow1((cache >> 7) & 7); + seed[6] = seed_pow2((cache >> 10) & 7); + seed[5] = seed_pow2((cache >> 13) & 7); + seed[4] = seed_pow2((cache >> 16) & 7); + seed[3] = seed_pow2((cache >> 19) & 7); + + gamma = buf[0] >> 4; + contrast = AV_RL16(buf + 2) >> 1; + if (gamma || contrast) + avpriv_request_sample(avctx, "gamma=0x%x, contrast=0x%x\n", gamma, contrast); + + seed_codebooks(s, seed); + decode_vectors(s, buf + 7, avpkt->size - 7, avctx->width, avctx->height); + decode_frame(s, avctx->width, avctx->height); + + if ((ret = av_frame_ref(rframe, s->frame)) < 0) + return ret; + + *got_frame = 1; + + return avpkt->size; +} + +static av_cold int vqc_decode_end(AVCodecContext * avctx) +{ + VqcContext *s = avctx->priv_data; + + av_freep(&s->vectors); + av_freep(&s->coeff); + av_freep(&s->tmp1); + av_freep(&s->tmp2); + av_frame_free(&s->frame); + + return 0; +} + +const FFCodec ff_vqc_decoder = { + .p.name = "vqc", + CODEC_LONG_NAME("ViewQuest VQC"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_VQC, + .priv_data_size = sizeof(VqcContext), + .init = vqc_decode_init, + .close = vqc_decode_end, + FF_CODEC_DECODE_CB(vqc_decode_frame), + .p.capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, +}; diff --git a/libavformat/riff.c b/libavformat/riff.c index 0d3f322545..7319406b39 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -499,6 +499,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MVHA, MKTAG('M', 'V', 'H', 'A') }, { AV_CODEC_ID_MV30, MKTAG('M', 'V', '3', '0') }, { AV_CODEC_ID_NOTCHLC, MKTAG('n', 'l', 'c', '1') }, + { AV_CODEC_ID_VQC, MKTAG('V', 'Q', 'C', '1') }, + { AV_CODEC_ID_VQC, MKTAG('V', 'Q', 'C', '2') }, { AV_CODEC_ID_NONE, 0 } }; -- 2.35.1 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

3 6

[PATCH 01/14] avcodec/ylc: Remove inclusion of huffyuvdsp.h
by Andreas Rheinhardt 07 Oct '22

07 Oct '22

Also improve the other headers a bit. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/ylc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index 3ea6749ffe..29c10f05da 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -18,21 +18,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> #define YLC_VLC_BITS 10 -#include "libavutil/imgutils.h" -#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" +#include "libavutil/pixfmt.h" #include "avcodec.h" #include "bswapdsp.h" #include "codec_internal.h" #include "get_bits.h" -#include "huffyuvdsp.h" #include "thread.h" #include "unary.h" -- 2.34.1

1 15

[PATCH 1/2] avcodec/msmpeg4enc: Fix indentation
by Andreas Rheinhardt 07 Oct '22

07 Oct '22

Forgotten after 2b9ab1d54a35f7d689b2396cfc59f9dbdcae391f. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/msmpeg4enc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index e40acdf3fc..f0d0045e69 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -279,15 +279,15 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) void ff_msmpeg4_encode_ext_header(MpegEncContext * s) { - unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); - put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 + unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); + put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 - put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); + put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047)); - if(s->msmpeg4_version>=3) - put_bits(&s->pb, 1, s->flipflop_rounding); - else - av_assert0(s->flipflop_rounding==0); + if (s->msmpeg4_version >= 3) + put_bits(&s->pb, 1, s->flipflop_rounding); + else + av_assert0(!s->flipflop_rounding); } void ff_msmpeg4_encode_motion(MpegEncContext * s, -- 2.34.1

1 2

[PATCH] avcodec/asv: Split ASV1Context into decoder and encoder contexts
by Andreas Rheinhardt 07 Oct '22

07 Oct '22

A lot of the stuff in ASV1Context is actually only used by decoders or encoders, but not both: Of the seven contexts in ASV1Context, only the BswapDSPContext is used by both. So splitting makes sense. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/asv.c | 4 ++- libavcodec/asv.h | 25 ++-------------- libavcodec/asvdec.c | 72 ++++++++++++++++++++++++++++----------------- libavcodec/asvenc.c | 69 ++++++++++++++++++++++++++----------------- 4 files changed, 92 insertions(+), 78 deletions(-) diff --git a/libavcodec/asv.c b/libavcodec/asv.c index dcae90982a..3aa08c30c0 100644 --- a/libavcodec/asv.c +++ b/libavcodec/asv.c @@ -25,6 +25,8 @@ #include <stdint.h> +#include "libavutil/attributes.h" + #include "asv.h" #include "avcodec.h" #include "bswapdsp.h" @@ -88,7 +90,7 @@ const uint16_t ff_asv2_level_tab[63][2] = { av_cold void ff_asv_common_init(AVCodecContext *avctx) { - ASV1Context *const a = avctx->priv_data; + ASVCommonContext *const a = avctx->priv_data; ff_bswapdsp_init(&a->bbdsp); diff --git a/libavcodec/asv.h b/libavcodec/asv.h index 269bbe7c18..7c0983a497 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -28,38 +28,17 @@ #include <stdint.h> -#include "libavutil/mem_internal.h" - #include "avcodec.h" -#include "blockdsp.h" #include "bswapdsp.h" -#include "fdctdsp.h" -#include "idctdsp.h" -#include "get_bits.h" -#include "pixblockdsp.h" -#include "put_bits.h" -typedef struct ASV1Context { +typedef struct ASVCommonContext { AVCodecContext *avctx; - BlockDSPContext bdsp; BswapDSPContext bbdsp; - FDCTDSPContext fdsp; - IDCTDSPContext idsp; - PixblockDSPContext pdsp; - PutBitContext pb; - GetBitContext gb; - ScanTable scantable; - int inv_qscale; int mb_width; int mb_height; int mb_width2; int mb_height2; - DECLARE_ALIGNED(32, int16_t, block)[6][64]; - uint16_t intra_matrix[64]; - int q_intra_matrix[64]; - uint8_t *bitstream_buffer; - unsigned int bitstream_buffer_size; -} ASV1Context; +} ASVCommonContext; extern const uint8_t ff_asv_scantab[64]; extern const uint8_t ff_asv_ccp_tab[17][2]; diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 4ca370d1ec..81260058fc 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -25,6 +25,7 @@ #include "libavutil/attributes.h" #include "libavutil/mem.h" +#include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "asv.h" @@ -33,6 +34,7 @@ #include "codec_internal.h" #include "config_components.h" #include "decode.h" +#include "get_bits.h" #include "idctdsp.h" #include "mpeg12data.h" @@ -48,6 +50,20 @@ static VLC dc_ccp_vlc; static VLC ac_ccp_vlc; static VLC asv2_level_vlc; +typedef struct ASVDecContext { + ASVCommonContext c; + + GetBitContext gb; + + BlockDSPContext bdsp; + IDCTDSPContext idsp; + ScanTable scantable; + DECLARE_ALIGNED(32, int16_t, block)[6][64]; + uint16_t intra_matrix[64]; + uint8_t *bitstream_buffer; + unsigned int bitstream_buffer_size; +} ASVDecContext; + static av_cold void init_vlcs(void) { INIT_VLC_STATIC(&ccp_vlc, CCP_VLC_BITS, 17, @@ -106,7 +122,7 @@ static inline int asv2_get_level(GetBitContext *gb) return code - 31; } -static inline int asv1_decode_block(ASV1Context *a, int16_t block[64]) +static inline int asv1_decode_block(ASVDecContext *a, int16_t block[64]) { int i; @@ -119,7 +135,7 @@ static inline int asv1_decode_block(ASV1Context *a, int16_t block[64]) if (ccp == 16) break; if (ccp < 0 || i >= 10) { - av_log(a->avctx, AV_LOG_ERROR, "coded coeff pattern damaged\n"); + av_log(a->c.avctx, AV_LOG_ERROR, "coded coeff pattern damaged\n"); return AVERROR_INVALIDDATA; } @@ -137,7 +153,7 @@ static inline int asv1_decode_block(ASV1Context *a, int16_t block[64]) return 0; } -static inline int asv2_decode_block(ASV1Context *a, int16_t block[64]) +static inline int asv2_decode_block(ASVDecContext *a, int16_t block[64]) { int i, count, ccp; @@ -173,13 +189,13 @@ static inline int asv2_decode_block(ASV1Context *a, int16_t block[64]) return 0; } -static inline int decode_mb(ASV1Context *a, int16_t block[6][64]) +static inline int decode_mb(ASVDecContext *a, int16_t block[6][64]) { int i, ret; a->bdsp.clear_blocks(block[0]); - if (a->avctx->codec_id == AV_CODEC_ID_ASV1) { + if (a->c.avctx->codec_id == AV_CODEC_ID_ASV1) { for (i = 0; i < 6; i++) { if ((ret = asv1_decode_block(a, block[i])) < 0) return ret; @@ -193,7 +209,7 @@ static inline int decode_mb(ASV1Context *a, int16_t block[6][64]) return 0; } -static inline void idct_put(ASV1Context *a, AVFrame *frame, int mb_x, int mb_y) +static inline void idct_put(ASVDecContext *a, AVFrame *frame, int mb_x, int mb_y) { int16_t(*block)[64] = a->block; int linesize = frame->linesize[0]; @@ -207,7 +223,7 @@ static inline void idct_put(ASV1Context *a, AVFrame *frame, int mb_x, int mb_y) a->idsp.idct_put(dest_y + 8 * linesize, linesize, block[2]); a->idsp.idct_put(dest_y + 8 * linesize + 8, linesize, block[3]); - if (!(a->avctx->flags & AV_CODEC_FLAG_GRAY)) { + if (!(a->c.avctx->flags & AV_CODEC_FLAG_GRAY)) { a->idsp.idct_put(dest_cb, frame->linesize[1], block[4]); a->idsp.idct_put(dest_cr, frame->linesize[2], block[5]); } @@ -216,12 +232,13 @@ static inline void idct_put(ASV1Context *a, AVFrame *frame, int mb_x, int mb_y) static int decode_frame(AVCodecContext *avctx, AVFrame *p, int *got_frame, AVPacket *avpkt) { - ASV1Context *const a = avctx->priv_data; + ASVDecContext *const a = avctx->priv_data; + const ASVCommonContext *const c = &a->c; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - int mb_x, mb_y, ret; + int ret; - if (buf_size * 8LL < a->mb_height * a->mb_width * 13LL) + if (buf_size * 8LL < c->mb_height * c->mb_width * 13LL) return AVERROR_INVALIDDATA; if ((ret = ff_get_buffer(avctx, p, 0)) < 0) @@ -235,7 +252,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, if (!a->bitstream_buffer) return AVERROR(ENOMEM); - a->bbdsp.bswap_buf((uint32_t *) a->bitstream_buffer, + c->bbdsp.bswap_buf((uint32_t *) a->bitstream_buffer, (const uint32_t *) buf, buf_size / 4); ret = init_get_bits8(&a->gb, a->bitstream_buffer, buf_size); } else { @@ -244,8 +261,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, if (ret < 0) return ret; - for (mb_y = 0; mb_y < a->mb_height2; mb_y++) { - for (mb_x = 0; mb_x < a->mb_width2; mb_x++) { + for (int mb_y = 0; mb_y < c->mb_height2; mb_y++) { + for (int mb_x = 0; mb_x < c->mb_width2; mb_x++) { if ((ret = decode_mb(a, a->block)) < 0) return ret; @@ -253,9 +270,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, } } - if (a->mb_width2 != a->mb_width) { - mb_x = a->mb_width2; - for (mb_y = 0; mb_y < a->mb_height2; mb_y++) { + if (c->mb_width2 != c->mb_width) { + int mb_x = c->mb_width2; + for (int mb_y = 0; mb_y < c->mb_height2; mb_y++) { if ((ret = decode_mb(a, a->block)) < 0) return ret; @@ -263,9 +280,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, } } - if (a->mb_height2 != a->mb_height) { - mb_y = a->mb_height2; - for (mb_x = 0; mb_x < a->mb_width; mb_x++) { + if (c->mb_height2 != c->mb_height) { + int mb_y = c->mb_height2; + for (int mb_x = 0; mb_x < c->mb_width; mb_x++) { if ((ret = decode_mb(a, a->block)) < 0) return ret; @@ -283,8 +300,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, static av_cold int decode_init(AVCodecContext *avctx) { static AVOnce init_static_once = AV_ONCE_INIT; - ASV1Context *const a = avctx->priv_data; + ASVDecContext *const a = avctx->priv_data; const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2; + int inv_qscale; int i; if (avctx->extradata_size < 1) { @@ -297,19 +315,19 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_init_scantable(a->idsp.idct_permutation, &a->scantable, ff_asv_scantab); avctx->pix_fmt = AV_PIX_FMT_YUV420P; - if (avctx->extradata_size < 1 || (a->inv_qscale = avctx->extradata[0]) == 0) { + if (avctx->extradata_size < 1 || (inv_qscale = avctx->extradata[0]) == 0) { av_log(avctx, AV_LOG_ERROR, "illegal qscale 0\n"); if (avctx->codec_id == AV_CODEC_ID_ASV1) - a->inv_qscale = 6; + inv_qscale = 6; else - a->inv_qscale = 10; + inv_qscale = 10; } for (i = 0; i < 64; i++) { int index = ff_asv_scantab[i]; a->intra_matrix[i] = 64 * scale * ff_mpeg1_default_intra_matrix[index] / - a->inv_qscale; + inv_qscale; } ff_thread_once(&init_static_once, init_vlcs); @@ -319,7 +337,7 @@ static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_end(AVCodecContext *avctx) { - ASV1Context *const a = avctx->priv_data; + ASVDecContext *const a = avctx->priv_data; av_freep(&a->bitstream_buffer); a->bitstream_buffer_size = 0; @@ -333,7 +351,7 @@ const FFCodec ff_asv1_decoder = { CODEC_LONG_NAME("ASUS V1"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV1, - .priv_data_size = sizeof(ASV1Context), + .priv_data_size = sizeof(ASVDecContext), .init = decode_init, .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), @@ -347,7 +365,7 @@ const FFCodec ff_asv2_decoder = { CODEC_LONG_NAME("ASUS V2"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV2, - .priv_data_size = sizeof(ASV1Context), + .priv_data_size = sizeof(ASVDecContext), .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 25ea96e64e..e185d501b3 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -27,6 +27,7 @@ #include "libavutil/attributes.h" #include "libavutil/mem.h" +#include "libavutil/mem_internal.h" #include "aandcttab.h" #include "asv.h" @@ -36,6 +37,19 @@ #include "encode.h" #include "fdctdsp.h" #include "mpeg12data.h" +#include "pixblockdsp.h" +#include "put_bits.h" + +typedef struct ASVEncContext { + ASVCommonContext c; + + PutBitContext pb; + + PixblockDSPContext pdsp; + FDCTDSPContext fdsp; + DECLARE_ALIGNED(32, int16_t, block)[6][64]; + int q_intra_matrix[64]; +} ASVEncContext; static inline void asv1_put_level(PutBitContext *pb, int level) { @@ -49,7 +63,7 @@ static inline void asv1_put_level(PutBitContext *pb, int level) } } -static inline void asv2_put_level(ASV1Context *a, PutBitContext *pb, int level) +static inline void asv2_put_level(ASVEncContext *a, PutBitContext *pb, int level) { unsigned int index = level + 31; @@ -58,14 +72,14 @@ static inline void asv2_put_level(ASV1Context *a, PutBitContext *pb, int level) } else { put_bits_le(pb, 5, 0); /* Escape code */ if (level < -128 || level > 127) { - av_log(a->avctx, AV_LOG_WARNING, "Clipping level %d, increase qscale\n", level); + av_log(a->c.avctx, AV_LOG_WARNING, "Clipping level %d, increase qscale\n", level); level = av_clip_int8(level); } put_bits_le(pb, 8, level & 0xFF); } } -static inline void asv1_encode_block(ASV1Context *a, int16_t block[64]) +static inline void asv1_encode_block(ASVEncContext *a, int16_t block[64]) { int i; int nc_count = 0; @@ -111,7 +125,7 @@ static inline void asv1_encode_block(ASV1Context *a, int16_t block[64]) put_bits(&a->pb, 5, 0xF); /* End of block */ } -static inline void asv2_encode_block(ASV1Context *a, int16_t block[64]) +static inline void asv2_encode_block(ASVEncContext *a, int16_t block[64]) { int i; int count = 0; @@ -166,13 +180,13 @@ static inline void asv2_encode_block(ASV1Context *a, int16_t block[64]) #define MAX_MB_SIZE (30 * 16 * 16 * 3 / 2 / 8) -static inline int encode_mb(ASV1Context *a, int16_t block[6][64]) +static inline int encode_mb(ASVEncContext *a, int16_t block[6][64]) { int i; av_assert0(put_bytes_left(&a->pb, 0) >= MAX_MB_SIZE); - if (a->avctx->codec_id == AV_CODEC_ID_ASV1) { + if (a->c.avctx->codec_id == AV_CODEC_ID_ASV1) { for (i = 0; i < 6; i++) asv1_encode_block(a, block[i]); } else { @@ -183,7 +197,7 @@ static inline int encode_mb(ASV1Context *a, int16_t block[6][64]) return 0; } -static inline void dct_get(ASV1Context *a, const AVFrame *frame, +static inline void dct_get(ASVEncContext *a, const AVFrame *frame, int mb_x, int mb_y) { int16_t (*block)[64] = a->block; @@ -201,7 +215,7 @@ static inline void dct_get(ASV1Context *a, const AVFrame *frame, for (i = 0; i < 4; i++) a->fdsp.fdct(block[i]); - if (!(a->avctx->flags & AV_CODEC_FLAG_GRAY)) { + if (!(a->c.avctx->flags & AV_CODEC_FLAG_GRAY)) { a->pdsp.get_pixels(block[4], ptr_cb, frame->linesize[1]); a->pdsp.get_pixels(block[5], ptr_cr, frame->linesize[2]); for (i = 4; i < 6; i++) @@ -212,9 +226,9 @@ static inline void dct_get(ASV1Context *a, const AVFrame *frame, static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) { - ASV1Context *const a = avctx->priv_data; + ASVEncContext *const a = avctx->priv_data; + const ASVCommonContext *const c = &a->c; int size, ret; - int mb_x, mb_y; if (pict->width % 16 || pict->height % 16) { AVFrame *clone = av_frame_alloc(); @@ -258,30 +272,30 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; } - if ((ret = ff_alloc_packet(avctx, pkt, a->mb_height * a->mb_width * MAX_MB_SIZE + + if ((ret = ff_alloc_packet(avctx, pkt, c->mb_height * c->mb_width * MAX_MB_SIZE + AV_INPUT_BUFFER_MIN_SIZE)) < 0) return ret; init_put_bits(&a->pb, pkt->data, pkt->size); - for (mb_y = 0; mb_y < a->mb_height2; mb_y++) { - for (mb_x = 0; mb_x < a->mb_width2; mb_x++) { + for (int mb_y = 0; mb_y < c->mb_height2; mb_y++) { + for (int mb_x = 0; mb_x < c->mb_width2; mb_x++) { dct_get(a, pict, mb_x, mb_y); encode_mb(a, a->block); } } - if (a->mb_width2 != a->mb_width) { - mb_x = a->mb_width2; - for (mb_y = 0; mb_y < a->mb_height2; mb_y++) { + if (c->mb_width2 != c->mb_width) { + int mb_x = c->mb_width2; + for (int mb_y = 0; mb_y < c->mb_height2; mb_y++) { dct_get(a, pict, mb_x, mb_y); encode_mb(a, a->block); } } - if (a->mb_height2 != a->mb_height) { - mb_y = a->mb_height2; - for (mb_x = 0; mb_x < a->mb_width; mb_x++) { + if (c->mb_height2 != c->mb_height) { + int mb_y = c->mb_height2; + for (int mb_x = 0; mb_x < c->mb_width; mb_x++) { dct_get(a, pict, mb_x, mb_y); encode_mb(a, a->block); } @@ -296,7 +310,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, size = (put_bytes_output(&a->pb) + 3) / 4; if (avctx->codec_id == AV_CODEC_ID_ASV1) { - a->bbdsp.bswap_buf((uint32_t *) pkt->data, + c->bbdsp.bswap_buf((uint32_t *) pkt->data, (uint32_t *) pkt->data, size); } @@ -308,9 +322,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, static av_cold int encode_init(AVCodecContext *avctx) { - ASV1Context *const a = avctx->priv_data; + ASVEncContext *const a = avctx->priv_data; int i; const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2; + int inv_qscale; ff_asv_common_init(avctx); ff_fdctdsp_init(&a->fdsp, avctx); @@ -319,23 +334,23 @@ static av_cold int encode_init(AVCodecContext *avctx) if (avctx->global_quality <= 0) avctx->global_quality = 4 * FF_QUALITY_SCALE; - a->inv_qscale = (32 * scale * FF_QUALITY_SCALE + + inv_qscale = (32 * scale * FF_QUALITY_SCALE + avctx->global_quality / 2) / avctx->global_quality; avctx->extradata = av_mallocz(8); if (!avctx->extradata) return AVERROR(ENOMEM); avctx->extradata_size = 8; - ((uint32_t *) avctx->extradata)[0] = av_le2ne32(a->inv_qscale); + AV_WLA(32, avctx->extradata, inv_qscale); ((uint32_t *) avctx->extradata)[1] = av_le2ne32(AV_RL32("ASUS")); for (i = 0; i < 64; i++) { 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; + a->q_intra_matrix[i] = (((int64_t)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; + a->q_intra_matrix[i] = ((inv_qscale << 16) + q / 2) / q; } } @@ -349,7 +364,7 @@ const FFCodec ff_asv1_encoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV1, .p.capabilities = AV_CODEC_CAP_DR1, - .priv_data_size = sizeof(ASV1Context), + .priv_data_size = sizeof(ASVEncContext), .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -364,7 +379,7 @@ const FFCodec ff_asv2_encoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_ASV2, .p.capabilities = AV_CODEC_CAP_DR1, - .priv_data_size = sizeof(ASV1Context), + .priv_data_size = sizeof(ASVEncContext), .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, -- 2.34.1

1 3

[PATCH v13 9/9] avcodec/evc: Changes in Changelog and MAINTAINERS files
by Dawid Kozinski 07 Oct '22

07 Oct '22

- Changelog update - MAINTAINERS update Signed-off-by: Dawid Kozinski <d.kozinski(a)samsung.com> --- Changelog | 3 ++- MAINTAINERS | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 14ba8ac874..ff3b9aebf1 100644 --- a/Changelog +++ b/Changelog @@ -44,6 +44,8 @@ version 5.1: - remap_opencl filter - added chromakey_cuda filter - added bilateral_cuda filter +- eXtra-fast Essential Video Encoder (XEVE) +- eXtra-fast Essential Video Decoder (XEVD) version 5.0: @@ -91,7 +93,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer diff --git a/MAINTAINERS b/MAINTAINERS index eebfa5cfb7..df8d8eca73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -200,6 +200,8 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxevd.c Dawid Kozinski + libxeve.c, Dawid Kozinski libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -420,6 +422,9 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evc.c, evc.h Dawid Kozinski + evcdec.c Dawid Kozinski + evc_parser.c Dawid Kozinski ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer -- 2.17.1

1 0