October 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/vf_nlmeans: reduce scope of some variables
by Paul B Mahol 29 Oct '21

29 Oct '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Oct 24 14:16:31 2021 +0200| [81380d221c2b1f9a72b08e4193e6f81774c07b2f] | committer: Paul B Mahol avfilter/vf_nlmeans: reduce scope of some variables > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81380d221c2b1f9a7… --- libavfilter/vf_nlmeans.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 74fc3923b3..b8d8bb2ec0 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -101,14 +101,13 @@ static void compute_safe_ssd_integral_image_c(uint32_t *dst, ptrdiff_t dst_lines const uint8_t *s2, ptrdiff_t linesize2, int w, int h) { - int x, y; const uint32_t *dst_top = dst - dst_linesize_32; /* SIMD-friendly assumptions allowed here */ av_assert2(!(w & 0xf) && w >= 16 && h >= 1); - for (y = 0; y < h; y++) { - for (x = 0; x < w; x += 4) { + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x += 4) { const int d0 = s1[x ] - s2[x ]; const int d1 = s1[x + 1] - s2[x + 1]; const int d2 = s1[x + 2] - s2[x + 2]; @@ -161,14 +160,12 @@ static inline void compute_unsafe_ssd_integral_image(uint32_t *dst, ptrdiff_t ds int offx, int offy, int r, int sw, int sh, int w, int h) { - int x, y; - - for (y = starty; y < starty + h; y++) { + for (int y = starty; y < starty + h; y++) { uint32_t acc = dst[y*dst_linesize_32 + startx - 1] - dst[(y-1)*dst_linesize_32 + startx - 1]; const int s1y = av_clip(y - r, 0, sh - 1); const int s2y = av_clip(y - (r + offy), 0, sh - 1); - for (x = startx; x < startx + w; x++) { + for (int x = startx; x < startx + w; x++) { const int s1x = av_clip(x - r, 0, sw - 1); const int s2x = av_clip(x - (r + offx), 0, sw - 1); const uint8_t v1 = src[s1y*linesize + s1x]; @@ -334,7 +331,6 @@ struct thread_data { static int nlmeans_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { - int x, y; NLMeansContext *s = ctx->priv; const struct thread_data *td = arg; const ptrdiff_t src_linesize = td->src_linesize; @@ -349,10 +345,10 @@ static int nlmeans_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs const int dist_d = dist_b * s->ii_lz_32; const int dist_e = dist_d + dist_b; - for (y = starty; y < endy; y++) { + for (int y = starty; y < endy; y++) { const uint8_t *src = td->src + y*src_linesize; struct weighted_avg *wa = s->wa + y*s->wa_linesize; - for (x = td->startx; x < td->endx; x++) { + for (int x = td->startx; x < td->endx; x++) { /* * M is a discrete map where every entry contains the sum of all the entries * in the rectangle from the top-left origin of M to its coordinate. In the @@ -404,10 +400,8 @@ static void weight_averages(uint8_t *dst, ptrdiff_t dst_linesize, struct weighted_avg *wa, ptrdiff_t wa_linesize, int w, int h) { - int x, y; - - for (y = 0; y < h; y++) { - for (x = 0; x < w; x++) { + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) { // Also weight the centered pixel wa[x].total_weight += 1.f; wa[x].sum += 1.f * src[x]; @@ -423,7 +417,6 @@ static int nlmeans_plane(AVFilterContext *ctx, int w, int h, int p, int r, uint8_t *dst, ptrdiff_t dst_linesize, const uint8_t *src, ptrdiff_t src_linesize) { - int offx, offy; NLMeansContext *s = ctx->priv; /* patches center points cover the whole research window so the patches * themselves overflow the research window */ @@ -433,8 +426,8 @@ static int nlmeans_plane(AVFilterContext *ctx, int w, int h, int p, int r, memset(s->wa, 0, s->wa_linesize * h * sizeof(*s->wa)); - for (offy = -r; offy <= r; offy++) { - for (offx = -r; offx <= r; offx++) { + for (int offy = -r; offy <= r; offy++) { + for (int offx = -r; offx <= r; offx++) { if (offx || offy) { struct thread_data td = { .src = src + offy*src_linesize + offx, @@ -464,7 +457,6 @@ static int nlmeans_plane(AVFilterContext *ctx, int w, int h, int p, int r, static int filter_frame(AVFilterLink *inlink, AVFrame *in) { - int i; AVFilterContext *ctx = inlink->dst; NLMeansContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; @@ -476,7 +468,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } av_frame_copy_props(out, in); - for (i = 0; i < s->nb_planes; i++) { + for (int i = 0; i < s->nb_planes; i++) { const int w = i ? s->chroma_w : inlink->w; const int h = i ? s->chroma_h : inlink->h; const int p = i ? s->patch_hsize_uv : s->patch_hsize; @@ -508,7 +500,6 @@ void ff_nlmeans_init(NLMeansDSPContext *dsp) static av_cold int init(AVFilterContext *ctx) { - int i; NLMeansContext *s = ctx->priv; const double h = s->sigma * 10.; @@ -517,7 +508,7 @@ static av_cold int init(AVFilterContext *ctx) s->weight_lut = av_calloc(s->max_meaningful_diff, sizeof(*s->weight_lut)); if (!s->weight_lut) return AVERROR(ENOMEM); - for (i = 0; i < s->max_meaningful_diff; i++) + for (int i = 0; i < s->max_meaningful_diff; i++) s->weight_lut[i] = exp(-i * s->pdiff_scale); CHECK_ODD_FIELD(research_size, "Luma research window");

