* [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding
@ 2023-12-31 12:30 Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 1/6] avcodec/webp: remove unused definitions Thilo Borgmann via ffmpeg-devel
` (5 more replies)
0 siblings, 6 replies; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
Still images fixed, includes FATE tests, VP8 decoder decoupled so there are no more data races, fixed more asserts, fixed ffprobe regression, removed unnecessary parser changes, put the whole animated sequence into one packet.
Patch 4/6 is still there for making changes in lavc/webp reviewable but shall be stashed when pushing.
-Thilo
Josef Zlomek (2):
libavcodec/webp: add support for animated WebP
libavformat/webp: add WebP demuxer
Thilo Borgmann (4):
avcodec/webp: remove unused definitions
avcodec/webp: separate VP8 decoding
avcodec/webp: make init_canvas_frame static
fate: add test for animated WebP
Changelog | 2 +
doc/demuxers.texi | 28 +
libavcodec/codec_desc.c | 3 +-
libavcodec/version.h | 2 +-
libavcodec/webp.c | 748 ++++++++++++++++++--
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/version.h | 2 +-
libavformat/webpdec.c | 383 ++++++++++
tests/fate/image.mak | 3 +
tests/ref/fate/exif-image-webp | 8 +-
tests/ref/fate/webp-anim | 22 +
tests/ref/fate/webp-rgb-lena-lossless | 2 +-
tests/ref/fate/webp-rgb-lena-lossless-rgb24 | 2 +-
tests/ref/fate/webp-rgb-lossless | 2 +-
tests/ref/fate/webp-rgb-lossy-q80 | 2 +-
tests/ref/fate/webp-rgba-lossless | 2 +-
tests/ref/fate/webp-rgba-lossy-q80 | 2 +-
18 files changed, 1141 insertions(+), 74 deletions(-)
create mode 100644 libavformat/webpdec.c
create mode 100644 tests/ref/fate/webp-anim
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* [FFmpeg-devel] [PATCH v9 1/6] avcodec/webp: remove unused definitions
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:30 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding Thilo Borgmann via ffmpeg-devel
` (4 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
---
libavcodec/webp.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 54b3fde6dc..4fd107aa0c 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -59,8 +59,6 @@
#define VP8X_FLAG_ALPHA 0x10
#define VP8X_FLAG_ICC 0x20
-#define MAX_PALETTE_SIZE 256
-#define MAX_CACHE_BITS 11
#define NUM_CODE_LENGTH_CODES 19
#define HUFFMAN_CODES_PER_META_CODE 5
#define NUM_LITERAL_CODES 256
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 1/6] avcodec/webp: remove unused definitions Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:30 ` Thilo Borgmann via ffmpeg-devel
2024-01-25 10:04 ` Anton Khirnov
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP Thilo Borgmann via ffmpeg-devel
` (3 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
---
libavcodec/webp.c | 50 +++++++++++++++++++++++++++++++++++++++++------
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 4fd107aa0c..58a20b73da 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -194,6 +194,7 @@ typedef struct WebPContext {
AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */
AVCodecContext *avctx; /* parent AVCodecContext */
+ AVCodecContext *avctx_vp8; /* wrapper context for VP8 decoder */
int initialized; /* set once the VP8 context is initialized */
int has_alpha; /* has a separate alpha chunk */
enum AlphaCompression alpha_compression; /* compression type for alpha chunk */
@@ -1298,12 +1299,13 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
int ret;
if (!s->initialized) {
- ff_vp8_decode_init(avctx);
+ VP8Context *s_vp8 = s->avctx_vp8->priv_data;
+ s_vp8->actually_webp = 1;
s->initialized = 1;
- s->v.actually_webp = 1;
}
avctx->pix_fmt = s->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
s->lossless = 0;
+ s->avctx_vp8->pix_fmt = avctx->pix_fmt;
if (data_size > INT_MAX) {
av_log(avctx, AV_LOG_ERROR, "unsupported chunk size\n");
@@ -1314,14 +1316,32 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
s->pkt->data = data_start;
s->pkt->size = data_size;
- ret = ff_vp8_decode_frame(avctx, p, got_frame, s->pkt);
- if (ret < 0)
+ ret = avcodec_send_packet(s->avctx_vp8, s->pkt);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n");
return ret;
+ }
- if (!*got_frame)
+ ret = avcodec_receive_frame(s->avctx_vp8, p);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "VP8 decoding error: %s.\n", av_err2str(ret));
return AVERROR_INVALIDDATA;
+ }
+
+ ret = ff_decode_frame_props(avctx, p);
+ if (ret < 0) {
+ return ret;
+ }
+
+ if (!p->private_ref) {
+ ret = ff_attach_decode_data(p);
+ if (ret < 0) {
+ return ret;
+ }
+ }
- update_canvas_size(avctx, avctx->width, avctx->height);
+ *got_frame = 1;
+ update_canvas_size(avctx, s->avctx_vp8->width, s->avctx_vp8->height);
if (s->has_alpha) {
ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data,
@@ -1533,11 +1553,28 @@ exif_end:
static av_cold int webp_decode_init(AVCodecContext *avctx)
{
WebPContext *s = avctx->priv_data;
+ int ret;
+ const AVCodec *codec;
s->pkt = av_packet_alloc();
if (!s->pkt)
return AVERROR(ENOMEM);
+
+ /* Prepare everything needed for VP8 decoding */
+ codec = avcodec_find_decoder(AV_CODEC_ID_VP8);
+ if (!codec)
+ return AVERROR_BUG;
+ s->avctx_vp8 = avcodec_alloc_context3(codec);
+ if (!s->avctx_vp8)
+ return AVERROR(ENOMEM);
+ s->avctx_vp8->flags = avctx->flags;
+ s->avctx_vp8->flags2 = avctx->flags2;
+ s->avctx_vp8->pix_fmt = avctx->pix_fmt;
+ ret = avcodec_open2(s->avctx_vp8, codec, NULL);
+ if (ret < 0) {
+ return ret;
+ }
return 0;
}
@@ -1546,6 +1583,7 @@ static av_cold int webp_decode_close(AVCodecContext *avctx)
WebPContext *s = avctx->priv_data;
av_packet_free(&s->pkt);
+ avcodec_free_context(&s->avctx_vp8);
if (s->initialized)
return ff_vp8_decode_free(avctx);
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 1/6] avcodec/webp: remove unused definitions Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:30 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 12:56 ` Tomas Härdin
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 4/6] avcodec/webp: make init_canvas_frame static Thilo Borgmann via ffmpeg-devel
` (2 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
From: Josef Zlomek <josef@pex.com>
Fixes: 4907
Adds support for decoding of animated WebP.
The WebP decoder adds the animation related features according to the specs:
https://developers.google.com/speed/webp/docs/riff_container#animation
The frames of the animation may be smaller than the image canvas.
Therefore, the frame is decoded to a temporary frame,
then it is blended into the canvas, the canvas is copied to the output frame,
and finally the frame is disposed from the canvas.
The output to AV_PIX_FMT_YUVA420P/AV_PIX_FMT_YUV420P is still supported.
The background color is specified only as BGRA in the WebP file
so it is converted to YUVA if YUV formats are output.
Signed-off-by: Josef Zlomek <josef@pex.com>
---
Changelog | 1 +
libavcodec/codec_desc.c | 3 +-
libavcodec/version.h | 2 +-
libavcodec/webp.c | 704 ++++++++++++++++++++++++++++++++++++----
4 files changed, 652 insertions(+), 58 deletions(-)
diff --git a/Changelog b/Changelog
index a638c03250..58ed906f86 100644
--- a/Changelog
+++ b/Changelog
@@ -51,6 +51,7 @@ version 6.1:
- ffprobe XML output schema changed to account for multiple
variable-fields elements within the same parent element
- ffprobe -output_format option added as an alias of -of
+- animated WebP decoder
version 6.0:
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 033344304c..0f72769093 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1259,8 +1259,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO,
.name = "webp",
.long_name = NULL_IF_CONFIG_SMALL("WebP"),
- .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY |
- AV_CODEC_PROP_LOSSLESS,
+ .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
.mime_types= MT("image/webp"),
},
{
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 34b059a8a9..381b278e81 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 36
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 58a20b73da..4f989b8f0a 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -35,12 +35,15 @@
* Exif metadata
* ICC profile
*
+ * @author Josef Zlomek, Pexeso Inc. <josef@pex.com>
+ * Animation
+ *
* Unimplemented:
- * - Animation
* - XMP metadata
*/
#include "libavutil/imgutils.h"
+#include "libavutil/colorspace.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
@@ -67,6 +70,14 @@
#define NUM_SHORT_DISTANCES 120
#define MAX_HUFFMAN_CODE_LENGTH 15
+#define ANMF_DISPOSAL_METHOD 0x01
+#define ANMF_DISPOSAL_METHOD_UNCHANGED 0x00
+#define ANMF_DISPOSAL_METHOD_BACKGROUND 0x01
+
+#define ANMF_BLENDING_METHOD 0x02
+#define ANMF_BLENDING_METHOD_ALPHA 0x00
+#define ANMF_BLENDING_METHOD_OVERWRITE 0x02
+
static const uint16_t alphabet_sizes[HUFFMAN_CODES_PER_META_CODE] = {
NUM_LITERAL_CODES + NUM_LENGTH_CODES,
NUM_LITERAL_CODES, NUM_LITERAL_CODES, NUM_LITERAL_CODES,
@@ -191,6 +202,8 @@ typedef struct ImageContext {
typedef struct WebPContext {
VP8Context v; /* VP8 Context used for lossy decoding */
GetBitContext gb; /* bitstream reader for main image chunk */
+ ThreadFrame canvas_frame; /* ThreadFrame for canvas */
+ AVFrame *frame; /* AVFrame for decoded frame */
AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */
AVCodecContext *avctx; /* parent AVCodecContext */
@@ -205,7 +218,22 @@ typedef struct WebPContext {
int has_iccp; /* set after an ICCP chunk has been processed */
int width; /* image width */
int height; /* image height */
- int lossless; /* indicates lossless or lossy */
+ int vp8x_flags; /* global flags from VP8X chunk */
+ int canvas_width; /* canvas width */
+ int canvas_height; /* canvas height */
+ int anmf_flags; /* frame flags from ANMF chunk */
+ int pos_x; /* frame position X */
+ int pos_y; /* frame position Y */
+ int prev_anmf_flags; /* previous frame flags from ANMF chunk */
+ int prev_width; /* previous frame width */
+ int prev_height; /* previous frame height */
+ int prev_pos_x; /* previous frame position X */
+ int prev_pos_y; /* previous frame position Y */
+ int await_progress; /* value of progress to wait for */
+ uint8_t background_argb[4]; /* background color in ARGB format */
+ uint8_t background_yuva[4]; /* background color in YUVA format */
+ const uint8_t *background_data[4]; /* "planes" for background color in YUVA format */
+ uint8_t transparent_yuva[4]; /* transparent black in YUVA format */
int nb_transforms; /* number of transforms */
enum TransformType transforms[4]; /* transformations used in the image, in order */
@@ -1090,7 +1118,6 @@ static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p,
int w, h, ret, i, used;
if (!is_alpha_chunk) {
- s->lossless = 1;
avctx->pix_fmt = AV_PIX_FMT_ARGB;
}
@@ -1304,7 +1331,6 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
s->initialized = 1;
}
avctx->pix_fmt = s->has_alpha ? AV_PIX_FMT_YUVA420P : AV_PIX_FMT_YUV420P;
- s->lossless = 0;
s->avctx_vp8->pix_fmt = avctx->pix_fmt;
if (data_size > INT_MAX) {
@@ -1352,40 +1378,17 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
return ret;
}
-static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
- int *got_frame, AVPacket *avpkt)
+int init_canvas_frame(WebPContext *s, int format, int key_frame);
+
+static int webp_decode_frame_common(AVCodecContext *avctx, uint8_t *data, int size,
+ int *got_frame, int key_frame)
{
WebPContext *s = avctx->priv_data;
GetByteContext gb;
int ret;
uint32_t chunk_type, chunk_size;
- int vp8x_flags = 0;
-
- s->avctx = avctx;
- s->width = 0;
- s->height = 0;
- *got_frame = 0;
- s->has_alpha = 0;
- s->has_exif = 0;
- s->has_iccp = 0;
- bytestream2_init(&gb, avpkt->data, avpkt->size);
-
- if (bytestream2_get_bytes_left(&gb) < 12)
- return AVERROR_INVALIDDATA;
-
- if (bytestream2_get_le32(&gb) != MKTAG('R', 'I', 'F', 'F')) {
- av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n");
- return AVERROR_INVALIDDATA;
- }
-
- chunk_size = bytestream2_get_le32(&gb);
- if (bytestream2_get_bytes_left(&gb) < chunk_size)
- return AVERROR_INVALIDDATA;
- if (bytestream2_get_le32(&gb) != MKTAG('W', 'E', 'B', 'P')) {
- av_log(avctx, AV_LOG_ERROR, "missing WEBP tag\n");
- return AVERROR_INVALIDDATA;
- }
+ bytestream2_init(&gb, data, size);
while (bytestream2_get_bytes_left(&gb) > 8) {
char chunk_str[5] = { 0 };
@@ -1396,6 +1399,10 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
return AVERROR_INVALIDDATA;
chunk_size += chunk_size & 1;
+ // we need to dive into RIFF chunk
+ if (chunk_type == MKTAG('R', 'I', 'F', 'F'))
+ chunk_size = 4;
+
if (bytestream2_get_bytes_left(&gb) < chunk_size) {
/* we seem to be running out of data, but it could also be that the
bitstream has trailing junk leading to bogus chunk_size. */
@@ -1403,10 +1410,26 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
}
switch (chunk_type) {
+ case MKTAG('R', 'I', 'F', 'F'):
+ if (bytestream2_get_le32(&gb) != MKTAG('W', 'E', 'B', 'P')) {
+ av_log(avctx, AV_LOG_ERROR, "missing WEBP tag\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->vp8x_flags = 0;
+ s->canvas_width = 0;
+ s->canvas_height = 0;
+ s->has_exif = 0;
+ s->has_iccp = 0;
+ ff_thread_release_ext_buffer(&s->canvas_frame);
+ break;
case MKTAG('V', 'P', '8', ' '):
if (!*got_frame) {
- ret = vp8_lossy_decode_frame(avctx, p, got_frame,
- avpkt->data + bytestream2_tell(&gb),
+ ret = init_canvas_frame(s, AV_PIX_FMT_YUVA420P, key_frame);
+ if (ret < 0)
+ return ret;
+
+ ret = vp8_lossy_decode_frame(avctx, s->frame, got_frame,
+ data + bytestream2_tell(&gb),
chunk_size);
if (ret < 0)
return ret;
@@ -1415,8 +1438,12 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
break;
case MKTAG('V', 'P', '8', 'L'):
if (!*got_frame) {
- ret = vp8_lossless_decode_frame(avctx, p, got_frame,
- avpkt->data + bytestream2_tell(&gb),
+ ret = init_canvas_frame(s, AV_PIX_FMT_ARGB, key_frame);
+ if (ret < 0)
+ return ret;
+
+ ret = vp8_lossless_decode_frame(avctx, s->frame, got_frame,
+ data + bytestream2_tell(&gb),
chunk_size, 0);
if (ret < 0)
return ret;
@@ -1425,14 +1452,16 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
bytestream2_skip(&gb, chunk_size);
break;
case MKTAG('V', 'P', '8', 'X'):
- if (s->width || s->height || *got_frame) {
+ if (s->canvas_width || s->canvas_height || *got_frame) {
av_log(avctx, AV_LOG_ERROR, "Canvas dimensions are already set\n");
return AVERROR_INVALIDDATA;
}
- vp8x_flags = bytestream2_get_byte(&gb);
+ s->vp8x_flags = bytestream2_get_byte(&gb);
bytestream2_skip(&gb, 3);
s->width = bytestream2_get_le24(&gb) + 1;
s->height = bytestream2_get_le24(&gb) + 1;
+ s->canvas_width = s->width;
+ s->canvas_height = s->height;
ret = av_image_check_size(s->width, s->height, 0, avctx);
if (ret < 0)
return ret;
@@ -1440,7 +1469,7 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
case MKTAG('A', 'L', 'P', 'H'): {
int alpha_header, filter_m, compression;
- if (!(vp8x_flags & VP8X_FLAG_ALPHA)) {
+ if (!(s->vp8x_flags & VP8X_FLAG_ALPHA)) {
av_log(avctx, AV_LOG_WARNING,
"ALPHA chunk present, but alpha bit not set in the "
"VP8X header\n");
@@ -1449,8 +1478,9 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
av_log(avctx, AV_LOG_ERROR, "invalid ALPHA chunk size\n");
return AVERROR_INVALIDDATA;
}
+
alpha_header = bytestream2_get_byte(&gb);
- s->alpha_data = avpkt->data + bytestream2_tell(&gb);
+ s->alpha_data = data + bytestream2_tell(&gb);
s->alpha_data_size = chunk_size - 1;
bytestream2_skip(&gb, s->alpha_data_size);
@@ -1477,14 +1507,13 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
av_log(avctx, AV_LOG_VERBOSE, "Ignoring extra EXIF chunk\n");
goto exif_end;
}
- if (!(vp8x_flags & VP8X_FLAG_EXIF_METADATA))
+ if (!(s->vp8x_flags & VP8X_FLAG_EXIF_METADATA))
av_log(avctx, AV_LOG_WARNING,
"EXIF chunk present, but Exif bit not set in the "
"VP8X header\n");
s->has_exif = 1;
- bytestream2_init(&exif_gb, avpkt->data + exif_offset,
- avpkt->size - exif_offset);
+ bytestream2_init(&exif_gb, data + exif_offset, size - exif_offset);
if (ff_tdecode_header(&exif_gb, &le, &ifd_offset) < 0) {
av_log(avctx, AV_LOG_ERROR, "invalid TIFF header "
"in Exif data\n");
@@ -1497,7 +1526,7 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
goto exif_end;
}
- av_dict_copy(&p->metadata, exif_metadata, 0);
+ av_dict_copy(&s->frame->metadata, exif_metadata, 0);
exif_end:
av_dict_free(&exif_metadata);
@@ -1512,21 +1541,64 @@ exif_end:
bytestream2_skip(&gb, chunk_size);
break;
}
- if (!(vp8x_flags & VP8X_FLAG_ICC))
+ if (!(s->vp8x_flags & VP8X_FLAG_ICC))
av_log(avctx, AV_LOG_WARNING,
"ICCP chunk present, but ICC Profile bit not set in the "
"VP8X header\n");
s->has_iccp = 1;
- sd = av_frame_new_side_data(p, AV_FRAME_DATA_ICC_PROFILE, chunk_size);
+ sd = av_frame_new_side_data(s->frame, AV_FRAME_DATA_ICC_PROFILE, chunk_size);
if (!sd)
return AVERROR(ENOMEM);
bytestream2_get_buffer(&gb, sd->data, chunk_size);
break;
}
- case MKTAG('A', 'N', 'I', 'M'):
+ case MKTAG('A', 'N', 'I', 'M'): {
+ const AVPixFmtDescriptor *desc;
+ int a, r, g, b;
+ if (!(s->vp8x_flags & VP8X_FLAG_ANIMATION)) {
+ av_log(avctx, AV_LOG_WARNING,
+ "ANIM chunk present, but animation bit not set in the "
+ "VP8X header\n");
+ }
+ // background is stored as BGRA, we need ARGB
+ s->background_argb[3] = b = bytestream2_get_byte(&gb);
+ s->background_argb[2] = g = bytestream2_get_byte(&gb);
+ s->background_argb[1] = r = bytestream2_get_byte(&gb);
+ s->background_argb[0] = a = bytestream2_get_byte(&gb);
+
+ // convert the background color to YUVA
+ desc = av_pix_fmt_desc_get(AV_PIX_FMT_YUVA420P);
+ s->background_yuva[desc->comp[0].plane] = RGB_TO_Y_CCIR(r, g, b);
+ s->background_yuva[desc->comp[1].plane] = RGB_TO_U_CCIR(r, g, b, 0);
+ s->background_yuva[desc->comp[2].plane] = RGB_TO_V_CCIR(r, g, b, 0);
+ s->background_yuva[desc->comp[3].plane] = a;
+
+ bytestream2_skip(&gb, 2); // loop count is ignored
+ break;
+ }
case MKTAG('A', 'N', 'M', 'F'):
+ if (!(s->vp8x_flags & VP8X_FLAG_ANIMATION)) {
+ av_log(avctx, AV_LOG_WARNING,
+ "ANMF chunk present, but animation bit not set in the "
+ "VP8X header\n");
+ }
+ s->pos_x = bytestream2_get_le24(&gb) * 2;
+ s->pos_y = bytestream2_get_le24(&gb) * 2;
+ s->width = bytestream2_get_le24(&gb) + 1;
+ s->height = bytestream2_get_le24(&gb) + 1;
+ bytestream2_skip(&gb, 3); // duration
+ s->anmf_flags = bytestream2_get_byte(&gb);
+
+ if (s->width + s->pos_x > s->canvas_width ||
+ s->height + s->pos_y > s->canvas_height) {
+ av_log(avctx, AV_LOG_ERROR,
+ "frame does not fit into canvas\n");
+ return AVERROR_INVALIDDATA;
+ }
+ s->vp8x_flags |= VP8X_FLAG_ANIMATION;
+ break;
case MKTAG('X', 'M', 'P', ' '):
AV_WL32(chunk_str, chunk_type);
av_log(avctx, AV_LOG_WARNING, "skipping unsupported chunk: %s\n",
@@ -1542,24 +1614,505 @@ exif_end:
}
}
- if (!*got_frame) {
- av_log(avctx, AV_LOG_ERROR, "image data not found\n");
- return AVERROR_INVALIDDATA;
+ return size;
+}
+
+int init_canvas_frame(WebPContext *s, int format, int key_frame)
+{
+ AVFrame *canvas = s->canvas_frame.f;
+ int height;
+ int ret;
+
+ // canvas is needed only for animation
+ if (!(s->vp8x_flags & VP8X_FLAG_ANIMATION))
+ return 0;
+
+ // avoid init for non-key frames whose format and size did not change
+ if (!key_frame &&
+ canvas->data[0] &&
+ canvas->format == format &&
+ canvas->width == s->canvas_width &&
+ canvas->height == s->canvas_height)
+ return 0;
+
+ // canvas changes within IPPP sequences will loose thread sync
+ // because of the ThreadFrame reallocation and will wait forever
+ // so if frame-threading is used, forbid canvas changes and unlock
+ // previous frames
+ if (!key_frame && canvas->data[0]) {
+ if (s->avctx->thread_count > 1) {
+ av_log(s->avctx, AV_LOG_WARNING, "Canvas change detected. The output will be damaged. Use -threads 1 to try decoding with best effort.\n");
+ // unlock previous frames that have sent an _await() call
+ ff_thread_report_progress(&s->canvas_frame, INT_MAX, 0);
+ return AVERROR_PATCHWELCOME;
+ } else {
+ // warn for damaged frames
+ av_log(s->avctx, AV_LOG_WARNING, "Canvas change detected. The output will be damaged.\n");
+ }
+ }
+
+ s->avctx->pix_fmt = format;
+ canvas->format = format;
+ canvas->width = s->canvas_width;
+ canvas->height = s->canvas_height;
+
+ // VP8 decoder changed the width and height in AVCodecContext.
+ // Change it back to the canvas size.
+ ret = ff_set_dimensions(s->avctx, s->canvas_width, s->canvas_height);
+ if (ret < 0)
+ return ret;
+
+ ff_thread_release_ext_buffer(s->avctx, &s->canvas_frame);
+ ret = ff_thread_get_ext_buffer(s->avctx, &s->canvas_frame, AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0)
+ return ret;
+
+ if (canvas->format == AV_PIX_FMT_ARGB) {
+ height = canvas->height;
+ memset(canvas->data[0], 0, height * canvas->linesize[0]);
+ } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(canvas->format);
+ for (int comp = 0; comp < desc->nb_components; comp++) {
+ int plane = desc->comp[comp].plane;
+
+ if (comp == 1 || comp == 2)
+ height = AV_CEIL_RSHIFT(canvas->height, desc->log2_chroma_h);
+ else
+ height = FFALIGN(canvas->height, 1 << desc->log2_chroma_h);
+
+ memset(canvas->data[plane], s->transparent_yuva[plane],
+ height * canvas->linesize[plane]);
+ }
+ }
+
+ return 0;
+}
+
+/*
+ * Blend src1 (foreground) and src2 (background) into dest, in ARGB format.
+ * width, height are the dimensions of src1
+ * pos_x, pos_y is the position in src2 and in dest
+ */
+static void blend_alpha_argb(uint8_t *dest_data[4], int dest_linesize[4],
+ const uint8_t *src1_data[4], int src1_linesize[4],
+ const uint8_t *src2_data[4], int src2_linesize[4],
+ int src2_step[4],
+ int width, int height, int pos_x, int pos_y)
+{
+ for (int y = 0; y < height; y++) {
+ const uint8_t *src1 = src1_data[0] + y * src1_linesize[0];
+ const uint8_t *src2 = src2_data[0] + (y + pos_y) * src2_linesize[0] + pos_x * src2_step[0];
+ uint8_t *dest = dest_data[0] + (y + pos_y) * dest_linesize[0] + pos_x * sizeof(uint32_t);
+ for (int x = 0; x < width; x++) {
+ int src1_alpha = src1[0];
+ int src2_alpha = src2[0];
+
+ if (src1_alpha == 255) {
+ memcpy(dest, src1, sizeof(uint32_t));
+ } else if (src1_alpha + src2_alpha == 0) {
+ memset(dest, 0, sizeof(uint32_t));
+ } else {
+ int tmp_alpha = src2_alpha - ROUNDED_DIV(src1_alpha * src2_alpha, 255);
+ int blend_alpha = src1_alpha + tmp_alpha;
+
+ dest[0] = blend_alpha;
+ dest[1] = ROUNDED_DIV(src1[1] * src1_alpha + src2[1] * tmp_alpha, blend_alpha);
+ dest[2] = ROUNDED_DIV(src1[2] * src1_alpha + src2[2] * tmp_alpha, blend_alpha);
+ dest[3] = ROUNDED_DIV(src1[3] * src1_alpha + src2[3] * tmp_alpha, blend_alpha);
+ }
+ src1 += sizeof(uint32_t);
+ src2 += src2_step[0];
+ dest += sizeof(uint32_t);
+ }
+ }
+}
+
+/*
+ * Blend src1 (foreground) and src2 (background) into dest, in YUVA format.
+ * width, height are the dimensions of src1
+ * pos_x, pos_y is the position in src2 and in dest
+ */
+static void blend_alpha_yuva(WebPContext *s,
+ uint8_t *dest_data[4], int dest_linesize[4],
+ const uint8_t *src1_data[4], int src1_linesize[4],
+ int src1_format,
+ const uint8_t *src2_data[4], int src2_linesize[4],
+ int src2_step[4],
+ int width, int height, int pos_x, int pos_y)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src1_format);
+
+ int plane_y = desc->comp[0].plane;
+ int plane_u = desc->comp[1].plane;
+ int plane_v = desc->comp[2].plane;
+ int plane_a = desc->comp[3].plane;
+
+ // blend U & V planes first, because the later step may modify alpha plane
+ int w = AV_CEIL_RSHIFT(width, desc->log2_chroma_w);
+ int h = AV_CEIL_RSHIFT(height, desc->log2_chroma_h);
+ int px = AV_CEIL_RSHIFT(pos_x, desc->log2_chroma_w);
+ int py = AV_CEIL_RSHIFT(pos_y, desc->log2_chroma_h);
+ int tile_w = 1 << desc->log2_chroma_w;
+ int tile_h = 1 << desc->log2_chroma_h;
+
+ for (int y = 0; y < h; y++) {
+ const uint8_t *src1_u = src1_data[plane_u] + y * src1_linesize[plane_u];
+ const uint8_t *src1_v = src1_data[plane_v] + y * src1_linesize[plane_v];
+ const uint8_t *src2_u = src2_data[plane_u] + (y + py) * src2_linesize[plane_u] + px * src2_step[plane_u];
+ const uint8_t *src2_v = src2_data[plane_v] + (y + py) * src2_linesize[plane_v] + px * src2_step[plane_v];
+ uint8_t *dest_u = dest_data[plane_u] + (y + py) * dest_linesize[plane_u] + px;
+ uint8_t *dest_v = dest_data[plane_v] + (y + py) * dest_linesize[plane_v] + px;
+ for (int x = 0; x < w; x++) {
+ // calculate the average alpha of the tile
+ int src1_alpha = 0;
+ int src2_alpha = 0;
+ for (int yy = 0; yy < tile_h; yy++) {
+ for (int xx = 0; xx < tile_w; xx++) {
+ src1_alpha += src1_data[plane_a][(y * tile_h + yy) * src1_linesize[plane_a] +
+ (x * tile_w + xx)];
+ src2_alpha += src2_data[plane_a][((y + py) * tile_h + yy) * src2_linesize[plane_a] +
+ ((x + px) * tile_w + xx) * src2_step[plane_a]];
+ }
+ }
+ src1_alpha = AV_CEIL_RSHIFT(src1_alpha, desc->log2_chroma_w + desc->log2_chroma_h);
+ src2_alpha = AV_CEIL_RSHIFT(src2_alpha, desc->log2_chroma_w + desc->log2_chroma_h);
+
+ if (src1_alpha == 255) {
+ *dest_u = *src1_u;
+ *dest_v = *src1_v;
+ } else if (src1_alpha + src2_alpha == 0) {
+ *dest_u = s->transparent_yuva[plane_u];
+ *dest_v = s->transparent_yuva[plane_v];
+ } else {
+ int tmp_alpha = src2_alpha - ROUNDED_DIV(src1_alpha * src2_alpha, 255);
+ int blend_alpha = src1_alpha + tmp_alpha;
+ *dest_u = ROUNDED_DIV(*src1_u * src1_alpha + *src2_u * tmp_alpha, blend_alpha);
+ *dest_v = ROUNDED_DIV(*src1_v * src1_alpha + *src2_v * tmp_alpha, blend_alpha);
+ }
+ src1_u++;
+ src1_v++;
+ src2_u += src2_step[plane_u];
+ src2_v += src2_step[plane_v];
+ dest_u++;
+ dest_v++;
+ }
+ }
+
+ // blend Y & A planes
+ for (int y = 0; y < height; y++) {
+ const uint8_t *src1_y = src1_data[plane_y] + y * src1_linesize[plane_y];
+ const uint8_t *src1_a = src1_data[plane_a] + y * src1_linesize[plane_a];
+ const uint8_t *src2_y = src2_data[plane_y] + (y + pos_y) * src2_linesize[plane_y] + pos_x * src2_step[plane_y];
+ const uint8_t *src2_a = src2_data[plane_a] + (y + pos_y) * src2_linesize[plane_a] + pos_x * src2_step[plane_a];
+ uint8_t *dest_y = dest_data[plane_y] + (y + pos_y) * dest_linesize[plane_y] + pos_x;
+ uint8_t *dest_a = dest_data[plane_a] + (y + pos_y) * dest_linesize[plane_a] + pos_x;
+ for (int x = 0; x < width; x++) {
+ int src1_alpha = *src1_a;
+ int src2_alpha = *src2_a;
+
+ if (src1_alpha == 255) {
+ *dest_y = *src1_y;
+ *dest_a = 255;
+ } else if (src1_alpha + src2_alpha == 0) {
+ *dest_y = s->transparent_yuva[plane_y];
+ *dest_a = 0;
+ } else {
+ int tmp_alpha = src2_alpha - ROUNDED_DIV(src1_alpha * src2_alpha, 255);
+ int blend_alpha = src1_alpha + tmp_alpha;
+ *dest_y = ROUNDED_DIV(*src1_y * src1_alpha + *src2_y * tmp_alpha, blend_alpha);
+ *dest_a = blend_alpha;
+ }
+ src1_y++;
+ src1_a++;
+ src2_y += src2_step[plane_y];
+ src2_a += src2_step[plane_a];
+ dest_y++;
+ dest_a++;
+ }
+ }
+}
+
+static int blend_frame_into_canvas(WebPContext *s)
+{
+ AVFrame *canvas = s->canvas_frame.f;
+ AVFrame *frame = s->frame;
+ int width, height;
+ int pos_x, pos_y;
+
+ if ((s->anmf_flags & ANMF_BLENDING_METHOD) == ANMF_BLENDING_METHOD_OVERWRITE
+ || frame->format == AV_PIX_FMT_YUV420P) {
+ // do not blend, overwrite
+
+ if (canvas->format == AV_PIX_FMT_ARGB) {
+ width = s->width;
+ height = s->height;
+ pos_x = s->pos_x;
+ pos_y = s->pos_y;
+
+ for (int y = 0; y < height; y++) {
+ const uint32_t *src = (uint32_t *) (frame->data[0] + y * frame->linesize[0]);
+ uint32_t *dst = (uint32_t *) (canvas->data[0] + (y + pos_y) * canvas->linesize[0]) + pos_x;
+ memcpy(dst, src, width * sizeof(uint32_t));
+ }
+ } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
+ int plane;
+
+ for (int comp = 0; comp < desc->nb_components; comp++) {
+ plane = desc->comp[comp].plane;
+ width = s->width;
+ height = s->height;
+ pos_x = s->pos_x;
+ pos_y = s->pos_y;
+ if (comp == 1 || comp == 2) {
+ width = AV_CEIL_RSHIFT(width, desc->log2_chroma_w);
+ height = AV_CEIL_RSHIFT(height, desc->log2_chroma_h);
+ pos_x = AV_CEIL_RSHIFT(pos_x, desc->log2_chroma_w);
+ pos_y = AV_CEIL_RSHIFT(pos_y, desc->log2_chroma_h);
+ }
+
+ for (int y = 0; y < height; y++) {
+ const uint8_t *src = frame->data[plane] + y * frame->linesize[plane];
+ uint8_t *dst = canvas->data[plane] + (y + pos_y) * canvas->linesize[plane] + pos_x;
+ memcpy(dst, src, width);
+ }
+ }
+
+ if (desc->nb_components < 4) {
+ // frame does not have alpha, set alpha to 255
+ desc = av_pix_fmt_desc_get(canvas->format);
+ plane = desc->comp[3].plane;
+ width = s->width;
+ height = s->height;
+ pos_x = s->pos_x;
+ pos_y = s->pos_y;
+
+ for (int y = 0; y < height; y++) {
+ uint8_t *dst = canvas->data[plane] + (y + pos_y) * canvas->linesize[plane] + pos_x;
+ memset(dst, 255, width);
+ }
+ }
+ }
+ } else {
+ // alpha blending
+
+ if (canvas->format == AV_PIX_FMT_ARGB) {
+ int src2_step[4] = { sizeof(uint32_t) };
+ blend_alpha_argb(canvas->data, canvas->linesize,
+ (const uint8_t **) frame->data, frame->linesize,
+ (const uint8_t **) canvas->data, canvas->linesize,
+ src2_step, s->width, s->height, s->pos_x, s->pos_y);
+ } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
+ int src2_step[4] = { 1, 1, 1, 1 };
+ blend_alpha_yuva(s, canvas->data, canvas->linesize,
+ (const uint8_t **) frame->data, frame->linesize,
+ frame->format,
+ (const uint8_t **) canvas->data, canvas->linesize,
+ src2_step, s->width, s->height, s->pos_x, s->pos_y);
+ }
+ }
+
+ return 0;
+}
+
+static int copy_canvas_to_frame(WebPContext *s, AVFrame *frame, int key_frame)
+{
+ AVFrame *canvas = s->canvas_frame.f;
+ int ret;
+
+ frame->format = canvas->format;
+ frame->width = canvas->width;
+ frame->height = canvas->height;
+
+ ret = av_frame_get_buffer(frame, 0);
+ if (ret < 0)
+ return ret;
+
+ ret = av_frame_copy_props(frame, canvas);
+ if (ret < 0)
+ return ret;
+
+ // blend the canvas with the background color into the output frame
+ if (canvas->format == AV_PIX_FMT_ARGB) {
+ int src2_step[4] = { 0 };
+ const uint8_t *src2_data[4] = { &s->background_argb[0] };
+ blend_alpha_argb(frame->data, frame->linesize,
+ (const uint8_t **) canvas->data, canvas->linesize,
+ (const uint8_t **) src2_data, src2_step, src2_step,
+ canvas->width, canvas->height, 0, 0);
+ } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
+ int src2_step[4] = { 0, 0, 0, 0 };
+ blend_alpha_yuva(s, frame->data, frame->linesize,
+ (const uint8_t **) canvas->data, canvas->linesize,
+ canvas->format,
+ s->background_data, src2_step, src2_step,
+ canvas->width, canvas->height, 0, 0);
+ }
+
+ if (key_frame) {
+ frame->pict_type = AV_PICTURE_TYPE_I;
+ } else {
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ }
+
+ return 0;
+}
+
+static int dispose_prev_frame_in_canvas(WebPContext *s)
+{
+ AVFrame *canvas = s->canvas_frame.f;
+ int width, height;
+ int pos_x, pos_y;
+
+ if ((s->prev_anmf_flags & ANMF_DISPOSAL_METHOD) == ANMF_DISPOSAL_METHOD_BACKGROUND) {
+ // dispose to background
+
+ if (canvas->format == AV_PIX_FMT_ARGB) {
+ width = s->prev_width;
+ height = s->prev_height;
+ pos_x = s->prev_pos_x;
+ pos_y = s->prev_pos_y;
+
+ for (int y = 0; y < height; y++) {
+ uint32_t *dst = (uint32_t *) (canvas->data[0] + (y + pos_y) * canvas->linesize[0]) + pos_x;
+ memset(dst, 0, width * sizeof(uint32_t));
+ }
+ } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(canvas->format);
+ int plane;
+
+ for (int comp = 0; comp < desc->nb_components; comp++) {
+ plane = desc->comp[comp].plane;
+ width = s->prev_width;
+ height = s->prev_height;
+ pos_x = s->prev_pos_x;
+ pos_y = s->prev_pos_y;
+ if (comp == 1 || comp == 2) {
+ width = AV_CEIL_RSHIFT(width, desc->log2_chroma_w);
+ height = AV_CEIL_RSHIFT(height, desc->log2_chroma_h);
+ pos_x = AV_CEIL_RSHIFT(pos_x, desc->log2_chroma_w);
+ pos_y = AV_CEIL_RSHIFT(pos_y, desc->log2_chroma_h);
+ }
+
+ for (int y = 0; y < height; y++) {
+ uint8_t *dst = canvas->data[plane] + (y + pos_y) * canvas->linesize[plane] + pos_x;
+ memset(dst, s->transparent_yuva[plane], width);
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
+static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p,
+ int *got_frame, AVPacket *avpkt)
+{
+ WebPContext *s = avctx->priv_data;
+ AVFrame *canvas = s->canvas_frame.f;
+ int ret;
+ int key_frame = avpkt->flags & AV_PKT_FLAG_KEY;
+
+ *got_frame = 0;
+
+ if (key_frame) {
+ // The canvas is passed from one thread to another in a sequence
+ // starting with a key frame followed by non-key frames.
+ // The key frame reports progress 1,
+ // the N-th non-key frame awaits progress N = s->await_progress
+ // and reports progress N + 1.
+ s->await_progress = 0;
+ }
+
+ // reset the frame params
+ s->anmf_flags = 0;
+ s->width = 0;
+ s->height = 0;
+ s->pos_x = 0;
+ s->pos_y = 0;
+ s->has_alpha = 0;
+
+ ret = webp_decode_frame_common(avctx, avpkt->data, avpkt->size, got_frame, key_frame);
+ if (ret < 0)
+ goto end;
+
+ if (s->vp8x_flags & VP8X_FLAG_ANIMATION) {
+ // VP8 decoder might have changed the width and height of the frame
+ AVFrame *frame = s->frame;
+ ret = av_frame_copy_props(canvas, frame);
+ if (ret < 0)
+ return ret;
+
+ ret = ff_set_dimensions(s->avctx, canvas->width, canvas->height);
+ if (ret < 0)
+ return ret;
+
+ s->avctx->pix_fmt = canvas->format;
+ }
+
+ ff_thread_finish_setup(s->avctx);
+
+ if (*got_frame) {
+ if (!(s->vp8x_flags & VP8X_FLAG_ANIMATION)) {
+ // no animation, output the decoded frame
+ av_frame_move_ref(p, s->frame);
+ } else {
+ if (!key_frame) {
+ ff_thread_await_progress(&s->canvas_frame, s->await_progress, 0);
+
+ ret = dispose_prev_frame_in_canvas(s);
+ if (ret < 0)
+ goto end;
+ }
+
+ ret = blend_frame_into_canvas(s);
+ if (ret < 0)
+ goto end;
+
+ ret = copy_canvas_to_frame(s, p, key_frame);
+ if (ret < 0)
+ goto end;
+
+ ff_thread_report_progress(&s->canvas_frame, s->await_progress + 1, 0);
+ }
+
+ p->pts = avpkt->pts;
}
- return avpkt->size;
+ ret = avpkt->size;
+
+end:
+ av_frame_unref(s->frame);
+ return ret;
}
static av_cold int webp_decode_init(AVCodecContext *avctx)
{
WebPContext *s = avctx->priv_data;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(AV_PIX_FMT_YUVA420P);
int ret;
const AVCodec *codec;
+ s->avctx = avctx;
s->pkt = av_packet_alloc();
- if (!s->pkt)
+ s->canvas_frame.f = av_frame_alloc();
+ s->frame = av_frame_alloc();
+ if (!s->pkt || !s->canvas_frame.f || !s->frame) {
+ av_packet_free(&s->pkt);
+ av_frame_free(&s->canvas_frame.f);
+ av_frame_free(&s->frame);
return AVERROR(ENOMEM);
+ }
+
+ // prepare data pointers for YUVA background
+ for (int i = 0; i < 4; i++)
+ s->background_data[i] = &s->background_yuva[i];
+ // convert transparent black from RGBA to YUVA
+ s->transparent_yuva[desc->comp[0].plane] = RGB_TO_Y_CCIR(0, 0, 0);
+ s->transparent_yuva[desc->comp[1].plane] = RGB_TO_U_CCIR(0, 0, 0, 0);
+ s->transparent_yuva[desc->comp[2].plane] = RGB_TO_V_CCIR(0, 0, 0, 0);
+ s->transparent_yuva[desc->comp[3].plane] = 0;
/* Prepare everything needed for VP8 decoding */
codec = avcodec_find_decoder(AV_CODEC_ID_VP8);
@@ -1583,13 +2136,52 @@ static av_cold int webp_decode_close(AVCodecContext *avctx)
WebPContext *s = avctx->priv_data;
av_packet_free(&s->pkt);
+ ff_thread_release_ext_buffer(&s->canvas_frame);
+ av_frame_free(&s->canvas_frame.f);
+ av_frame_free(&s->frame);
avcodec_free_context(&s->avctx_vp8);
- if (s->initialized)
- return ff_vp8_decode_free(avctx);
+ return 0;
+}
+
+static void webp_decode_flush(AVCodecContext *avctx)
+{
+ WebPContext *s = avctx->priv_data;
+
+ ff_thread_release_ext_buffer(&s->canvas_frame);
+}
+
+#if HAVE_THREADS
+static int webp_update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
+{
+ WebPContext *wsrc = src->priv_data;
+ WebPContext *wdst = dst->priv_data;
+ int ret;
+
+ if (dst == src)
+ return 0;
+
+ ff_thread_release_ext_buffer(&wdst->canvas_frame);
+ if (wsrc->canvas_frame.f->data[0] &&
+ (ret = ff_thread_ref_frame(&wdst->canvas_frame, &wsrc->canvas_frame)) < 0)
+ return ret;
+
+ wdst->vp8x_flags = wsrc->vp8x_flags;
+ wdst->canvas_width = wsrc->canvas_width;
+ wdst->canvas_height = wsrc->canvas_height;
+ wdst->prev_anmf_flags = wsrc->anmf_flags;
+ wdst->prev_width = wsrc->width;
+ wdst->prev_height = wsrc->height;
+ wdst->prev_pos_x = wsrc->pos_x;
+ wdst->prev_pos_y = wsrc->pos_y;
+ wdst->await_progress = wsrc->await_progress + 1;
+
+ memcpy(wdst->background_argb, wsrc->background_argb, sizeof(wsrc->background_argb));
+ memcpy(wdst->background_yuva, wsrc->background_yuva, sizeof(wsrc->background_yuva));
return 0;
}
+#endif
const FFCodec ff_webp_decoder = {
.p.name = "webp",
@@ -1597,9 +2189,11 @@ const FFCodec ff_webp_decoder = {
.p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_WEBP,
.priv_data_size = sizeof(WebPContext),
+ UPDATE_THREAD_CONTEXT(webp_update_thread_context),
.init = webp_decode_init,
FF_CODEC_DECODE_CB(webp_decode_frame),
.close = webp_decode_close,
+ .flush = webp_decode_flush,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
- .caps_internal = FF_CODEC_CAP_ICC_PROFILES,
+ .caps_internal = FF_CODEC_CAP_ICC_PROFILES | FF_CODEC_CAP_ALLOCATE_PROGRESS,
};
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* [FFmpeg-devel] [PATCH v9 4/6] avcodec/webp: make init_canvas_frame static
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
` (2 preceding siblings ...)
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:30 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 6/6] fate: add test for animated WebP Thilo Borgmann via ffmpeg-devel
5 siblings, 0 replies; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
---
libavcodec/webp.c | 142 +++++++++++++++++++++++-----------------------
1 file changed, 70 insertions(+), 72 deletions(-)
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 4f989b8f0a..a2e6e199a7 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -1378,7 +1378,76 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
return ret;
}
-int init_canvas_frame(WebPContext *s, int format, int key_frame);
+static int init_canvas_frame(WebPContext *s, int format, int key_frame)
+{
+ AVFrame *canvas = s->canvas_frame.f;
+ int height;
+ int ret;
+
+ // canvas is needed only for animation
+ if (!(s->vp8x_flags & VP8X_FLAG_ANIMATION))
+ return 0;
+
+ // avoid init for non-key frames whose format and size did not change
+ if (!key_frame &&
+ canvas->data[0] &&
+ canvas->format == format &&
+ canvas->width == s->canvas_width &&
+ canvas->height == s->canvas_height)
+ return 0;
+
+ // canvas changes within IPPP sequences will lose thread sync
+ // because of the ThreadFrame reallocation and will wait forever
+ // so if frame-threading is used, forbid canvas changes and unlock
+ // previous frames
+ if (!key_frame && canvas->data[0]) {
+ if (s->avctx->thread_count > 1) {
+ av_log(s->avctx, AV_LOG_WARNING, "Canvas change detected. The output will be damaged. Use -threads 1 to try decoding with best effort.\n");
+ // unlock previous frames that have sent an _await() call
+ ff_thread_report_progress(&s->canvas_frame, INT_MAX, 0);
+ return AVERROR_PATCHWELCOME;
+ } else {
+ // warn for damaged frames
+ av_log(s->avctx, AV_LOG_WARNING, "Canvas change detected. The output will be damaged.\n");
+ }
+ }
+
+ s->avctx->pix_fmt = format;
+ canvas->format = format;
+ canvas->width = s->canvas_width;
+ canvas->height = s->canvas_height;
+
+ // VP8 decoder changed the width and height in AVCodecContext.
+ // Change it back to the canvas size.
+ ret = ff_set_dimensions(s->avctx, s->canvas_width, s->canvas_height);
+ if (ret < 0)
+ return ret;
+
+ ff_thread_release_ext_buffer(&s->canvas_frame);
+ ret = ff_thread_get_ext_buffer(s->avctx, &s->canvas_frame, AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0)
+ return ret;
+
+ if (canvas->format == AV_PIX_FMT_ARGB) {
+ height = canvas->height;
+ memset(canvas->data[0], 0, height * canvas->linesize[0]);
+ } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(canvas->format);
+ for (int comp = 0; comp < desc->nb_components; comp++) {
+ int plane = desc->comp[comp].plane;
+
+ if (comp == 1 || comp == 2)
+ height = AV_CEIL_RSHIFT(canvas->height, desc->log2_chroma_h);
+ else
+ height = FFALIGN(canvas->height, 1 << desc->log2_chroma_h);
+
+ memset(canvas->data[plane], s->transparent_yuva[plane],
+ height * canvas->linesize[plane]);
+ }
+ }
+
+ return 0;
+}
static int webp_decode_frame_common(AVCodecContext *avctx, uint8_t *data, int size,
int *got_frame, int key_frame)
@@ -1617,77 +1686,6 @@ exif_end:
return size;
}
-int init_canvas_frame(WebPContext *s, int format, int key_frame)
-{
- AVFrame *canvas = s->canvas_frame.f;
- int height;
- int ret;
-
- // canvas is needed only for animation
- if (!(s->vp8x_flags & VP8X_FLAG_ANIMATION))
- return 0;
-
- // avoid init for non-key frames whose format and size did not change
- if (!key_frame &&
- canvas->data[0] &&
- canvas->format == format &&
- canvas->width == s->canvas_width &&
- canvas->height == s->canvas_height)
- return 0;
-
- // canvas changes within IPPP sequences will loose thread sync
- // because of the ThreadFrame reallocation and will wait forever
- // so if frame-threading is used, forbid canvas changes and unlock
- // previous frames
- if (!key_frame && canvas->data[0]) {
- if (s->avctx->thread_count > 1) {
- av_log(s->avctx, AV_LOG_WARNING, "Canvas change detected. The output will be damaged. Use -threads 1 to try decoding with best effort.\n");
- // unlock previous frames that have sent an _await() call
- ff_thread_report_progress(&s->canvas_frame, INT_MAX, 0);
- return AVERROR_PATCHWELCOME;
- } else {
- // warn for damaged frames
- av_log(s->avctx, AV_LOG_WARNING, "Canvas change detected. The output will be damaged.\n");
- }
- }
-
- s->avctx->pix_fmt = format;
- canvas->format = format;
- canvas->width = s->canvas_width;
- canvas->height = s->canvas_height;
-
- // VP8 decoder changed the width and height in AVCodecContext.
- // Change it back to the canvas size.
- ret = ff_set_dimensions(s->avctx, s->canvas_width, s->canvas_height);
- if (ret < 0)
- return ret;
-
- ff_thread_release_ext_buffer(s->avctx, &s->canvas_frame);
- ret = ff_thread_get_ext_buffer(s->avctx, &s->canvas_frame, AV_GET_BUFFER_FLAG_REF);
- if (ret < 0)
- return ret;
-
- if (canvas->format == AV_PIX_FMT_ARGB) {
- height = canvas->height;
- memset(canvas->data[0], 0, height * canvas->linesize[0]);
- } else /* if (canvas->format == AV_PIX_FMT_YUVA420P) */ {
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(canvas->format);
- for (int comp = 0; comp < desc->nb_components; comp++) {
- int plane = desc->comp[comp].plane;
-
- if (comp == 1 || comp == 2)
- height = AV_CEIL_RSHIFT(canvas->height, desc->log2_chroma_h);
- else
- height = FFALIGN(canvas->height, 1 << desc->log2_chroma_h);
-
- memset(canvas->data[plane], s->transparent_yuva[plane],
- height * canvas->linesize[plane]);
- }
- }
-
- return 0;
-}
-
/*
* Blend src1 (foreground) and src2 (background) into dest, in ARGB format.
* width, height are the dimensions of src1
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
` (3 preceding siblings ...)
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 4/6] avcodec/webp: make init_canvas_frame static Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:30 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 12:59 ` Tomas Härdin
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 6/6] fate: add test for animated WebP Thilo Borgmann via ffmpeg-devel
5 siblings, 1 reply; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
From: Josef Zlomek <josef@pex.com>
Adds the demuxer of animated WebP files.
It supports non-animated, animated, truncated, and concatenated files.
Reading from a pipe (and other non-seekable inputs) is also supported.
The WebP demuxer splits the input stream into packets containing one frame.
It also marks the key frames properly.
The loop count is ignored by default (same behaviour as animated PNG and GIF),
it may be enabled by the option '-ignore_loop 0'.
The frame rate is set according to the frame delay in the ANMF chunk.
If the delay is too low, or the image is not animated, the default frame rate
is set to 10 fps, similarly to other WebP libraries and browsers.
The fate suite was updated accordingly.
Signed-off-by: Josef Zlomek <josef@pex.com>
---
Changelog | 1 +
doc/demuxers.texi | 28 ++
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/version.h | 2 +-
libavformat/webpdec.c | 383 ++++++++++++++++++++
tests/ref/fate/exif-image-webp | 8 +-
tests/ref/fate/webp-rgb-lena-lossless | 2 +-
tests/ref/fate/webp-rgb-lena-lossless-rgb24 | 2 +-
tests/ref/fate/webp-rgb-lossless | 2 +-
tests/ref/fate/webp-rgb-lossy-q80 | 2 +-
tests/ref/fate/webp-rgba-lossless | 2 +-
tests/ref/fate/webp-rgba-lossy-q80 | 2 +-
13 files changed, 425 insertions(+), 11 deletions(-)
create mode 100644 libavformat/webpdec.c
diff --git a/Changelog b/Changelog
index 58ed906f86..0a15cbd4f8 100644
--- a/Changelog
+++ b/Changelog
@@ -52,6 +52,7 @@ version 6.1:
variable-fields elements within the same parent element
- ffprobe -output_format option added as an alias of -of
- animated WebP decoder
+- animated WebP demuxer
version 6.0:
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index e4c5b560a6..fcb9f9ee3c 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -943,4 +943,32 @@ which in turn, acts as a ceiling for the size of scripts that can be read.
Default is 1 MiB.
@end table
+@section webp
+
+Animated WebP demuxer.
+
+It accepts the following options:
+
+@table @option
+@item -min_delay @var{int}
+Set the minimum valid delay between frames in milliseconds.
+Range is 0 to 60000. Default value is 10.
+
+@item -max_webp_delay @var{int}
+Set the maximum valid delay between frames in milliseconds.
+Range is 0 to 16777215. Default value is 16777215 (over four hours),
+the maximum value allowed by the specification.
+
+@item -default_delay @var{int}
+Set the default delay between frames in milliseconds.
+Range is 0 to 60000. Default value is 100.
+
+@item -ignore_loop @var{bool}
+WebP files can contain information to loop a certain number of times
+(or infinitely). If @option{ignore_loop} is set to true, then the loop
+setting from the input will be ignored and looping will not occur.
+If set to false, then looping will occur and will cycle the number
+of times according to the WebP. Default value is true.
+@end table
+
@c man end DEMUXERS
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 581e378d95..29d78eba3f 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -621,6 +621,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
av1.o avlanguage.o
OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o
OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o
+OBJS-$(CONFIG_WEBP_DEMUXER) += webpdec.o
OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o
OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o
OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index ce6be5f04d..621d9b0383 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -505,6 +505,7 @@ extern const AVInputFormat ff_webm_dash_manifest_demuxer;
extern const FFOutputFormat ff_webm_dash_manifest_muxer;
extern const FFOutputFormat ff_webm_chunk_muxer;
extern const FFOutputFormat ff_webp_muxer;
+extern const AVInputFormat ff_webp_demuxer;
extern const AVInputFormat ff_webvtt_demuxer;
extern const FFOutputFormat ff_webvtt_muxer;
extern const AVInputFormat ff_wsaud_demuxer;
diff --git a/libavformat/version.h b/libavformat/version.h
index de9cc8e31d..f4a26c2870 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 20
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
diff --git a/libavformat/webpdec.c b/libavformat/webpdec.c
new file mode 100644
index 0000000000..73c55ee585
--- /dev/null
+++ b/libavformat/webpdec.c
@@ -0,0 +1,383 @@
+/*
+ * WebP demuxer
+ * Copyright (c) 2020 Pexeso Inc.
+ *
+ * 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
+ */
+
+/**
+ * @file
+ * WebP demuxer.
+ */
+
+#include "avformat.h"
+#include "internal.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
+
+typedef struct WebPDemuxContext {
+ const AVClass *class;
+ /**
+ * Time span in milliseconds before the next frame
+ * should be drawn on screen.
+ */
+ int delay;
+ /**
+ * Minimum allowed delay between frames in milliseconds.
+ * Values below this threshold are considered to be invalid
+ * and set to value of default_delay.
+ */
+ int min_delay;
+ int max_delay;
+ int default_delay;
+
+ /*
+ * loop options
+ */
+ int ignore_loop; ///< ignore loop setting
+ int num_loop; ///< number of times to loop the animation
+ int cur_loop; ///< current loop counter
+ int64_t file_start; ///< start position of the current animation file
+ uint32_t remaining_size; ///< remaining size of the current animation file
+
+ /*
+ * variables for the key frame detection
+ */
+ int nb_frames; ///< number of frames of the current animation file
+ int vp8x_flags;
+ int canvas_width; ///< width of the canvas
+ int canvas_height; ///< height of the canvas
+} WebPDemuxContext;
+
+/**
+ * Major web browsers display WebPs at ~10-15fps when rate is not
+ * explicitly set or have too low values. We assume default rate to be 10.
+ * Default delay = 1000 microseconds / 10fps = 100 milliseconds per frame.
+ */
+#define WEBP_DEFAULT_DELAY 100
+/**
+ * By default delay values less than this threshold considered to be invalid.
+ */
+#define WEBP_MIN_DELAY 10
+
+static int webp_probe(const AVProbeData *p)
+{
+ const uint8_t *b = p->buf;
+
+ if (AV_RB32(b) == MKBETAG('R', 'I', 'F', 'F') &&
+ AV_RB32(b + 8) == MKBETAG('W', 'E', 'B', 'P'))
+ return AVPROBE_SCORE_MAX;
+
+ return 0;
+}
+
+static int webp_read_header(AVFormatContext *s)
+{
+ WebPDemuxContext *wdc = s->priv_data;
+ AVIOContext *pb = s->pb;
+ AVStream *st;
+ int ret, n;
+ uint32_t chunk_type, chunk_size;
+ int canvas_width = 0;
+ int canvas_height = 0;
+ int width = 0;
+ int height = 0;
+
+ wdc->delay = wdc->default_delay;
+ wdc->num_loop = 1;
+
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ wdc->file_start = avio_tell(pb);
+ wdc->remaining_size = avio_size(pb) - wdc->file_start;
+
+ while (wdc->remaining_size > 8 && !avio_feof(pb)) {
+ chunk_type = avio_rl32(pb);
+ chunk_size = avio_rl32(pb);
+ if (chunk_size == UINT32_MAX)
+ return AVERROR_INVALIDDATA;
+ chunk_size += chunk_size & 1;
+ if (avio_feof(pb))
+ break;
+
+ if (wdc->remaining_size < 8 + chunk_size)
+ return AVERROR_INVALIDDATA;
+
+ if (chunk_type == MKTAG('R', 'I', 'F', 'F')) {
+ wdc->remaining_size = 8 + chunk_size;
+ chunk_size = 4;
+ }
+
+ wdc->remaining_size -= 8 + chunk_size;
+
+ switch (chunk_type) {
+ case MKTAG('V', 'P', '8', 'X'):
+ if (chunk_size >= 10) {
+ avio_skip(pb, 4);
+ canvas_width = avio_rl24(pb) + 1;
+ canvas_height = avio_rl24(pb) + 1;
+ ret = avio_skip(pb, chunk_size - 10);
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ case MKTAG('V', 'P', '8', ' '):
+ if (chunk_size >= 10) {
+ avio_skip(pb, 6);
+ width = avio_rl16(pb) & 0x3fff;
+ height = avio_rl16(pb) & 0x3fff;
+ ret = avio_skip(pb, chunk_size - 10);
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ case MKTAG('V', 'P', '8', 'L'):
+ if (chunk_size >= 5) {
+ avio_skip(pb, 1);
+ n = avio_rl32(pb);
+ width = (n & 0x3fff) + 1; // first 14 bits
+ height = ((n >> 14) & 0x3fff) + 1; // next 14 bits
+ ret = avio_skip(pb, chunk_size - 5);
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ case MKTAG('A', 'N', 'M', 'F'):
+ if (chunk_size >= 12) {
+ avio_skip(pb, 6);
+ width = avio_rl24(pb) + 1;
+ height = avio_rl24(pb) + 1;
+ ret = avio_skip(pb, chunk_size - 12);
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ default:
+ ret = avio_skip(pb, chunk_size);
+ break;
+ }
+
+ if (ret < 0)
+ return ret;
+
+ // set canvas size if no VP8X chunk was present
+ if (!canvas_width && width > 0)
+ canvas_width = width;
+ if (!canvas_height && height > 0)
+ canvas_height = height;
+ }
+
+ // WebP format operates with time in "milliseconds", therefore timebase is 1/1000
+ avpriv_set_pts_info(st, 64, 1, 1000);
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_WEBP;
+ st->codecpar->codec_tag = MKTAG('W', 'E', 'B', 'P');
+ st->codecpar->width = canvas_width;
+ st->codecpar->height = canvas_height;
+ st->start_time = 0;
+
+ // jump to start
+ if ((ret = avio_seek(pb, wdc->file_start, SEEK_SET)) < 0)
+ return ret;
+ wdc->remaining_size = 0;
+
+ return 0;
+}
+
+static int webp_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ WebPDemuxContext *wdc = s->priv_data;
+ AVIOContext *pb = s->pb;
+ int ret, n;
+ int64_t packet_start = avio_tell(pb);
+ int64_t packet_end;
+ uint32_t chunk_type;
+ uint32_t chunk_size;
+ int width = 0;
+ int height = 0;
+ int is_frame = 0;
+ int key_frame = 0;
+
+ if (wdc->remaining_size == 0) {
+ wdc->remaining_size = avio_size(pb) - avio_tell(pb);
+ if (wdc->remaining_size == 0) { // EOF
+ int ret;
+ wdc->delay = wdc->default_delay;
+ if (wdc->ignore_loop ||
+ (wdc->num_loop && wdc->cur_loop == wdc->num_loop - 1))
+ return AVERROR_EOF;
+
+ av_log(s, AV_LOG_DEBUG, "loop: %d\n", wdc->cur_loop);
+
+ wdc->cur_loop++;
+ ret = avio_seek(pb, wdc->file_start, SEEK_SET);
+ if (ret < 0)
+ return AVERROR_INVALIDDATA;
+ wdc->remaining_size = avio_size(pb) - avio_tell(pb);
+ }
+ }
+
+ while (wdc->remaining_size > 0 && !avio_feof(pb)) {
+ chunk_type = avio_rl32(pb);
+ chunk_size = avio_rl32(pb);
+ if (chunk_size == UINT32_MAX)
+ return AVERROR_INVALIDDATA;
+ chunk_size += chunk_size & 1;
+
+ if (avio_feof(pb))
+ break;
+
+ // dive into RIFF chunk
+ if (chunk_type == MKTAG('R', 'I', 'F', 'F') && chunk_size > 4) {
+ wdc->file_start = avio_tell(pb) - 8;
+ wdc->remaining_size = 8 + chunk_size;
+ chunk_size = 4;
+ }
+
+ switch (chunk_type) {
+ case MKTAG('V', 'P', '8', 'X'):
+ avio_seek(pb, chunk_size, SEEK_CUR);
+ break;
+ case MKTAG('A', 'N', 'I', 'M'):
+ if (chunk_size >= 6) {
+ avio_seek(pb, 4, SEEK_CUR);
+ wdc->num_loop = avio_rb16(pb);
+ avio_seek(pb, chunk_size - 6, SEEK_CUR);
+ }
+ break;
+ case MKTAG('V', 'P', '8', ' '):
+ if (is_frame)
+ goto flush;
+ is_frame = 1;
+
+ if (chunk_size >= 10) {
+ avio_skip(pb, 6);
+ width = avio_rl16(pb) & 0x3fff;
+ height = avio_rl16(pb) & 0x3fff;
+ wdc->nb_frames++;
+ ret = avio_skip(pb, chunk_size - 10);
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ case MKTAG('V', 'P', '8', 'L'):
+ if (is_frame)
+ goto flush;
+ is_frame = 1;
+
+ if (chunk_size >= 5) {
+ avio_skip(pb, 1);
+ n = avio_rl32(pb);
+ width = (n & 0x3fff) + 1; // first 14 bits
+ height = ((n >> 14) & 0x3fff) + 1; // next 14 bits
+ wdc->nb_frames++;
+ ret = avio_skip(pb, chunk_size - 5);
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ case MKTAG('A', 'N', 'M', 'F'):
+ if (is_frame)
+ goto flush;
+
+ if (chunk_size >= 16) {
+ avio_skip(pb, 6);
+ width = avio_rl24(pb) + 1;
+ height = avio_rl24(pb) + 1;
+ wdc->delay = avio_rl24(pb);
+ avio_skip(pb, 1); // anmf_flags
+ if (wdc->delay < wdc->min_delay)
+ wdc->delay = wdc->default_delay;
+ wdc->delay = FFMIN(wdc->delay, wdc->max_delay);
+ chunk_size = 16;
+ ret = 0;
+ } else
+ ret = avio_skip(pb, chunk_size);
+ break;
+ default:
+ ret = avio_skip(pb, chunk_size);
+ break;
+ }
+ if (ret == AVERROR_EOF) {
+ // EOF was reached but the position may still be in the middle
+ // of the buffer. Seek to the end of the buffer so that EOF is
+ // handled properly in the next invocation of webp_read_packet.
+ if ((ret = avio_seek(pb, pb->buf_end - pb->buf_ptr, SEEK_CUR) < 0))
+ return ret;
+ wdc->remaining_size = 0;
+ return AVERROR_EOF;
+ }
+ if (ret < 0)
+ return ret;
+
+ if (!wdc->canvas_width && width > 0)
+ wdc->canvas_width = width;
+ if (!wdc->canvas_height && height > 0)
+ wdc->canvas_height = height;
+
+ if (wdc->remaining_size < 8 + chunk_size)
+ return AVERROR_INVALIDDATA;
+ wdc->remaining_size -= 8 + chunk_size;
+
+ packet_end = avio_tell(pb);
+ }
+
+flush:
+ if ((ret = avio_seek(pb, packet_start, SEEK_SET)) < 0)
+ return ret;
+
+ if ((ret = av_get_packet(pb, pkt, packet_end - packet_start)) < 0)
+ return ret;
+
+ key_frame = is_frame && wdc->nb_frames == 1;
+ if (key_frame)
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ else
+ pkt->flags &= ~AV_PKT_FLAG_KEY;
+
+ pkt->stream_index = 0;
+ pkt->duration = is_frame ? wdc->delay : 0;
+ pkt->pts = pkt->dts = AV_NOPTS_VALUE;
+
+ if (is_frame && wdc->nb_frames == 1)
+ s->streams[0]->r_frame_rate = (AVRational) {1000, pkt->duration};
+
+ return ret;
+}
+
+static const AVOption options[] = {
+ { "min_delay" , "minimum valid delay between frames (in milliseconds)", offsetof(WebPDemuxContext, min_delay) , AV_OPT_TYPE_INT, {.i64 = WEBP_MIN_DELAY} , 0, 1000 * 60, AV_OPT_FLAG_DECODING_PARAM },
+ { "max_webp_delay", "maximum valid delay between frames (in milliseconds)", offsetof(WebPDemuxContext, max_delay) , AV_OPT_TYPE_INT, {.i64 = 0xffffff} , 0, 0xffffff , AV_OPT_FLAG_DECODING_PARAM },
+ { "default_delay" , "default delay between frames (in milliseconds)" , offsetof(WebPDemuxContext, default_delay), AV_OPT_TYPE_INT, {.i64 = WEBP_DEFAULT_DELAY}, 0, 1000 * 60, AV_OPT_FLAG_DECODING_PARAM },
+ { "ignore_loop" , "ignore loop setting" , offsetof(WebPDemuxContext, ignore_loop) , AV_OPT_TYPE_BOOL,{.i64 = 1} , 0, 1 , AV_OPT_FLAG_DECODING_PARAM },
+ { NULL },
+};
+
+static const AVClass demuxer_class = {
+ .class_name = "WebP demuxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+ .category = AV_CLASS_CATEGORY_DEMUXER,
+};
+
+AVInputFormat ff_webp_demuxer = {
+ .name = "webp",
+ .long_name = NULL_IF_CONFIG_SMALL("WebP image"),
+ .priv_data_size = sizeof(WebPDemuxContext),
+ .read_probe = webp_probe,
+ .read_header = webp_read_header,
+ .read_packet = webp_read_packet,
+ .flags = AVFMT_GENERIC_INDEX,
+ .priv_class = &demuxer_class,
+};
diff --git a/tests/ref/fate/exif-image-webp b/tests/ref/fate/exif-image-webp
index 783abefc60..6ebe5f45b0 100644
--- a/tests/ref/fate/exif-image-webp
+++ b/tests/ref/fate/exif-image-webp
@@ -8,10 +8,10 @@ pkt_dts=0
pkt_dts_time=0.000000
best_effort_timestamp=0
best_effort_timestamp_time=0.000000
-pkt_duration=1
-pkt_duration_time=0.040000
-duration=1
-duration_time=0.040000
+pkt_duration=100
+pkt_duration_time=0.100000
+duration=100
+duration_time=0.100000
pkt_pos=0
pkt_size=39276
width=400
diff --git a/tests/ref/fate/webp-rgb-lena-lossless b/tests/ref/fate/webp-rgb-lena-lossless
index c00715a5e7..e784c501eb 100644
--- a/tests/ref/fate/webp-rgb-lena-lossless
+++ b/tests/ref/fate/webp-rgb-lena-lossless
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 128x128
diff --git a/tests/ref/fate/webp-rgb-lena-lossless-rgb24 b/tests/ref/fate/webp-rgb-lena-lossless-rgb24
index 7f8f550afe..395a01fa1b 100644
--- a/tests/ref/fate/webp-rgb-lena-lossless-rgb24
+++ b/tests/ref/fate/webp-rgb-lena-lossless-rgb24
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 128x128
diff --git a/tests/ref/fate/webp-rgb-lossless b/tests/ref/fate/webp-rgb-lossless
index 8dbdfd6887..1db3ce70f7 100644
--- a/tests/ref/fate/webp-rgb-lossless
+++ b/tests/ref/fate/webp-rgb-lossless
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 12x8
diff --git a/tests/ref/fate/webp-rgb-lossy-q80 b/tests/ref/fate/webp-rgb-lossy-q80
index f61d75ac13..cd43415b95 100644
--- a/tests/ref/fate/webp-rgb-lossy-q80
+++ b/tests/ref/fate/webp-rgb-lossy-q80
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 12x8
diff --git a/tests/ref/fate/webp-rgba-lossless b/tests/ref/fate/webp-rgba-lossless
index bb654ae442..2f763c6c46 100644
--- a/tests/ref/fate/webp-rgba-lossless
+++ b/tests/ref/fate/webp-rgba-lossless
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 12x8
diff --git a/tests/ref/fate/webp-rgba-lossy-q80 b/tests/ref/fate/webp-rgba-lossy-q80
index d2c2aa3fce..6b114f772e 100644
--- a/tests/ref/fate/webp-rgba-lossy-q80
+++ b/tests/ref/fate/webp-rgba-lossy-q80
@@ -1,4 +1,4 @@
-#tb 0: 1/25
+#tb 0: 1/10
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 12x8
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* [FFmpeg-devel] [PATCH v9 6/6] fate: add test for animated WebP
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
` (4 preceding siblings ...)
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:30 ` Thilo Borgmann via ffmpeg-devel
5 siblings, 0 replies; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 12:30 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
---
tests/fate/image.mak | 3 +++
tests/ref/fate/webp-anim | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 tests/ref/fate/webp-anim
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 400199c28a..2e0d1e8e3f 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -567,6 +567,9 @@ fate-webp-rgb-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_q80.webp
FATE_WEBP += fate-webp-rgba-lossy-q80
fate-webp-rgba-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgba_q80.webp
+FATE_WEBP += fate-webp-anim
+fate-webp-anim: CMD = framecrc -i $(TARGET_SAMPLES)/webp/130227-100431-6817p.webp
+
FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP) += $(FATE_WEBP)
FATE_IMAGE_FRAMECRC += $(FATE_WEBP-yes)
fate-webp: $(FATE_WEBP-yes)
diff --git a/tests/ref/fate/webp-anim b/tests/ref/fate/webp-anim
new file mode 100644
index 0000000000..fe7a53a235
--- /dev/null
+++ b/tests/ref/fate/webp-anim
@@ -0,0 +1,22 @@
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 100x70
+#sar 0: 0/1
+0, 0, 0, 1, 28000, 0x2023ba6e
+0, 1, 1, 1, 28000, 0x4292b778
+0, 2, 2, 1, 28000, 0x9772a187
+0, 3, 3, 1, 28000, 0x9599bb3b
+0, 4, 4, 1, 28000, 0xa1d6b949
+0, 5, 5, 1, 28000, 0x153bb9fc
+0, 6, 6, 1, 28000, 0x6ba8d83b
+0, 7, 7, 1, 28000, 0xed2a4316
+0, 8, 8, 12, 28000, 0xe7994c44
+0, 21, 21, 1, 28000, 0x15ec2f76
+0, 22, 22, 1, 28000, 0x96522a6b
+0, 23, 23, 1, 28000, 0xbbae1e30
+0, 24, 24, 1, 28000, 0xa2baab83
+0, 25, 25, 1, 28000, 0x09f1aba0
+0, 26, 26, 1, 28000, 0x09f1aba0
+0, 27, 27, 1, 28000, 0xe761bbc0
+0, 28, 28, 125, 28000, 0xe761bbc0
--
2.37.1 (Apple Git-137.1)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:56 ` Tomas Härdin
2023-12-31 14:54 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 1 reply; 18+ messages in thread
From: Tomas Härdin @ 2023-12-31 12:56 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> + for (int y = 0; y < height; y++) {
> + const uint8_t *src1 = src1_data[0] + y * src1_linesize[0];
> + const uint8_t *src2 = src2_data[0] + (y + pos_y) *
> src2_linesize[0] + pos_x * src2_step[0];
> + uint8_t *dest = dest_data[0] + (y + pos_y) *
> dest_linesize[0] + pos_x * sizeof(uint32_t);
> + for (int x = 0; x < width; x++) {
> + int src1_alpha = src1[0];
> + int src2_alpha = src2[0];
> +
> + if (src1_alpha == 255) {
> + memcpy(dest, src1, sizeof(uint32_t));
> + } else if (src1_alpha + src2_alpha == 0) {
> + memset(dest, 0, sizeof(uint32_t));
> + } else {
> + int tmp_alpha = src2_alpha - ROUNDED_DIV(src1_alpha
> * src2_alpha, 255);
> + int blend_alpha = src1_alpha + tmp_alpha;
> +
> + dest[0] = blend_alpha;
> + dest[1] = ROUNDED_DIV(src1[1] * src1_alpha + src2[1]
> * tmp_alpha, blend_alpha);
> + dest[2] = ROUNDED_DIV(src1[2] * src1_alpha + src2[2]
> * tmp_alpha, blend_alpha);
> + dest[3] = ROUNDED_DIV(src1[3] * src1_alpha + src2[3]
> * tmp_alpha, blend_alpha);
> + }
Is branching and a bunch of function calls (which I hope get optimized
out) really faster than just always doing the blending?
It mgiht also be worthwhile to check 8 bytes at a time against
UINT64_MAX and 0. That doesn't need to hold up this patch though. Same
with the YUVA version.
> +static int blend_frame_into_canvas(WebPContext *s)
> +{
> + AVFrame *canvas = s->canvas_frame.f;
> + AVFrame *frame = s->frame;
> + int width, height;
> + int pos_x, pos_y;
> +
> + if ((s->anmf_flags & ANMF_BLENDING_METHOD) ==
> ANMF_BLENDING_METHOD_OVERWRITE
> + || frame->format == AV_PIX_FMT_YUV420P) {
> + // do not blend, overwrite
> +
> + if (canvas->format == AV_PIX_FMT_ARGB) {
> + width = s->width;
> + height = s->height;
> + pos_x = s->pos_x;
> + pos_y = s->pos_y;
> +
> + for (int y = 0; y < height; y++) {
> + const uint32_t *src = (uint32_t *) (frame->data[0] +
> y * frame->linesize[0]);
> + uint32_t *dst = (uint32_t *) (canvas->data[0] + (y +
> pos_y) * canvas->linesize[0]) + pos_x;
> + memcpy(dst, src, width * sizeof(uint32_t));
> + }
This could be reduced to a single memcpy() when linesizes are equal.
Same for the other memcpy()s
> +static int dispose_prev_frame_in_canvas(WebPContext *s)
> +{
> + AVFrame *canvas = s->canvas_frame.f;
> + int width, height;
> + int pos_x, pos_y;
> +
> + if ((s->prev_anmf_flags & ANMF_DISPOSAL_METHOD) ==
> ANMF_DISPOSAL_METHOD_BACKGROUND) {
> + // dispose to background
> +
> + if (canvas->format == AV_PIX_FMT_ARGB) {
> + width = s->prev_width;
> + height = s->prev_height;
> + pos_x = s->prev_pos_x;
> + pos_y = s->prev_pos_y;
> +
> + for (int y = 0; y < height; y++) {
> + uint32_t *dst = (uint32_t *) (canvas->data[0] + (y +
> pos_y) * canvas->linesize[0]) + pos_x;
> + memset(dst, 0, width * sizeof(uint32_t));
> + }
This can be turned into a single memset(), and similarly below
/Tomas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 12:59 ` Tomas Härdin
2023-12-31 14:55 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 1 reply; 18+ messages in thread
From: Tomas Härdin @ 2023-12-31 12:59 UTC (permalink / raw)
To: FFmpeg development discussions and patches
sön 2023-12-31 klockan 13:30 +0100 skrev Thilo Borgmann via ffmpeg-
devel:
> From: Josef Zlomek <josef@pex.com>
>
> Adds the demuxer of animated WebP files.
> It supports non-animated, animated, truncated, and concatenated
> files.
> Reading from a pipe (and other non-seekable inputs) is also
> supported.
>
> The WebP demuxer splits the input stream into packets containing one
> frame.
> It also marks the key frames properly.
> The loop count is ignored by default (same behaviour as animated PNG
> and GIF),
> it may be enabled by the option '-ignore_loop 0'.
Should format duration not also be set accordingly? I don't see
anything setting it at all, only packet duration
/Tomas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP
2023-12-31 12:56 ` Tomas Härdin
@ 2023-12-31 14:54 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 15:17 ` Tomas Härdin
0 siblings, 1 reply; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 14:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
Am 31.12.23 um 13:56 schrieb Tomas Härdin:
>> + for (int y = 0; y < height; y++) {
>> + const uint8_t *src1 = src1_data[0] + y * src1_linesize[0];
>> + const uint8_t *src2 = src2_data[0] + (y + pos_y) *
>> src2_linesize[0] + pos_x * src2_step[0];
>> + uint8_t *dest = dest_data[0] + (y + pos_y) *
>> dest_linesize[0] + pos_x * sizeof(uint32_t);
>> + for (int x = 0; x < width; x++) {
>> + int src1_alpha = src1[0];
>> + int src2_alpha = src2[0];
>> +
>> + if (src1_alpha == 255) {
>> + memcpy(dest, src1, sizeof(uint32_t));
>> + } else if (src1_alpha + src2_alpha == 0) {
>> + memset(dest, 0, sizeof(uint32_t));
>> + } else {
>> + int tmp_alpha = src2_alpha - ROUNDED_DIV(src1_alpha
>> * src2_alpha, 255);
>> + int blend_alpha = src1_alpha + tmp_alpha;
>> +
>> + dest[0] = blend_alpha;
>> + dest[1] = ROUNDED_DIV(src1[1] * src1_alpha + src2[1]
>> * tmp_alpha, blend_alpha);
>> + dest[2] = ROUNDED_DIV(src1[2] * src1_alpha + src2[2]
>> * tmp_alpha, blend_alpha);
>> + dest[3] = ROUNDED_DIV(src1[3] * src1_alpha + src2[3]
>> * tmp_alpha, blend_alpha);
>> + }
>
> Is branching and a bunch of function calls (which I hope get optimized
> out) really faster than just always doing the blending?
If I trust my START_TIMER/STOP_TIMER interpretation, I'd say so:
With branches:
253315 UNITS in blend_alpha_yuva, 128 runs, 0 skips
Always blending:
351104 UNITS in blend_alpha_yuva, 128 runs, 0 skips
> It mgiht also be worthwhile to check 8 bytes at a time against
> UINT64_MAX and 0. That doesn't need to hold up this patch though. Same
> with the YUVA version.
>
>> +static int blend_frame_into_canvas(WebPContext *s)
>> +{
>> + AVFrame *canvas = s->canvas_frame.f;
>> + AVFrame *frame = s->frame;
>> + int width, height;
>> + int pos_x, pos_y;
>> +
>> + if ((s->anmf_flags & ANMF_BLENDING_METHOD) ==
>> ANMF_BLENDING_METHOD_OVERWRITE
>> + || frame->format == AV_PIX_FMT_YUV420P) {
>> + // do not blend, overwrite
>> +
>> + if (canvas->format == AV_PIX_FMT_ARGB) {
>> + width = s->width;
>> + height = s->height;
>> + pos_x = s->pos_x;
>> + pos_y = s->pos_y;
>> +
>> + for (int y = 0; y < height; y++) {
>> + const uint32_t *src = (uint32_t *) (frame->data[0] +
>> y * frame->linesize[0]);
>> + uint32_t *dst = (uint32_t *) (canvas->data[0] + (y +
>> pos_y) * canvas->linesize[0]) + pos_x;
>> + memcpy(dst, src, width * sizeof(uint32_t));
>> + }
>
> This could be reduced to a single memcpy() when linesizes are equal.
> Same for the other memcpy()s
Its a subimage copied into a canvas (see pos_x and pos_y).
Has to be copied line-by-line.
Same for the other loops.
-Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer
2023-12-31 12:59 ` Tomas Härdin
@ 2023-12-31 14:55 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 0 replies; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2023-12-31 14:55 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
Am 31.12.23 um 13:59 schrieb Tomas Härdin:
> sön 2023-12-31 klockan 13:30 +0100 skrev Thilo Borgmann via ffmpeg-
> devel:
>> From: Josef Zlomek <josef@pex.com>
>>
>> Adds the demuxer of animated WebP files.
>> It supports non-animated, animated, truncated, and concatenated
>> files.
>> Reading from a pipe (and other non-seekable inputs) is also
>> supported.
>>
>> The WebP demuxer splits the input stream into packets containing one
>> frame.
>> It also marks the key frames properly.
>> The loop count is ignored by default (same behaviour as animated PNG
>> and GIF),
>> it may be enabled by the option '-ignore_loop 0'.
>
> Should format duration not also be set accordingly? I don't see
> anything setting it at all, only packet duration
Locally done to set AVStream->duration and ->avg_frame_rate the same way as GIF does.
Thanks,
Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP
2023-12-31 14:54 ` Thilo Borgmann via ffmpeg-devel
@ 2023-12-31 15:17 ` Tomas Härdin
0 siblings, 0 replies; 18+ messages in thread
From: Tomas Härdin @ 2023-12-31 15:17 UTC (permalink / raw)
To: FFmpeg development discussions and patches
sön 2023-12-31 klockan 15:54 +0100 skrev Thilo Borgmann via ffmpeg-
devel:
>
> Am 31.12.23 um 13:56 schrieb Tomas Härdin:
> > > + for (int y = 0; y < height; y++) {
> > > + const uint8_t *src1 = src1_data[0] + y *
> > > src1_linesize[0];
> > > + const uint8_t *src2 = src2_data[0] + (y + pos_y) *
> > > src2_linesize[0] + pos_x * src2_step[0];
> > > + uint8_t *dest = dest_data[0] + (y + pos_y) *
> > > dest_linesize[0] + pos_x * sizeof(uint32_t);
> > > + for (int x = 0; x < width; x++) {
> > > + int src1_alpha = src1[0];
> > > + int src2_alpha = src2[0];
> > > +
> > > + if (src1_alpha == 255) {
> > > + memcpy(dest, src1, sizeof(uint32_t));
> > > + } else if (src1_alpha + src2_alpha == 0) {
> > > + memset(dest, 0, sizeof(uint32_t));
> > > + } else {
> > > + int tmp_alpha = src2_alpha -
> > > ROUNDED_DIV(src1_alpha
> > > * src2_alpha, 255);
> > > + int blend_alpha = src1_alpha + tmp_alpha;
> > > +
> > > + dest[0] = blend_alpha;
> > > + dest[1] = ROUNDED_DIV(src1[1] * src1_alpha +
> > > src2[1]
> > > * tmp_alpha, blend_alpha);
> > > + dest[2] = ROUNDED_DIV(src1[2] * src1_alpha +
> > > src2[2]
> > > * tmp_alpha, blend_alpha);
> > > + dest[3] = ROUNDED_DIV(src1[3] * src1_alpha +
> > > src2[3]
> > > * tmp_alpha, blend_alpha);
> > > + }
> >
> > Is branching and a bunch of function calls (which I hope get
> > optimized
> > out) really faster than just always doing the blending?
>
> If I trust my START_TIMER/STOP_TIMER interpretation, I'd say so:
>
> With branches:
> 253315 UNITS in blend_alpha_yuva, 128 runs, 0 skips
>
> Always blending:
> 351104 UNITS in blend_alpha_yuva, 128 runs, 0 skips
Alright. Still curious if it can be sped up by checking multiple pixels
at a time. But that can be done later
>
> > > +static int blend_frame_into_canvas(WebPContext *s)
> > > +{
> > > + AVFrame *canvas = s->canvas_frame.f;
> > > + AVFrame *frame = s->frame;
> > > + int width, height;
> > > + int pos_x, pos_y;
> > > +
> > > + if ((s->anmf_flags & ANMF_BLENDING_METHOD) ==
> > > ANMF_BLENDING_METHOD_OVERWRITE
> > > + || frame->format == AV_PIX_FMT_YUV420P) {
> > > + // do not blend, overwrite
> > > +
> > > + if (canvas->format == AV_PIX_FMT_ARGB) {
> > > + width = s->width;
> > > + height = s->height;
> > > + pos_x = s->pos_x;
> > > + pos_y = s->pos_y;
> > > +
> > > + for (int y = 0; y < height; y++) {
> > > + const uint32_t *src = (uint32_t *) (frame-
> > > >data[0] +
> > > y * frame->linesize[0]);
> > > + uint32_t *dst = (uint32_t *) (canvas->data[0] +
> > > (y +
> > > pos_y) * canvas->linesize[0]) + pos_x;
> > > + memcpy(dst, src, width * sizeof(uint32_t));
> > > + }
> >
> > This could be reduced to a single memcpy() when linesizes are
> > equal.
> > Same for the other memcpy()s
>
> Its a subimage copied into a canvas (see pos_x and pos_y).
> Has to be copied line-by-line.
Ah, I missed that
/Tomas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding Thilo Borgmann via ffmpeg-devel
@ 2024-01-25 10:04 ` Anton Khirnov
2024-01-25 15:39 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 1 reply; 18+ messages in thread
From: Anton Khirnov @ 2024-01-25 10:04 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Thilo Borgmann
Quoting Thilo Borgmann via ffmpeg-devel (2023-12-31 13:30:14)
> ---
> libavcodec/webp.c | 50 +++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 44 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/webp.c b/libavcodec/webp.c
> index 4fd107aa0c..58a20b73da 100644
> --- a/libavcodec/webp.c
> +++ b/libavcodec/webp.c
> @@ -194,6 +194,7 @@ typedef struct WebPContext {
> AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
> AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */
> AVCodecContext *avctx; /* parent AVCodecContext */
> + AVCodecContext *avctx_vp8; /* wrapper context for VP8 decoder */
Nested codec contexts are in general highly undesirable and should be
avoided whenever possible.
--
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2024-01-25 10:04 ` Anton Khirnov
@ 2024-01-25 15:39 ` Thilo Borgmann via ffmpeg-devel
2024-01-28 10:29 ` Anton Khirnov
0 siblings, 1 reply; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2024-01-25 15:39 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Thilo Borgmann
Am 25.01.24 um 11:04 schrieb Anton Khirnov:
> Quoting Thilo Borgmann via ffmpeg-devel (2023-12-31 13:30:14)
>> ---
>> libavcodec/webp.c | 50 +++++++++++++++++++++++++++++++++++++++++------
>> 1 file changed, 44 insertions(+), 6 deletions(-)
>>
>> diff --git a/libavcodec/webp.c b/libavcodec/webp.c
>> index 4fd107aa0c..58a20b73da 100644
>> --- a/libavcodec/webp.c
>> +++ b/libavcodec/webp.c
>> @@ -194,6 +194,7 @@ typedef struct WebPContext {
>> AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
>> AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */
>> AVCodecContext *avctx; /* parent AVCodecContext */
>> + AVCodecContext *avctx_vp8; /* wrapper context for VP8 decoder */
>
> Nested codec contexts are in general highly undesirable and should be
> avoided whenever possible.
AFAICT we do it that way in the other codecs as well (cri, ftr, imm5, tdsc, tiff). So what do you suggest to do to avoid having it nested?
-Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2024-01-25 15:39 ` Thilo Borgmann via ffmpeg-devel
@ 2024-01-28 10:29 ` Anton Khirnov
2024-01-30 18:39 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 1 reply; 18+ messages in thread
From: Anton Khirnov @ 2024-01-28 10:29 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Thilo Borgmann
Quoting Thilo Borgmann via ffmpeg-devel (2024-01-25 16:39:19)
> Am 25.01.24 um 11:04 schrieb Anton Khirnov:
> > Quoting Thilo Borgmann via ffmpeg-devel (2023-12-31 13:30:14)
> >> ---
> >> libavcodec/webp.c | 50 +++++++++++++++++++++++++++++++++++++++++------
> >> 1 file changed, 44 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/libavcodec/webp.c b/libavcodec/webp.c
> >> index 4fd107aa0c..58a20b73da 100644
> >> --- a/libavcodec/webp.c
> >> +++ b/libavcodec/webp.c
> >> @@ -194,6 +194,7 @@ typedef struct WebPContext {
> >> AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
> >> AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */
> >> AVCodecContext *avctx; /* parent AVCodecContext */
> >> + AVCodecContext *avctx_vp8; /* wrapper context for VP8 decoder */
> >
> > Nested codec contexts are in general highly undesirable and should be
> > avoided whenever possible.
>
> AFAICT we do it that way in the other codecs as well (cri, ftr, imm5,
> tdsc, tiff). So what do you suggest to do to avoid having it nested?
Integrating the two decoders directly, as is done now.
With nesting it is very tricky to handle all the corner cases properly,
especially passing through all the options to the innner decoder, like
direct rendering, other user callbacks, etc. It should only be done as a
last resort and there should be a strong argument to do it this way.
--
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2024-01-28 10:29 ` Anton Khirnov
@ 2024-01-30 18:39 ` Thilo Borgmann via ffmpeg-devel
2024-02-03 13:53 ` Andreas Rheinhardt
0 siblings, 1 reply; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2024-01-30 18:39 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
Am 28.01.24 um 11:29 schrieb Anton Khirnov:
> Quoting Thilo Borgmann via ffmpeg-devel (2024-01-25 16:39:19)
>> Am 25.01.24 um 11:04 schrieb Anton Khirnov:
>>> Quoting Thilo Borgmann via ffmpeg-devel (2023-12-31 13:30:14)
>>>> ---
>>>> libavcodec/webp.c | 50 +++++++++++++++++++++++++++++++++++++++++------
>>>> 1 file changed, 44 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/libavcodec/webp.c b/libavcodec/webp.c
>>>> index 4fd107aa0c..58a20b73da 100644
>>>> --- a/libavcodec/webp.c
>>>> +++ b/libavcodec/webp.c
>>>> @@ -194,6 +194,7 @@ typedef struct WebPContext {
>>>> AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */
>>>> AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */
>>>> AVCodecContext *avctx; /* parent AVCodecContext */
>>>> + AVCodecContext *avctx_vp8; /* wrapper context for VP8 decoder */
>>>
>>> Nested codec contexts are in general highly undesirable and should be
>>> avoided whenever possible.
>>
>> AFAICT we do it that way in the other codecs as well (cri, ftr, imm5,
>> tdsc, tiff). So what do you suggest to do to avoid having it nested?
>
> Integrating the two decoders directly, as is done now.
>
> With nesting it is very tricky to handle all the corner cases properly,
> especially passing through all the options to the innner decoder, like
> direct rendering, other user callbacks, etc. It should only be done as a
> last resort and there should be a strong argument to do it this way.
IIUC that was what the patch still did some some versions ago.
It brought us the data races in animated files, decoupling the decoder solving the issue.
-Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2024-01-30 18:39 ` Thilo Borgmann via ffmpeg-devel
@ 2024-02-03 13:53 ` Andreas Rheinhardt
2024-02-04 11:09 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 1 reply; 18+ messages in thread
From: Andreas Rheinhardt @ 2024-02-03 13:53 UTC (permalink / raw)
To: ffmpeg-devel
Thilo Borgmann via ffmpeg-devel:
> Am 28.01.24 um 11:29 schrieb Anton Khirnov:
>> Quoting Thilo Borgmann via ffmpeg-devel (2024-01-25 16:39:19)
>>> Am 25.01.24 um 11:04 schrieb Anton Khirnov:
>>>> Quoting Thilo Borgmann via ffmpeg-devel (2023-12-31 13:30:14)
>>>>> ---
>>>>> libavcodec/webp.c | 50
>>>>> +++++++++++++++++++++++++++++++++++++++++------
>>>>> 1 file changed, 44 insertions(+), 6 deletions(-)
>>>>>
>>>>> diff --git a/libavcodec/webp.c b/libavcodec/webp.c
>>>>> index 4fd107aa0c..58a20b73da 100644
>>>>> --- a/libavcodec/webp.c
>>>>> +++ b/libavcodec/webp.c
>>>>> @@ -194,6 +194,7 @@ typedef struct WebPContext {
>>>>> AVFrame *alpha_frame; /* AVFrame for alpha
>>>>> data decompressed from VP8L */
>>>>> AVPacket *pkt; /* AVPacket to be passed
>>>>> to the underlying VP8 decoder */
>>>>> AVCodecContext *avctx; /* parent AVCodecContext */
>>>>> + AVCodecContext *avctx_vp8; /* wrapper context for VP8
>>>>> decoder */
>>>>
>>>> Nested codec contexts are in general highly undesirable and should be
>>>> avoided whenever possible.
>>>
>>> AFAICT we do it that way in the other codecs as well (cri, ftr, imm5,
>>> tdsc, tiff). So what do you suggest to do to avoid having it nested?
>>
>> Integrating the two decoders directly, as is done now.
>>
>> With nesting it is very tricky to handle all the corner cases properly,
>> especially passing through all the options to the innner decoder, like
>> direct rendering, other user callbacks, etc. It should only be done as a
>> last resort and there should be a strong argument to do it this way.
>
> IIUC that was what the patch still did some some versions ago.
> It brought us the data races in animated files, decoupling the decoder
> solving the issue.
>
If one keeps the codecs integrated, then one needs at the very least
change the check for whether to call ff_thread_finish_setup() as I did:
https://ffmpeg.org/pipermail/ffmpeg-devel/2024-January/320490.html
This will not be enough: E.g. changing the dimensions in VP8 code and
then reverting that change in WebP (as has been done in the earlier
version of your patch which made me propose that these decoders should
be separated) will have to be avoided.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding
2024-02-03 13:53 ` Andreas Rheinhardt
@ 2024-02-04 11:09 ` Thilo Borgmann via ffmpeg-devel
0 siblings, 0 replies; 18+ messages in thread
From: Thilo Borgmann via ffmpeg-devel @ 2024-02-04 11:09 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Thilo Borgmann
On 03.02.24 14:53, Andreas Rheinhardt wrote:
> Thilo Borgmann via ffmpeg-devel:
>> Am 28.01.24 um 11:29 schrieb Anton Khirnov:
>>> Quoting Thilo Borgmann via ffmpeg-devel (2024-01-25 16:39:19)
>>>> Am 25.01.24 um 11:04 schrieb Anton Khirnov:
>>>>> Quoting Thilo Borgmann via ffmpeg-devel (2023-12-31 13:30:14)
>>>>>> ---
>>>>>> libavcodec/webp.c | 50
>>>>>> +++++++++++++++++++++++++++++++++++++++++------
>>>>>> 1 file changed, 44 insertions(+), 6 deletions(-)
>>>>>>
>>>>>> diff --git a/libavcodec/webp.c b/libavcodec/webp.c
>>>>>> index 4fd107aa0c..58a20b73da 100644
>>>>>> --- a/libavcodec/webp.c
>>>>>> +++ b/libavcodec/webp.c
>>>>>> @@ -194,6 +194,7 @@ typedef struct WebPContext {
>>>>>> AVFrame *alpha_frame; /* AVFrame for alpha
>>>>>> data decompressed from VP8L */
>>>>>> AVPacket *pkt; /* AVPacket to be passed
>>>>>> to the underlying VP8 decoder */
>>>>>> AVCodecContext *avctx; /* parent AVCodecContext */
>>>>>> + AVCodecContext *avctx_vp8; /* wrapper context for VP8
>>>>>> decoder */
>>>>>
>>>>> Nested codec contexts are in general highly undesirable and should be
>>>>> avoided whenever possible.
>>>>
>>>> AFAICT we do it that way in the other codecs as well (cri, ftr, imm5,
>>>> tdsc, tiff). So what do you suggest to do to avoid having it nested?
>>>
>>> Integrating the two decoders directly, as is done now.
>>>
>>> With nesting it is very tricky to handle all the corner cases properly,
>>> especially passing through all the options to the innner decoder, like
>>> direct rendering, other user callbacks, etc. It should only be done as a
>>> last resort and there should be a strong argument to do it this way.
>>
>> IIUC that was what the patch still did some some versions ago.
>> It brought us the data races in animated files, decoupling the decoder
>> solving the issue.
>>
>
> If one keeps the codecs integrated, then one needs at the very least
> change the check for whether to call ff_thread_finish_setup() as I did:
> https://ffmpeg.org/pipermail/ffmpeg-devel/2024-January/320490.html
> This will not be enough: E.g. changing the dimensions in VP8 code and
> then reverting that change in WebP (as has been done in the earlier
> version of your patch which made me propose that these decoders should
> be separated) will have to be avoided.
I've a version of the animated webp decoder with coupled vp8 decoder
doing that size change and tsan is happy for me.
I had the impression ff_thread_finish_setup() blew it in the past which
is now avoided - am I wrong? Once your patches landed I'll post v10 and
we can check that again.
-Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-02-04 11:09 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-31 12:30 [FFmpeg-devel] [PATCH v9 0/6] webp: add support for animated WebP decoding Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 1/6] avcodec/webp: remove unused definitions Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 2/6] avcodec/webp: separate VP8 decoding Thilo Borgmann via ffmpeg-devel
2024-01-25 10:04 ` Anton Khirnov
2024-01-25 15:39 ` Thilo Borgmann via ffmpeg-devel
2024-01-28 10:29 ` Anton Khirnov
2024-01-30 18:39 ` Thilo Borgmann via ffmpeg-devel
2024-02-03 13:53 ` Andreas Rheinhardt
2024-02-04 11:09 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 3/6] libavcodec/webp: add support for animated WebP Thilo Borgmann via ffmpeg-devel
2023-12-31 12:56 ` Tomas Härdin
2023-12-31 14:54 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 15:17 ` Tomas Härdin
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 4/6] avcodec/webp: make init_canvas_frame static Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 5/6] libavformat/webp: add WebP demuxer Thilo Borgmann via ffmpeg-devel
2023-12-31 12:59 ` Tomas Härdin
2023-12-31 14:55 ` Thilo Borgmann via ffmpeg-devel
2023-12-31 12:30 ` [FFmpeg-devel] [PATCH v9 6/6] fate: add test for animated WebP Thilo Borgmann via ffmpeg-devel
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git