[FFmpeg-cvslog] lavf/matroskadec: stop mapping text/plain attachments to AV_CODEC_ID_TEXT
ffmpeg | branch: master | Anton Khirnov | Tue Jun 7
13:49:43 2022 +0200| [38df63f967870cad9d39a02754360db0066e7f80] | committer:
Anton Khirnov
lavf/matroskadec: stop mapping text/plain attachments to AV_CODEC_ID_TEXT
There is no reason to think that an attachment will contain text
subtitles. Furthermore, attachments are exported in extradata, so the
AV_CODEC_ID_TEXT decoder would not do anything useful with them anyway.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38df63f967870cad9d39a02754360db0066e7f80
---
libavformat/matroskadec.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index de73f97aca..cd30b5f7a4 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -806,7 +806,6 @@ static const CodecMime mkv_image_mime_tags[] = {
};
static const CodecMime mkv_mime_tags[] = {
-{"text/plain" , AV_CODEC_ID_TEXT},
{"application/x-truetype-font", AV_CODEC_ID_TTF},
{"application/x-font" , AV_CODEC_ID_TTF},
{"application/vnd.ms-opentype", AV_CODEC_ID_OTF},
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] libavformat/isom: Add more language mappings
ffmpeg | branch: master | Ivan Baykalov <4ru...@gmail.com> | Wed Apr 27
18:00:02 2022 +0700| [58880a8ea8d1aa0497e88f0da4e88455db9ba723] | committer:
Anton Khirnov
libavformat/isom: Add more language mappings
mov_mdhd_language_map table doesn't contain ISO 639 codes for some of
the languages. I added a few which have no contradictory mappings
Fixes ticket #9743
Signed-off-by: Anton Khirnov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58880a8ea8d1aa0497e88f0da4e88455db9ba723
---
libavformat/isom.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 0a87d95792..cf27f58082 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -118,9 +118,9 @@ static const char mov_mdhd_language_map[][4] = {
"hun",/* 26 Hungarian */
"est",/* 27 Estonian */
"lav",/* 28 Latvian */
- "",/* 29 Sami */
+"smi",/* 29 Sami */
"fo ",/* 30 Faroese */
- "",/* 31 Farsi */
+"per",/* 31 Farsi */
"rus",/* 32 Russian */
"chi",/* 33 Simplified Chinese */
"",/* 34 Flemish */
@@ -165,7 +165,7 @@ static const char mov_mdhd_language_map[][4] = {
"kan",/* 73 Kannada */
"tam",/* 74 Tamil */
"tel",/* 75 Telugu */
- "",/* 76 Sinhala */
+"sin",/* 76 Sinhala */
"bur",/* 77 Burmese */
"khm",/* 78 Khmer */
"lao",/* 79 Lao */
@@ -179,9 +179,9 @@ static const char mov_mdhd_language_map[][4] = {
"orm",/* 87 Oromo */
"som",/* 88 Somali */
"swa",/* 89 Swahili */
- "",/* 90 Kinyarwanda */
+"kin",/* 90 Kinyarwanda */
"run",/* 91 Rundi */
- "",/* 92 Nyanja */
+"nya",/* 92 Nyanja */
"mlg",/* 93 Malagasy */
"epo",/* 94 Esperanto */
"",/* 95 */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] MAINTAINERS: add myself as maintainer for LoongArch.
ffmpeg | branch: master | Shiyou Yin | Wed Jun 1 18:21:13 2022 +0800| [b6c856b6e4b5d0b24226a6de173286c380054d88] | committer: Michael Niedermayer MAINTAINERS: add myself as maintainer for LoongArch. Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6c856b6e4b5d0b24226a6de173286c380054d88 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 46723972dc..274fc89203 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -546,6 +546,7 @@ Operating systems / CPU architectures Alpha Falk Hueffner MIPSManojkumar Bhosale, Shiyou Yin +LoongArch Shiyou Yin Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier Amiga / PowerPC Colin Ward Linux / PowerPC Lauri Kasanen ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/dvdsubdec, dvbsubdec: remove bitmap dumping in DEBUG builds
ffmpeg | branch: master | softworkz | Sat May 28
14:52:18 2022 +| [830f49cb9dc3b3086d1cd3dab9b1dcebbde9d048] | committer:
Marton Balint
avcodec/dvdsubdec, dvbsubdec: remove bitmap dumping in DEBUG builds
It's been a regular annoyance and often undesired.
There will be a subtitle filter which allows to dump individual
subtitle bitmaps.
Signed-off-by: softworkz
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=830f49cb9dc3b3086d1cd3dab9b1dcebbde9d048
---
libavcodec/dvbsubdec.c | 169 -
libavcodec/dvdsubdec.c | 48 --
2 files changed, 217 deletions(-)
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 6e510d12c7..4d4007ffd9 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -1381,172 +1381,6 @@ static int dvbsub_parse_page_segment(AVCodecContext
*avctx,
return 0;
}
-
-#ifdef DEBUG
-static void png_save(DVBSubContext *ctx, const char *filename, uint32_t
*bitmap, int w, int h)
-{
-int x, y, v;
-FILE *f;
-char fname[40], fname2[40];
-char command[1024];
-
-snprintf(fname, sizeof(fname), "%s.ppm", filename);
-
-f = fopen(fname, "w");
-if (!f) {
-perror(fname);
-return;
-}
-fprintf(f, "P6\n"
-"%d %d\n"
-"%d\n",
-w, h, 255);
-for(y = 0; y < h; y++) {
-for(x = 0; x < w; x++) {
-v = bitmap[y * w + x];
-putc((v >> 16) & 0xff, f);
-putc((v >> 8) & 0xff, f);
-putc((v >> 0) & 0xff, f);
-}
-}
-fclose(f);
-
-
-snprintf(fname2, sizeof(fname2), "%s-a.pgm", filename);
-
-f = fopen(fname2, "w");
-if (!f) {
-perror(fname2);
-return;
-}
-fprintf(f, "P5\n"
-"%d %d\n"
-"%d\n",
-w, h, 255);
-for(y = 0; y < h; y++) {
-for(x = 0; x < w; x++) {
-v = bitmap[y * w + x];
-putc((v >> 24) & 0xff, f);
-}
-}
-fclose(f);
-
-snprintf(command, sizeof(command), "pnmtopng -alpha %s %s > %s.png 2>
/dev/null", fname2, fname, filename);
-if (system(command) != 0) {
-av_log(ctx, AV_LOG_ERROR, "Error running pnmtopng\n");
-return;
-}
-
-snprintf(command, sizeof(command), "rm %s %s", fname, fname2);
-if (system(command) != 0) {
-av_log(ctx, AV_LOG_ERROR, "Error removing %s and %s\n", fname, fname2);
-return;
-}
-}
-
-static int save_display_set(DVBSubContext *ctx)
-{
-DVBSubRegion *region;
-DVBSubRegionDisplay *display;
-const DVBSubCLUT *clut;
-const uint32_t *clut_table;
-int x_pos, y_pos, width, height;
-int x, y, y_off, x_off;
-uint32_t *pbuf;
-char filename[32];
-static int fileno_index = 0;
-
-x_pos = -1;
-y_pos = -1;
-width = 0;
-height = 0;
-
-for (display = ctx->display_list; display; display = display->next) {
-region = get_region(ctx, display->region_id);
-
-if (!region)
-return -1;
-
-if (x_pos == -1) {
-x_pos = display->x_pos;
-y_pos = display->y_pos;
-width = region->width;
-height = region->height;
-} else {
-if (display->x_pos < x_pos) {
-width += (x_pos - display->x_pos);
-x_pos = display->x_pos;
-}
-
-if (display->y_pos < y_pos) {
-height += (y_pos - display->y_pos);
-y_pos = display->y_pos;
-}
-
-if (display->x_pos + region->width > x_pos + width) {
-width = display->x_pos + region->width - x_pos;
-}
-
-if (display->y_pos + region->height > y_pos + height) {
-height = display->y_pos + region->height - y_pos;
-}
-}
-}
-
-if (x_pos >= 0) {
-
-pbuf = av_malloc(width * height * 4);
-if (!pbuf)
-return -1;
-
-for (display = ctx->display_list; display; display = display->next) {
-region = get_region(ctx, display->region_id);
-
-if (!region)
-return -1;
-
-x_off = display->x_pos - x_pos;
-y_off = display->y_pos - y_pos;
-
-clut = get_clut(ctx, region->clut);
-
-if (!clut)
-clut = &default_clut;
-
-switch (region->depth) {
-case 2:
-clut_table = clut->clut4;
-break;
-case 8:
-clut_table = clut->clut256;
-break;
-case 4:
-default:
-clut_table = clut->clut16;
-break;
-}
-
-for (y = 0; y < region->height; y++) {
-for (x = 0; x < region->width; x++) {
-pbuf[((y + y_off) * width) + x_off + x] =
-clut_table[region->pbuf[y * region-
[FFmpeg-cvslog] libavutil/tests/md5: Remove 'volatile workaround' to avoid warnings
ffmpeg | branch: master | softworkz | Sat May 28
15:07:00 2022 +| [22ab2a375dcac2c9247f099cfef71ca9236a72b1] | committer:
Marton Balint
libavutil/tests/md5: Remove 'volatile workaround' to avoid warnings
Those are always showing up on Patchwork when FATE tests are failing,
covering some possibly more useful information.
The volatile keyword was used as a workaround for an eight year old
clang version.
Signed-off-by: softworkz
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22ab2a375dcac2c9247f099cfef71ca9236a72b1
---
libavutil/tests/md5.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavutil/tests/md5.c b/libavutil/tests/md5.c
index 42e4538e0a..0ac8f2834e 100644
--- a/libavutil/tests/md5.c
+++ b/libavutil/tests/md5.c
@@ -33,8 +33,8 @@ int main(void)
{
uint8_t md5val[16];
int i;
-volatile uint8_t in[1000]; // volatile to workaround
http://llvm.org/bugs/show_bug.cgi?id=20849
-// FIXME remove volatile once it has been fixed and all fate clients are
updated
+
+uint8_t in[1000];
for (i = 0; i < 1000; i++)
in[i] = i * i;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] libavformat/tls_libtls: handle TLS_WANT_{POLLIN, POLLOUT} in read/write functions
ffmpeg | branch: master | Matthieu Bouron | Mon May
23 12:44:33 2022 +0200| [6dd6c58d8976d9c43828af45d7c47ab7f0c983e6] | committer:
Marton Balint
libavformat/tls_libtls: handle TLS_WANT_{POLLIN, POLLOUT} in read/write
functions
According to the tls documentation: tls_read() and tls_write() can
return TLS_WANT_POLLIN and TLS_WANT_POLLOUT which indicates that the
same operation must be repeated immediately.
This commit prevents the libtls backend from failing when libtls returns
TLS_WANT_POLLIN or TLS_WANT_POLLOUT with the following error:
[tls @ 0x7f6e20005a00] (null)
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dd6c58d8976d9c43828af45d7c47ab7f0c983e6
---
libavformat/tls_libtls.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavformat/tls_libtls.c b/libavformat/tls_libtls.c
index 911c8094b0..22858d4867 100644
--- a/libavformat/tls_libtls.c
+++ b/libavformat/tls_libtls.c
@@ -158,6 +158,8 @@ static int ff_tls_read(URLContext *h, uint8_t *buf, int
size)
return ret;
else if (ret == 0)
return AVERROR_EOF;
+else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT)
+return AVERROR(EAGAIN);
av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx));
return AVERROR(EIO);
}
@@ -171,6 +173,8 @@ static int ff_tls_write(URLContext *h, const uint8_t *buf,
int size)
return ret;
else if (ret == 0)
return AVERROR_EOF;
+else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT)
+return AVERROR(EAGAIN);
av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx));
return AVERROR(EIO);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/texturedspenc: Fix indexing in color distribution determination
ffmpeg | branch: master | Michael Niedermayer | Mon
Jan 2 00:28:33 2017 +0100| [ade36d61de8ea5a5acb30a05a0cbcda069127143] |
committer: Marton Balint
avcodec/texturedspenc: Fix indexing in color distribution determination
Fixes CID1396405
MSE and PSNR is slightly improved, and some noticable corruptions disappear as
well.
Signed-off-by: Michael Niedermayer
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ade36d61de8ea5a5acb30a05a0cbcda069127143
---
libavcodec/texturedspenc.c | 6 +++---
tests/ref/fate/vbn-dxt1| 16
tests/ref/fate/vbn-dxt5| 16
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c
index 21e341c613..7ae28ea134 100644
--- a/libavcodec/texturedspenc.c
+++ b/libavcodec/texturedspenc.c
@@ -255,11 +255,11 @@ static void optimize_colors(const uint8_t *block,
ptrdiff_t stride,
muv = minv = maxv = bp[0];
for (y = 0; y < 4; y++) {
-for (x = 4; x < 4; x += 4) {
+for (x = 0; x < 4; x++) {
muv += bp[x * 4 + y * stride];
-if (bp[x] < minv)
+if (bp[x * 4 + y * stride] < minv)
minv = bp[x * 4 + y * stride];
-else if (bp[x] > maxv)
+else if (bp[x * 4 + y * stride] > maxv)
maxv = bp[x * 4 + y * stride];
}
}
diff --git a/tests/ref/fate/vbn-dxt1 b/tests/ref/fate/vbn-dxt1
index 0afd94..e33d9b63e1 100644
--- a/tests/ref/fate/vbn-dxt1
+++ b/tests/ref/fate/vbn-dxt1
@@ -1,11 +1,11 @@
frame:0pts:0 pts_time:0
-lavfi.psnr.mse.r=36.794250
-lavfi.psnr.psnr.r=32.473003
-lavfi.psnr.mse.g=33.350525
-lavfi.psnr.psnr.g=32.899776
-lavfi.psnr.mse.b=28.317383
-lavfi.psnr.psnr.b=33.610271
+lavfi.psnr.mse.r=36.699280
+lavfi.psnr.psnr.r=32.484230
+lavfi.psnr.mse.g=33.508362
+lavfi.psnr.psnr.g=32.879272
+lavfi.psnr.mse.b=27.947266
+lavfi.psnr.psnr.b=33.667412
lavfi.psnr.mse.a=21186.988281
lavfi.psnr.psnr.a=4.870111
-lavfi.psnr.mse_avg=5321.362793
-lavfi.psnr.psnr_avg=10.870575
+lavfi.psnr.mse_avg=5321.285645
+lavfi.psnr.psnr_avg=10.870638
diff --git a/tests/ref/fate/vbn-dxt5 b/tests/ref/fate/vbn-dxt5
index dbec0bd13d..ab345d60a6 100644
--- a/tests/ref/fate/vbn-dxt5
+++ b/tests/ref/fate/vbn-dxt5
@@ -1,11 +1,11 @@
frame:0pts:0 pts_time:0
-lavfi.psnr.mse.r=36.794250
-lavfi.psnr.psnr.r=32.473003
-lavfi.psnr.mse.g=33.350525
-lavfi.psnr.psnr.g=32.899776
-lavfi.psnr.mse.b=28.317383
-lavfi.psnr.psnr.b=33.610271
+lavfi.psnr.mse.r=36.699280
+lavfi.psnr.psnr.r=32.484230
+lavfi.psnr.mse.g=33.508362
+lavfi.psnr.psnr.g=32.879272
+lavfi.psnr.mse.b=27.947266
+lavfi.psnr.psnr.b=33.667412
lavfi.psnr.mse.a=0.000183
lavfi.psnr.psnr.a=85.503792
-lavfi.psnr.mse_avg=24.615585
-lavfi.psnr.psnr_avg=34.218700
+lavfi.psnr.mse_avg=24.538773
+lavfi.psnr.psnr_avg=34.232277
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] ffprobe: update entry index after printing packet/media type
ffmpeg | branch: master | Stefano Sabatini | Thu Apr 21
09:01:14 2022 +0200| [7adeeff91f974ec5a69967dffe18331f666530eb] | committer:
Marton Balint
ffprobe: update entry index after printing packet/media type
Fix JSON output in case a frame or packet section contains a nested section.
Fix trac issue http://trac.ffmpeg.org/ticket/8680.
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7adeeff91f974ec5a69967dffe18331f666530eb
---
fftools/ffprobe.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index c51c82ff65..c44297c1fa 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -1566,6 +1566,7 @@ static void json_print_section_header(WriterContext *wctx)
if (!json->compact)
JSON_INDENT();
printf("\"type\": \"%s\"", section->name);
+wctx->nb_item[wctx->level]++;
}
}
av_bprint_finalize(&buf, NULL);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