1 0

avformat/demux: preserve AV_PKT_FLAG_CORRUPT in parse_packet
by Alex Shumsky 29 Oct '21

29 Oct '21

ffmpeg | branch: master | Alex Shumsky <alexthreed(a)gmail.com> | Thu Oct 21 19:21:31 2021 +0300| [3925b826df365a2365118600bd7910cbca95286d] | committer: James Almer avformat/demux: preserve AV_PKT_FLAG_CORRUPT in parse_packet If original packet is corrupted, then parsed packet is probably corrupted too. Let the application decide what to do. Signed-off-by: Alex Shumsky <alexthreed(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3925b826df365a236… --- libavformat/demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 6a4b687bf1..71a1a9bf03 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1179,7 +1179,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, out_pkt->pts = sti->parser->pts; out_pkt->dts = sti->parser->dts; out_pkt->pos = sti->parser->pos; - out_pkt->flags |= pkt->flags & AV_PKT_FLAG_DISCARD; + out_pkt->flags |= pkt->flags & (AV_PKT_FLAG_DISCARD | AV_PKT_FLAG_CORRUPT); if (sti->need_parsing == AVSTREAM_PARSE_FULL_RAW) out_pkt->pos = sti->parser->frame_offset;

1 0

fftools/ffplay: don't disable x11 compositing
by Zane van Iperen 29 Oct '21

29 Oct '21

ffmpeg | branch: master | Zane van Iperen <zane(a)zanevaniperen.com> | Wed Oct 27 02:00:38 2021 +1000| [783935de18f4b4c0e5dab7d328648af034a7e676] | committer: Zane van Iperen fftools/ffplay: don't disable x11 compositing Prevents desktop stutters caused by the change (specifically on KDE). We're not a game, we don't actually need it disabled. Reviewed-by: Marton Balint <cus(a)passwd.hu> Signed-off-by: Zane van Iperen <zane(a)zanevaniperen.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=783935de18f4b4c0e… --- fftools/ffplay.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index ccea0e4578..4b2e69e613 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3746,6 +3746,10 @@ int main(int argc, char **argv) flags |= SDL_WINDOW_BORDERLESS; else flags |= SDL_WINDOW_RESIZABLE; + +#ifdef SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR + SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0"); +#endif window = SDL_CreateWindow(program_name, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, default_width, default_height, flags); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); if (window) {

1 0

avcodec/vqavideo: Decode 15-bit VQA3 files
by Pekka Väänänen 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Pekka Väänänen <pekka.vaananen(a)iki.fi> | Wed Sep 22 15:59:32 2021 +0300| [947d0ce0ea1e54e67bd42a566e7fc1b30d3c7e95] | committer: Paul B Mahol avcodec/vqavideo: Decode 15-bit VQA3 files Adds support for 15-bit VQA3 videos used in Westwood Studios' games. Signed-off-by: Pekka Väänänen <pekka.vaananen(a)iki.fi> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=947d0ce0ea1e54e67… --- libavcodec/vqavideo.c | 268 ++++++++++++++++++++++++++++++++++++++++----- libavformat/westwood_vqa.c | 10 ++ 2 files changed, 248 insertions(+), 30 deletions(-) diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 12698dc2e8..5466e25cdf 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -1,6 +1,7 @@ /* * Westwood Studios VQA Video Decoder - * Copyright (C) 2003 The FFmpeg project + * Copyright (c) 2003 Mike Melanson <melanson(a)pcisys.net> + * Copyright (c) 2021 Pekka Väänänen <pekka.vaananen(a)iki.fi> * * This file is part of FFmpeg. * @@ -61,6 +62,11 @@ * together and the 8-bit pieces together. If most of the vectors are * clustered into one group of 256 vectors, most of the 4-bit index pieces * should be the same. + * + * VQA3 introduces a 15-bit high color codebook, delta coding, replaces + * the above "split byte" scheme with RLE compression, and extends the + * "format80" compression with relative references. In VQA3 the whole + * codebook is always updated as a whole without splitting it into pieces. */ #include <stdio.h> @@ -81,7 +87,7 @@ #define MAX_CODEBOOK_VECTORS 0xFF00 #define SOLID_PIXEL_VECTORS 0x100 #define MAX_VECTORS (MAX_CODEBOOK_VECTORS + SOLID_PIXEL_VECTORS) -#define MAX_CODEBOOK_SIZE (MAX_VECTORS * 4 * 4) +#define MAX_CODEBOOK_SIZE (MAX_VECTORS * 4 * 4 * sizeof(uint16_t)) #define CBF0_TAG MKBETAG('C', 'B', 'F', '0') #define CBFZ_TAG MKBETAG('C', 'B', 'F', 'Z') @@ -90,9 +96,11 @@ #define CPL0_TAG MKBETAG('C', 'P', 'L', '0') #define CPLZ_TAG MKBETAG('C', 'P', 'L', 'Z') #define VPTZ_TAG MKBETAG('V', 'P', 'T', 'Z') +#define VPTR_TAG MKBETAG('V', 'P', 'T', 'R') +#define VPRZ_TAG MKBETAG('V', 'P', 'R', 'Z') typedef struct VqaContext { - + AVFrame *frame; AVCodecContext *avctx; GetByteContext gb; @@ -104,9 +112,9 @@ typedef struct VqaContext { int vector_height; /* height of individual vector */ int vqa_version; /* this should be either 1, 2 or 3 */ - unsigned char *codebook; /* the current codebook */ + unsigned char *codebook; /* the current codebook */ int codebook_size; - unsigned char *next_codebook_buffer; /* accumulator for next codebook */ + unsigned char *next_codebook_buffer; /* accumulator for next codebook */ int next_codebook_buffer_index; unsigned char *decode_buffer; @@ -115,16 +123,15 @@ typedef struct VqaContext { /* number of frames to go before replacing codebook */ int partial_countdown; int partial_count; - } VqaContext; static av_cold int vqa_decode_init(AVCodecContext *avctx) { VqaContext *s = avctx->priv_data; int i, j, codebook_index, ret; + int colors; s->avctx = avctx; - avctx->pix_fmt = AV_PIX_FMT_PAL8; /* make sure the extradata made it */ if (s->avctx->extradata_size != VQA_HEADER_SIZE) { @@ -134,17 +141,12 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) /* load up the VQA parameters from the header */ s->vqa_version = s->avctx->extradata[0]; - switch (s->vqa_version) { - case 1: - case 2: - break; - case 3: - avpriv_report_missing_feature(avctx, "VQA Version %d", s->vqa_version); - return AVERROR_PATCHWELCOME; - default: + + if (s->vqa_version < 1 || s->vqa_version > 3) { avpriv_request_sample(avctx, "VQA Version %i", s->vqa_version); - return AVERROR_PATCHWELCOME; + return AVERROR_INVALIDDATA; } + s->width = AV_RL16(&s->avctx->extradata[6]); s->height = AV_RL16(&s->avctx->extradata[8]); if ((ret = ff_set_dimensions(avctx, s->width, s->height)) < 0) { @@ -155,6 +157,14 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) s->vector_height = s->avctx->extradata[11]; s->partial_count = s->partial_countdown = s->avctx->extradata[13]; + colors = (s->avctx->extradata[14] << 8) | s->avctx->extradata[15]; + + if (colors > 0) { + avctx->pix_fmt = AV_PIX_FMT_PAL8; + } else { + avctx->pix_fmt = AV_PIX_FMT_RGB555LE; + } + /* the vector dimensions have to meet very stringent requirements */ if ((s->vector_width != 4) || ((s->vector_height != 2) && (s->vector_height != 4))) { @@ -167,6 +177,10 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } + s->frame = av_frame_alloc(); + if (!s->frame) + return AVERROR(ENOMEM); + /* allocate codebooks */ s->codebook_size = MAX_CODEBOOK_SIZE; s->codebook = av_malloc(s->codebook_size); @@ -225,6 +239,7 @@ static int decode_format80(VqaContext *s, int src_size, int src_pos; unsigned char color; int i; + int relative = 0; if (src_size < 0 || src_size > bytestream2_get_bytes_left(&s->gb)) { av_log(s->avctx, AV_LOG_ERROR, "Chunk size %d is out of range\n", @@ -232,6 +247,13 @@ static int decode_format80(VqaContext *s, int src_size, return AVERROR_INVALIDDATA; } + /* the "new" scheme makes references relative to destination pointer */ + if (bytestream2_peek_byte(&s->gb) == 0x00) { + relative = 1; + bytestream2_get_byte(&s->gb); + ff_tlog(s->avctx, "found new format stream "); + } + start = bytestream2_tell(&s->gb); while (bytestream2_tell(&s->gb) - start < src_size) { opcode = bytestream2_get_byte(&s->gb); @@ -251,7 +273,9 @@ static int decode_format80(VqaContext *s, int src_size, count = bytestream2_get_le16(&s->gb); src_pos = bytestream2_get_le16(&s->gb); - ff_tlog(s->avctx, "(1) copy %X bytes from absolute pos %X\n", count, src_pos); + if (relative) + src_pos = dest_index - src_pos; + ff_tlog(s->avctx, "(1) copy %X bytes from pos %X\n", count, src_pos); CHECK_COUNT(); CHECK_COPY(src_pos); for (i = 0; i < count; i++) @@ -271,7 +295,9 @@ static int decode_format80(VqaContext *s, int src_size, count = (opcode & 0x3F) + 3; src_pos = bytestream2_get_le16(&s->gb); - ff_tlog(s->avctx, "(3) copy %X bytes from absolute pos %X\n", count, src_pos); + if (relative) + src_pos = dest_index - src_pos; + ff_tlog(s->avctx, "(3) copy %X bytes from pos %X\n", count, src_pos); CHECK_COUNT(); CHECK_COPY(src_pos); for (i = 0; i < count; i++) @@ -313,7 +339,7 @@ static int decode_format80(VqaContext *s, int src_size, return 0; // let's display what we decoded anyway } -static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) +static int vqa_decode_frame_pal8(VqaContext *s, AVFrame *frame) { unsigned int chunk_type; unsigned int chunk_size; @@ -512,9 +538,8 @@ static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) break; case 3: -/* not implemented yet */ - lines = 0; - break; + av_log(s->avctx, AV_LOG_ERROR, "VQA3 shouldn't have a color palette"); + return AVERROR_INVALIDDATA; } while (lines--) { @@ -596,24 +621,206 @@ static int vqa_decode_chunk(VqaContext *s, AVFrame *frame) return 0; } +static int vqa_decode_frame_hicolor(VqaContext *s, AVFrame *frame) +{ + unsigned int chunk_type; + unsigned int chunk_size; + unsigned int index = 0; + int res; + + int cbf0_chunk = -1; + int cbfz_chunk = -1; + int vptr_chunk = -1; + int vprz_chunk = -1; + + const unsigned char *stream; + + while (bytestream2_get_bytes_left(&s->gb) >= 8) { + chunk_type = bytestream2_get_be32u(&s->gb); + index = bytestream2_tell(&s->gb); + chunk_size = bytestream2_get_be32u(&s->gb); + + switch (chunk_type) { + case CBF0_TAG: + cbf0_chunk = index; + break; + case CBFZ_TAG: + cbfz_chunk = index; + break; + case VPTR_TAG: + vptr_chunk = index; + break; + case VPRZ_TAG: + vprz_chunk = index; + break; + default: + av_log(s->avctx, AV_LOG_ERROR, "Found unknown chunk type: %s (%08X)\n", + av_fourcc2str(av_bswap32(chunk_type)), chunk_type); + break; + } + + bytestream2_skip(&s->gb, chunk_size + (chunk_size & 0x01)); + } + + /* next, look for a full codebook */ + if ((cbf0_chunk != -1) && (cbfz_chunk != -1)) { + /* a chunk should not have both chunk types */ + av_log(s->avctx, AV_LOG_ERROR, "problem: found both CBF0 and CBFZ chunks\n"); + return AVERROR_INVALIDDATA; + } + + /* decompress the full codebook chunk */ + if (cbfz_chunk != -1) { + bytestream2_seek(&s->gb, cbfz_chunk, SEEK_SET); + chunk_size = bytestream2_get_be32(&s->gb); + if ((res = decode_format80(s, chunk_size, s->codebook, + s->codebook_size, 0)) < 0) + return res; + } + + /* copy a full codebook */ + if (cbf0_chunk != -1) { + bytestream2_seek(&s->gb, cbf0_chunk, SEEK_SET); + chunk_size = bytestream2_get_be32(&s->gb); + /* sanity check the full codebook size */ + if (chunk_size > MAX_CODEBOOK_SIZE) { + av_log(s->avctx, AV_LOG_ERROR, "problem: CBF0 chunk too large (0x%X bytes)\n", + chunk_size); + return AVERROR_INVALIDDATA; + } + + bytestream2_get_buffer(&s->gb, s->codebook, chunk_size); + } + + if (vprz_chunk == -1 && vptr_chunk == -1) { + av_log(s->avctx, AV_LOG_ERROR, "frame has no block data\n"); + return AVERROR_INVALIDDATA; + } + + /* decode the frame */ + + if (vptr_chunk != -1) { + /* copy uncompressed tile data */ + bytestream2_seek(&s->gb, vptr_chunk, SEEK_SET); + chunk_size = bytestream2_get_be32(&s->gb); + if (chunk_size > s->decode_buffer_size) { + av_log(s->avctx, AV_LOG_ERROR, "VPTR chunk didn't fit in decode buffer"); + return AVERROR_INVALIDDATA; + } + bytestream2_get_buffer(&s->gb, s->decode_buffer, chunk_size); + } else if (vprz_chunk != -1) { + /* decompress the tile data */ + bytestream2_seek(&s->gb, vprz_chunk, SEEK_SET); + + chunk_size = bytestream2_get_be32(&s->gb); + if ((res = decode_format80(s, chunk_size, s->decode_buffer, s->decode_buffer_size, 0)) < 0) + return res; + } else { + av_log(s->avctx, AV_LOG_ERROR, "expected either VPTR or VPRZ chunk\n"); + return AVERROR_INVALIDDATA; + } + + /* now uncompress the per-row RLE of the decode buffer and draw the blocks in framebuffer */ + + stream = (unsigned char*)s->decode_buffer; + + for (int y_pos = 0; y_pos < s->height; y_pos += s->vector_height) { + int x_pos = 0; + + while (x_pos < s->width) { + int vector_index = 0; + int count = 0; + uint16_t code = bytestream_get_le16(&stream); + int type; + + type = code >> 13; + code &= 0x1fff; + + if (type == 0) { + x_pos += 4 * code; + continue; + } else if (type < 3) { + vector_index = code & 0xff; + count = ((code & 0x1f00) >> 7) + 1 + type; + } else if (type < 5) { + vector_index = code; + count = 1; + } else if (type < 7) { + vector_index = code; + count = *stream++; + } else { + av_log(s->avctx, AV_LOG_ERROR, " unknown type in VPTR chunk (%d)\n",type); + return AVERROR_INVALIDDATA; + } + + if (count < 0 || count > (s->width - x_pos) / s->vector_width) { + av_log(s->avctx, AV_LOG_ERROR, "invalid count: %d\n", count); + return AVERROR_INVALIDDATA; + } + + while (count-- && x_pos < s->width) { + const int bytes_per_vector = 4 * s->vector_height * sizeof(uint16_t); + unsigned char *src = s->codebook + vector_index * bytes_per_vector; + unsigned char *dst = s->frame->data[0] + y_pos * s->frame->linesize[0] + + sizeof(uint16_t) * x_pos; + + if (vector_index >= MAX_VECTORS) + return AVERROR_INVALIDDATA; + + for (int y = 0; y < s->vector_height; y++) { + int size = 4 * sizeof(uint16_t); + memcpy(dst, src, size); + dst += s->frame->linesize[0]; + src += size; + } + + /* we might want to read the next block index from stream */ + if ((type == 2) && count > 0) { + vector_index = bytestream_get_byte(&stream); + } + + x_pos += 4; + } + + if (count > 0) { + av_log(s->avctx, AV_LOG_ERROR, "had %d leftover vectors\n", count); + return AVERROR_BUG; + } + } + } + + return 0; +} + static int vqa_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { VqaContext *s = avctx->priv_data; - AVFrame *frame = data; int res; - if ((res = ff_get_buffer(avctx, frame, 0)) < 0) + if ((res = ff_reget_buffer(avctx, s->frame, 0)) < 0) return res; bytestream2_init(&s->gb, avpkt->data, avpkt->size); - if ((res = vqa_decode_chunk(s, frame)) < 0) - return res; - /* make the palette available on the way out */ - memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4); - frame->palette_has_changed = 1; + if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { + if ((res = vqa_decode_frame_pal8(s, s->frame)) < 0) + return res; + + /* make the palette available on the way out */ + memcpy(s->frame->data[1], s->palette, PALETTE_COUNT * 4); + s->frame->palette_has_changed = 1; + } else if (avctx->pix_fmt == AV_PIX_FMT_RGB555LE) { + if ((res = vqa_decode_frame_hicolor(s, s->frame)) < 0) + return res; + } else { + av_log(s->avctx, AV_LOG_ERROR, "unsupported pixel format\n"); + return AVERROR_BUG; + } + + if ((res = av_frame_ref(data, s->frame)) < 0) + return res; *got_frame = 1; @@ -625,6 +832,7 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx) { VqaContext *s = avctx->priv_data; + av_frame_free(&s->frame); av_freep(&s->codebook); av_freep(&s->next_codebook_buffer); av_freep(&s->decode_buffer); @@ -633,7 +841,7 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx) } static const AVCodecDefault vqa_defaults[] = { - { "max_pixels", "320*240" }, + { "max_pixels", "640*480" }, { NULL }, }; diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index bc4f53d4e3..9d116060a3 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -48,10 +48,14 @@ #define CINF_TAG MKBETAG('C', 'I', 'N', 'F') #define CINH_TAG MKBETAG('C', 'I', 'N', 'H') #define CIND_TAG MKBETAG('C', 'I', 'N', 'D') +#define LINF_TAG MKBETAG('L', 'I', 'N', 'F') #define PINF_TAG MKBETAG('P', 'I', 'N', 'F') #define PINH_TAG MKBETAG('P', 'I', 'N', 'H') #define PIND_TAG MKBETAG('P', 'I', 'N', 'D') #define CMDS_TAG MKBETAG('C', 'M', 'D', 'S') +#define SN2J_TAG MKBETAG('S', 'N', '2', 'J') +#define VIEW_TAG MKBETAG('V', 'I', 'E', 'W') +#define ZBUF_TAG MKBETAG('Z', 'B', 'U', 'F') #define VQA_HEADER_SIZE 0x2A #define VQA_PREAMBLE_SIZE 8 @@ -143,11 +147,14 @@ static int wsvqa_read_header(AVFormatContext *s) case CINF_TAG: case CINH_TAG: case CIND_TAG: + case LINF_TAG: case PINF_TAG: case PINH_TAG: case PIND_TAG: case FINF_TAG: case CMDS_TAG: + case VIEW_TAG: + case ZBUF_TAG: break; default: @@ -292,6 +299,9 @@ static int wsvqa_read_packet(AVFormatContext *s, } else { switch(chunk_type){ case CMDS_TAG: + case SN2J_TAG: + case VIEW_TAG: + case ZBUF_TAG: break; default: av_log(s, AV_LOG_INFO, "Skipping unknown chunk %s\n",

1 0

avfilter/vf_zscale: fix mapping of zimg_chroma_location_e to AVChromaLocation
by Jan Ekström 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Thu Oct 28 01:10:14 2021 +0300| [27c0dd55609daf440a7744e96ac20c119bbeb80f] | committer: Jan Ekström avfilter/vf_zscale: fix mapping of zimg_chroma_location_e to AVChromaLocation The AVChromaLocation values are one higher than zimg's, not one lower as the undefined value is set to zero (as opposed to zimg's -1). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27c0dd55609daf440… --- libavfilter/vf_zscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 439c0c8548..1288c5efc1 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -569,7 +569,7 @@ static void update_output_color_information(ZScaleContext *s, AVFrame *frame) frame->color_trc = (int)s->dst_format.transfer_characteristics; if (s->chromal != -1) - frame->chroma_location = (int)s->dst_format.chroma_location - 1; + frame->chroma_location = (int)s->dst_format.chroma_location + 1; } static int filter_frame(AVFilterLink *link, AVFrame *in)

1 0

avfilter/vf_zscale: deduplicate output color information setting
by Jan Ekström 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Thu Oct 28 00:38:18 2021 +0300| [cd1d09e81b53d47380b494acd3432fd4abb3c17b] | committer: Jan Ekström avfilter/vf_zscale: deduplicate output color information setting This way a piece of logic is not missed in one location or the other, such as the case with chroma location outside the if. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd1d09e81b53d4738… --- libavfilter/vf_zscale.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 3f7dba489a..439c0c8548 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -554,6 +554,24 @@ fail: return ret; } +static void update_output_color_information(ZScaleContext *s, AVFrame *frame) +{ + if (s->colorspace != -1) + frame->colorspace = (int)s->dst_format.matrix_coefficients; + + if (s->primaries != -1) + frame->color_primaries = (int)s->dst_format.color_primaries; + + if (s->range != -1) + frame->color_range = convert_range_from_zimg(s->dst_format.pixel_range); + + if (s->trc != -1) + frame->color_trc = (int)s->dst_format.transfer_characteristics; + + if (s->chromal != -1) + frame->chroma_location = (int)s->dst_format.chroma_location - 1; +} + static int filter_frame(AVFilterLink *link, AVFrame *in) { ZScaleContext *s = link->dst->priv; @@ -621,20 +639,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) format_init(&s->dst_format, out, odesc, s->colorspace, s->primaries, s->trc, s->range, s->chromal); - if (s->colorspace != -1) - out->colorspace = (int)s->dst_format.matrix_coefficients; - - if (s->primaries != -1) - out->color_primaries = (int)s->dst_format.color_primaries; - - if (s->range != -1) - out->color_range = convert_range_from_zimg(s->dst_format.pixel_range); - - if (s->trc != -1) - out->color_trc = (int)s->dst_format.transfer_characteristics; - - if (s->chromal != -1) - out->chroma_location = (int)s->dst_format.chroma_location - 1; + update_output_color_information(s, out); ret = graph_build(&s->graph, &s->params, &s->src_format, &s->dst_format, &s->tmp, &s->tmp_size); @@ -680,17 +685,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) } } - if (s->colorspace != -1) - out->colorspace = (int)s->dst_format.matrix_coefficients; - - if (s->primaries != -1) - out->color_primaries = (int)s->dst_format.color_primaries; - - if (s->range != -1) - out->color_range = convert_range_from_zimg(s->dst_format.pixel_range); - - if (s->trc != -1) - out->color_trc = (int)s->dst_format.transfer_characteristics; + update_output_color_information(s, out); av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den, (int64_t)in->sample_aspect_ratio.num * outlink->h * link->w,

1 0

avfilter/vf_psnr/ssim: fix typos
by Paul B Mahol 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 28 21:08:56 2021 +0200| [8c2f142bd91362710fcd42be44dedcafc6d535b8] | committer: Paul B Mahol avfilter/vf_psnr/ssim: fix typos > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c2f142bd91362710… --- libavfilter/vf_psnr.c | 2 +- libavfilter/vf_ssim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 2b980c17b2..f96179db44 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -22,7 +22,7 @@ /** * @file - * Caculate the PSNR between two input videos. + * Calculate the PSNR between two input videos. */ #include "libavutil/avstring.h" diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index af1d161e21..c6989d618b 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -31,7 +31,7 @@ /* * @file - * Caculate the SSIM between two input videos. + * Calculate the SSIM between two input videos. */ #include "libavutil/avstring.h"

1 0

avcodec/binkaudio: Properly flush the decoder
by Andreas Rheinhardt 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Oct 11 17:36:41 2021 +0200| [e84c83ef982042b4441b517a8f23d8427f2b5494] | committer: Paul B Mahol avcodec/binkaudio: Properly flush the decoder The packets delivered to this decoder are often decoded to more than one frame and if the internal buffer packet is not unreferenced, the decoder will still output frames derived from the old packet (from before the flush). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e84c83ef982042b44… --- libavcodec/binkaudio.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 5915ba6ffb..59ecab25c6 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -337,6 +337,14 @@ fail: return ret; } +static void decode_flush(AVCodecContext *avctx) +{ + BinkAudioContext *const s = avctx->priv_data; + + av_packet_unref(s->pkt); + s->first = 1; +} + const AVCodec ff_binkaudio_rdft_decoder = { .name = "binkaudio_rdft", .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"), @@ -344,6 +352,7 @@ const AVCodec ff_binkaudio_rdft_decoder = { .id = AV_CODEC_ID_BINKAUDIO_RDFT, .priv_data_size = sizeof(BinkAudioContext), .init = decode_init, + .flush = decode_flush, .close = decode_end, .receive_frame = binkaudio_receive_frame, .capabilities = AV_CODEC_CAP_DR1, @@ -357,6 +366,7 @@ const AVCodec ff_binkaudio_dct_decoder = { .id = AV_CODEC_ID_BINKAUDIO_DCT, .priv_data_size = sizeof(BinkAudioContext), .init = decode_init, + .flush = decode_flush, .close = decode_end, .receive_frame = binkaudio_receive_frame, .capabilities = AV_CODEC_CAP_DR1,

1 0

avcodec/binkaudio: Remove AV_CODEC_CAP_DELAY
by Andreas Rheinhardt 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Oct 11 17:31:56 2021 +0200| [f8790ad002886a210d6cd33b96c3502b64f317e8] | committer: Paul B Mahol avcodec/binkaudio: Remove AV_CODEC_CAP_DELAY This decoder may output multiple AVFrames for every AVPacket passed to it, but after it has returned AVERROR(EAGAIN), it is completely drained and there is no reason to flush it at the end with a NULL packet. Furthermore, there is also no delay in the common sense of the word. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8790ad002886a210… --- libavcodec/binkaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index af8cb2809e..5915ba6ffb 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -346,7 +346,7 @@ const AVCodec ff_binkaudio_rdft_decoder = { .init = decode_init, .close = decode_end, .receive_frame = binkaudio_receive_frame, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; @@ -359,6 +359,6 @@ const AVCodec ff_binkaudio_dct_decoder = { .init = decode_init, .close = decode_end, .receive_frame = binkaudio_receive_frame, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };

1 0

configure: add hls demuxer link dependencies
by Limin Wang 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Tue Oct 19 22:46:05 2021 +0800| [4e3ffc9c54c26e49076ad4fced7b72ecc5a03945] | committer: Limin Wang configure: add hls demuxer link dependencies Fixes building with --disable-everything --enable-demuxer=hls Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e3ffc9c54c26e490… --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 92610c7edc..0fe39375ad 100755 --- a/configure +++ b/configure @@ -3363,6 +3363,7 @@ flac_demuxer_select="flac_parser" flv_muxer_select="aac_adtstoasc_bsf" gxf_muxer_select="pcm_rechunk_bsf" hds_muxer_select="flv_muxer" +hls_demuxer_select="adts_header ac3_parser" hls_muxer_select="mpegts_muxer" hls_muxer_suggest="gcrypt openssl" image2_alias_pix_demuxer_select="image2_demuxer"

1 0