from:"Carl Eugen Hoyos"

[FFmpeg-cvslog] lavu/hwcontext_vaapi: Fix type specifier for uintptr_t

2022-10-23 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Oct 23 
20:51:42 2022 +0200| [882a17068fd8e62c7d38c14e6fb160d7c9fc446a] | committer: 
Carl Eugen Hoyos

lavu/hwcontext_vaapi: Fix type specifier for uintptr_t

Fixes a format specifier warning on x86_32 Linux.
Fixes part of ticket #9986.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=882a17068fd8e62c7d38c14e6fb160d7c9fc446a
---

 libavutil/hwcontext_vaapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 9ba5225ad2..4bcde74f62 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1511,7 +1511,7 @@ static int vaapi_map_to_drm_abh(AVHWFramesContext *hwfc, 
AVFrame *dst,
 goto fail_derived;
 }
 
-av_log(hwfc, AV_LOG_DEBUG, "DRM PRIME fd is %ld.\n",
+av_log(hwfc, AV_LOG_DEBUG, "DRM PRIME fd is %"PRIdPTR".\n",
mapping->buffer_info.handle);
 
 mapping->drm_desc.nb_objects = 1;

___
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] lavf/hevc: Fix type specifiers, missed in 8b5d1553

2022-10-23 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Fri Sep  2 
22:54:23 2022 +0200| [fc410ce572bdbb8553acfd1d72cbcfeb4e63c09c] | committer: 
Carl Eugen Hoyos

lavf/hevc: Fix type specifiers, missed in 8b5d1553

Fixes several warnings with msvc:
warning: format specifies type 'unsigned char' but the argument has type 
'unsigned int'

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc410ce572bdbb8553acfd1d72cbcfeb4e63c09c
---

 libavformat/hevc.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/hevc.c b/libavformat/hevc.c
index 1841dd5785..ca5187a92e 100644
--- a/libavformat/hevc.c
+++ b/libavformat/hevc.c
@@ -848,15 +848,15 @@ static int hvcc_write(AVIOContext *pb, 
HEVCDecoderConfigurationRecord *hvcc)
 if (array->numNalus == 0)
 continue;
 
-av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]:  
 %"PRIu8"\n",
+av_log(NULL, AV_LOG_TRACE, "array_completeness[%u]:   
%"PRIu8"\n",
j, array->array_completeness);
-av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]:   
 %"PRIu8"\n",
+av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%u]:
%"PRIu8"\n",
j, array->NAL_unit_type);
-av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]:
 %"PRIu16"\n",
+av_log(NULL, AV_LOG_TRACE, "numNalus[%u]: 
%"PRIu16"\n",
j, array->numNalus);
 for (unsigned k = 0; k < array->numNalus; k++)
 av_log(NULL, AV_LOG_TRACE,
-"nalUnitLength[%"PRIu8"][%"PRIu16"]: 
%"PRIu16"\n",
+"nalUnitLength[%u][%u]: %"PRIu16"\n",
j, k, array->nalUnitLength[k]);
 j++;
 }

___
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] lavfi/rotate: Avoid undefined behaviour.

2022-10-09 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Sep  3 
22:50:19 2022 +0200| [82479ef6bd107312aa086bab12c29ba4551d544a] | committer: 
Carl Eugen Hoyos

lavfi/rotate: Avoid undefined behaviour.

Fixes the following integer overflows:
libavfilter/vf_rotate.c:273:13: runtime error: signed integer overflow: 
92951468 + 2058533568 cannot be represented in type 'int'
libavfilter/vf_rotate.c:273:37: runtime error: signed integer overflow: 39684 * 
54149 cannot be represented in type 'int'
libavfilter/vf_rotate.c:272:13: runtime error: signed integer overflow: 
247587320 + 1900985032 cannot be represented in type 'int'
libavfilter/vf_rotate.c:272:37: runtime error: signed integer overflow: 42584 * 
50430 cannot be represented in type 'int'
libavfilter/vf_rotate.c:272:50: runtime error: signed integer overflow: 65083 * 
52912 cannot be represented in type 'int'
libavfilter/vf_rotate.c:273:50: runtime error: signed integer overflow: 65286 * 
38044 cannot be represented in type 'int'

Fixes ticket #9799, different output with different compilers.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82479ef6bd107312aa086bab12c29ba4551d544a
---

 libavfilter/vf_rotate.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c
index 4429e3d543..96c250a459 100644
--- a/libavfilter/vf_rotate.c
+++ b/libavfilter/vf_rotate.c
@@ -258,8 +258,8 @@ static uint8_t *interpolate_bilinear16(uint8_t *dst_color,
 {
 int int_x = av_clip(x>>16, 0, max_x);
 int int_y = av_clip(y>>16, 0, max_y);
-int frac_x = x&0x;
-int frac_y = y&0x;
+int64_t frac_x = x&0x;
+int64_t frac_y = y&0x;
 int i;
 int int_x1 = FFMIN(int_x+1, max_x);
 int int_y1 = FFMIN(int_y+1, max_y);
@@ -269,10 +269,10 @@ static uint8_t *interpolate_bilinear16(uint8_t *dst_color,
 int s01 = AV_RL16(&src[src_linestep * int_x1 + i + src_linesize * 
int_y ]);
 int s10 = AV_RL16(&src[src_linestep * int_x  + i + src_linesize * 
int_y1]);
 int s11 = AV_RL16(&src[src_linestep * int_x1 + i + src_linesize * 
int_y1]);
-int s0 = (((1<<16) - frac_x)*s00 + frac_x*s01);
-int s1 = (((1<<16) - frac_x)*s10 + frac_x*s11);
+int64_t s0 = (((1<<16) - frac_x)*s00 + frac_x*s01);
+int64_t s1 = (((1<<16) - frac_x)*s10 + frac_x*s11);
 
-AV_WL16(&dst_color[i], ((int64_t)((1<<16) - frac_y)*s0 + 
(int64_t)frac_y*s1) >> 32);
+AV_WL16(&dst_color[i], (((1<<16) - frac_y)*s0 + frac_y*s1) >> 32);
 }
 
 return dst_color;

___
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] lavc/x86/simple_idct: Fix linking shared libavcodec with MS link.exe

2022-10-09 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Sep 
11 16:02:09 2022 +0200| [60e87faf7f32a84a0aecf9a2969c7ce89b5e5f29] | committer: 
Carl Eugen Hoyos

lavc/x86/simple_idct: Fix linking shared libavcodec with MS link.exe

link.exe hangs on empty simple_idct.o

Fixes ticket #9909.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60e87faf7f32a84a0aecf9a2969c7ce89b5e5f29
---

 libavcodec/x86/simple_idct.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/simple_idct.asm b/libavcodec/x86/simple_idct.asm
index dcf0da6df1..982b2f0bbb 100644
--- a/libavcodec/x86/simple_idct.asm
+++ b/libavcodec/x86/simple_idct.asm
@@ -25,9 +25,9 @@
 
 %include "libavutil/x86/x86util.asm"
 
-%if ARCH_X86_32
 SECTION_RODATA
 
+%if ARCH_X86_32
 cextern pb_80
 
 wm1010: dw 0, 0x, 0, 0x

___
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] lavc/tiff: Support multi-component files without RowsPerStrip tag.

2022-09-01 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Aug 31 
19:37:19 2022 +0200| [ff6044b921ffb59964a126faef5106a391a819eb] | committer: 
Carl Eugen Hoyos

lavc/tiff: Support multi-component files without RowsPerStrip tag.

Fixes ticket #9514.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff6044b921ffb59964a126faef5106a391a819eb
---

 libavcodec/tiff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index b0595b56c0..109392ad44 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1367,7 +1367,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
 } else
 s->strippos = off;
 s->strips = count;
-if (s->strips == 1)
+if (s->strips == s->bppcount)
 s->rps = s->height;
 s->sot = type;
 break;

___
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] lavc/ass: Add missing version.h include

2022-08-31 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Aug 31 
16:25:31 2022 +0200| [4a054c3e97b4f30fe517114e381f9a2ee5a92f7c] | committer: 
Carl Eugen Hoyos

lavc/ass: Add missing version.h include

Fixes lavc version output in ass, regression since f2da2e14

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a054c3e97b4f30fe517114e381f9a2ee5a92f7c
---

 libavcodec/ass.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index a1e560d7ff..728cfb1ab5 100644
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -24,6 +24,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/common.h"
+#include "version.h"
 
 int ff_ass_subtitle_header_full(AVCodecContext *avctx,
 int play_res_x, int play_res_y,

___
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] lavf/sdp: Add missing version.h include

2022-08-31 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Aug 31 
16:24:22 2022 +0200| [7180416084cd9074e67a039992b43e5dc282fb81] | committer: 
Carl Eugen Hoyos

lavf/sdp: Add missing version.h include

Fixes lavf version output in SDP, regression since 4eb9232c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7180416084cd9074e67a039992b43e5dc282fb81
---

 libavformat/sdp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 99a19852ff..6888936290 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -33,6 +33,7 @@
 #include "avc.h"
 #include "hevc.h"
 #include "rtp.h"
+#include "version.h"
 #if CONFIG_NETWORK
 #include "network.h"
 #endif

___
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] lavc/mjpegdec: Decode format 211121 as YUV 4:4:4

2021-03-23 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Mar 21 
01:36:32 2021 +0100| [3220a908ca3c9e2d4108464f2127fdbb7479e69a] | committer: 
Carl Eugen Hoyos

lavc/mjpegdec: Decode format 211121 as YUV 4:4:4

Fixes ticket #8930.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3220a908ca3c9e2d4108464f2127fdbb7479e69a
---

 libavcodec/mjpegdec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 20f310fd70..5583d2aa35 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -560,6 +560,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 case 0x12121100:
 case 0x22122100:
 case 0x21211100:
+case 0x21112100:
 case 0x22211200:
 case 0x1100:
 case 0x22112200:

___
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] lavc/aomenc: Force default qmax of 0 if crf was set to 0.

2021-03-21 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Mar 20 
19:27:48 2021 +0100| [288ca1c66740640d5742f2921efbf502d83f8b6a] | committer: 
Carl Eugen Hoyos

lavc/aomenc: Force default qmax of 0 if crf was set to 0.

Fixes lossless encoding without setting qmax to 0.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=288ca1c66740640d5742f2921efbf502d83f8b6a
---

 libavcodec/libaomenc.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index 2c3c3eb185..fcf75e835d 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -654,8 +654,11 @@ static av_cold int aom_init(AVCodecContext *avctx,
 
 if (avctx->qmin >= 0)
 enccfg.rc_min_quantizer = avctx->qmin;
-if (avctx->qmax >= 0)
+if (avctx->qmax >= 0) {
 enccfg.rc_max_quantizer = avctx->qmax;
+} else if (!ctx->crf) {
+enccfg.rc_max_quantizer = 0;
+}
 
 if (enccfg.rc_end_usage == AOM_CQ || enccfg.rc_end_usage == AOM_Q) {
 if (ctx->crf < enccfg.rc_min_quantizer || ctx->crf > 
enccfg.rc_max_quantizer) {

___
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] lavf/swfdec: Allow decoding Nellymoser in swf.

2021-03-20 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Mar 16 
21:11:45 2021 +0100| [9f8c81efc51755a8ff02c1cf02a7585d998e1380] | committer: 
Carl Eugen Hoyos

lavf/swfdec: Allow decoding Nellymoser in swf.

Such files exist in the wild, see ticket #9153.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f8c81efc51755a8ff02c1cf02a7585d998e1380
---

 libavformat/swfdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index f9a164b33f..48c5af9a0b 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -52,7 +52,7 @@ static const AVCodecTag swf_audio_codec_tags[] = {
 { AV_CODEC_ID_ADPCM_SWF,  0x01 },
 { AV_CODEC_ID_MP3,0x02 },
 { AV_CODEC_ID_PCM_S16LE,  0x03 },
-//  { AV_CODEC_ID_NELLYMOSER, 0x06 },
+{ AV_CODEC_ID_NELLYMOSER, 0x06 },
 { AV_CODEC_ID_NONE,  0 },
 };
 

___
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] lavf/sga: Silence several warnings because of wrong format specifiers.

2021-03-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Mar  4 
20:34:36 2021 +0100| [b6fe10fa392f186c3f2a4adefc3b387774ef] | committer: 
Carl Eugen Hoyos

lavf/sga: Silence several warnings because of wrong format specifiers.

Fixes warnings like:
warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but 
argument n has type ‘uint64_t’

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6fe10fa392f186c3f2a4adefc3b387774ef
---

 libavformat/sga.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/sga.c b/libavformat/sga.c
index 20da423ebf..e7a41e91ea 100644
--- a/libavformat/sga.c
+++ b/libavformat/sga.c
@@ -232,11 +232,11 @@ static void print_stats(AVFormatContext *s, const char 
*where)
 SGADemuxContext *sga = s->priv_data;
 
 av_log(s, AV_LOG_DEBUG, "START %s\n", where);
-av_log(s, AV_LOG_DEBUG, "pos: %lX\n", avio_tell(s->pb));
+av_log(s, AV_LOG_DEBUG, "pos: %"PRIX64"\n", avio_tell(s->pb));
 av_log(s, AV_LOG_DEBUG, "idx: %X\n", sga->idx);
 av_log(s, AV_LOG_DEBUG, "packet_type: %X\n", sga->packet_type);
 av_log(s, AV_LOG_DEBUG, "payload_size: %X\n", sga->payload_size);
-av_log(s, AV_LOG_DEBUG, "SECTOR: %016lX\n", AV_RB64(sga->sector));
+av_log(s, AV_LOG_DEBUG, "SECTOR: %016"PRIX64"\n", AV_RB64(sga->sector));
 av_log(s, AV_LOG_DEBUG, "stream: %X\n", sga->sector[1]);
 av_log(s, AV_LOG_DEBUG, "END %s\n", where);
 }
@@ -300,7 +300,7 @@ static int sga_video_packet(AVFormatContext *s, AVPacket 
*pkt)
 sga->flags = 0;
 update_type_size(s);
 
-av_log(s, AV_LOG_DEBUG, "VIDEO PACKET: %d:%016lX i:%X\n", pkt->size, 
AV_RB64(sga->sector), sga->idx);
+av_log(s, AV_LOG_DEBUG, "VIDEO PACKET: %d:%016"PRIX64" i:%X\n", pkt->size, 
AV_RB64(sga->sector), sga->idx);
 
 return 0;
 }
@@ -347,7 +347,7 @@ static int sga_audio_packet(AVFormatContext *s, AVPacket 
*pkt)
 sga->flags = 0;
 update_type_size(s);
 
-av_log(s, AV_LOG_DEBUG, "AUDIO PACKET: %d:%016lX i:%X\n", pkt->size, 
AV_RB64(sga->sector), sga->idx);
+av_log(s, AV_LOG_DEBUG, "AUDIO PACKET: %d:%016"PRIX64" i:%X\n", pkt->size, 
AV_RB64(sga->sector), sga->idx);
 
 return 0;
 }

___
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] lavf/img2dec: Autodetect pfm images.

2021-02-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Feb 15 
00:34:01 2021 +0100| [c0d0b1c4f6f804796488adf3e552be88c0cee1a4] | committer: 
Carl Eugen Hoyos

lavf/img2dec: Autodetect pfm images.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0d0b1c4f6f804796488adf3e552be88c0cee1a4
---

 libavformat/img2dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index d10ba4ca40..6c78dada8c 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -993,7 +993,7 @@ static inline int pnm_probe(const AVProbeData *p)
 
 static int pbm_probe(const AVProbeData *p)
 {
-return pnm_magic_check(p, 1) || pnm_magic_check(p, 4) ? pnm_probe(p) : 0;
+return pnm_magic_check(p, 1) || pnm_magic_check(p, 4) || 
pnm_magic_check(p, 22) || pnm_magic_check(p, 54) ? pnm_probe(p) : 0;
 }
 
 static inline int pgmx_probe(const AVProbeData *p)

___
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] lavfi/vflip: Support Bayer vertical flip.

2021-02-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Sep  5 
21:14:01 2020 +0200| [3490108f95b5a350f75df8443b00fbeebcdf068d] | committer: 
Carl Eugen Hoyos

lavfi/vflip: Support Bayer vertical flip.

Fixes ticket #8819.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3490108f95b5a350f75df8443b00fbeebcdf068d
---

 libavfilter/vf_vflip.c | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c
index c7c39d3341..1de3dc5dac 100644
--- a/libavfilter/vf_vflip.c
+++ b/libavfilter/vf_vflip.c
@@ -33,6 +33,7 @@
 typedef struct FlipContext {
 const AVClass *class;
 int vsub;   ///< vertical chroma subsampling
+int bayer;
 } FlipContext;
 
 static const AVOption vflip_options[] = {
@@ -47,6 +48,7 @@ static int config_input(AVFilterLink *link)
 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
 
 flip->vsub = desc->log2_chroma_h;
+flip->bayer = !!(desc->flags & AV_PIX_FMT_FLAG_BAYER);
 
 return 0;
 }
@@ -74,11 +76,43 @@ static AVFrame *get_video_buffer(AVFilterLink *link, int w, 
int h)
 return frame;
 }
 
+static int flip_bayer(AVFilterLink *link, AVFrame *in)
+{
+AVFilterContext *ctx  = link->dst;
+AVFilterLink *outlink = ctx->outputs[0];
+AVFrame *out;
+uint8_t *inrow = in->data[0], *outrow;
+int i, width = outlink->w << 
(av_pix_fmt_desc_get(link->format)->comp[0].step > 1);
+if (outlink->h & 1) {
+av_log(ctx, AV_LOG_ERROR, "Bayer vertical flip needs even height\n");
+return AVERROR_INVALIDDATA;
+}
+
+out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+if (!out) {
+av_frame_free(&in);
+return AVERROR(ENOMEM);
+}
+av_frame_copy_props(out, in);
+outrow = out->data[0] + out->linesize[0] * (outlink->h - 2);
+for (i = 0; i < outlink->h >> 1; i++) {
+memcpy(outrow, inrow, width);
+memcpy(outrow + out->linesize[0], inrow + in->linesize[0], width);
+inrow  += 2 *  in->linesize[0];
+outrow -= 2 * out->linesize[0];
+}
+av_frame_free(&in);
+return ff_filter_frame(outlink, out);
+}
+
 static int filter_frame(AVFilterLink *link, AVFrame *frame)
 {
 FlipContext *flip = link->dst->priv;
 int i;
 
+if (flip->bayer)
+return flip_bayer(link, frame);
+
 for (i = 0; i < 4; i ++) {
 int vsub = i == 1 || i == 2 ? flip->vsub : 0;
 int height = AV_CEIL_RSHIFT(link->h, vsub);

___
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] lavc/pnm: Allow decoding gray float pfm images.

2021-02-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Feb 11 
23:37:06 2021 +0100| [ca781761d61de20f28b5c6486c64dbf2c2c4c944] | committer: 
Carl Eugen Hoyos

lavc/pnm: Allow decoding gray float pfm images.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca781761d61de20f28b5c6486c64dbf2c2c4c944
---

 libavcodec/pnm.c|  5 -
 libavcodec/pnmdec.c | 24 
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index 94ae74e13a..958f2a342e 100644
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -72,6 +72,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * 
const s)
 s->bytestream[0] != 'P' ||
 (s->bytestream[1] < '1' ||
  s->bytestream[1] > '7' &&
+ s->bytestream[1] != 'f' &&
  s->bytestream[1] != 'F')) {
 s->bytestream += s->bytestream_end > s->bytestream;
 s->bytestream += s->bytestream_end > s->bytestream;
@@ -82,6 +83,8 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * 
const s)
 
 if (buf1[1] == 'F') {
 avctx->pix_fmt = AV_PIX_FMT_GBRPF32;
+} else if (buf1[1] == 'f') {
+avctx->pix_fmt = AV_PIX_FMT_GRAYF32;
 } else if (s->type==1 || s->type==4) {
 avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
 } else if (s->type==2 || s->type==5) {
@@ -177,7 +180,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext 
* const s)
 if (ret < 0)
 return ret;
 
-if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32) {
+if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 || avctx->pix_fmt == 
AV_PIX_FMT_GRAYF32) {
 pnm_get(s, buf1, sizeof(buf1));
 if (av_sscanf(buf1, "%f", &s->scale) != 1 || s->scale == 0.0 || 
!isfinite(s->scale)) {
 av_log(avctx, AV_LOG_ERROR, "Invalid scale.\n");
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index 9add5cfc84..4d5ce0bcb5 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -297,6 +297,30 @@ static int pnm_decode_frame(AVCodecContext *avctx, void 
*data,
 }
 }
 break;
+case AV_PIX_FMT_GRAYF32:
+if (avctx->width * avctx->height * 4 > s->bytestream_end - 
s->bytestream)
+return AVERROR_INVALIDDATA;
+scale = 1.f / s->scale;
+if (s->endian) {
+float *g = (float *)p->data[0];
+for (int i = 0; i < avctx->height; i++) {
+for (int j = 0; j < avctx->width; j++) {
+g[j] = av_int2float(AV_RL32(s->bytestream)) * scale;
+s->bytestream += 4;
+}
+g += p->linesize[0] / 4;
+}
+} else {
+float *g = (float *)p->data[0];
+for (int i = 0; i < avctx->height; i++) {
+for (int j = 0; j < avctx->width; j++) {
+g[j] = av_int2float(AV_RB32(s->bytestream)) * scale;
+s->bytestream += 4;
+}
+g += p->linesize[0] / 4;
+}
+}
+break;
 }
 *got_frame = 1;
 

___
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] lsws/ppc/yuv2rgb: Fix transparency converting from yuv->rgb32.

2021-01-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Jan 23 
19:33:13 2021 +0100| [2687070d9b092d3a354a6963c65197054ddf7a75] | committer: 
Carl Eugen Hoyos

lsws/ppc/yuv2rgb: Fix transparency converting from yuv->rgb32.

Based on 68363b69 by Reimar Döffinger.

Fixes ticket #9077.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2687070d9b092d3a354a6963c65197054ddf7a75
---

 libswscale/ppc/yuv2rgb_altivec.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
index 58e480dd2c..4f5382e4c1 100644
--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned 
char **in,  \
 }
 
 #define out_abgr(a, b, c, ptr)  \
-vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), c, b, a, ptr)
+vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 
255 }, 0)), c, b, a, ptr)
 #define out_bgra(a, b, c, ptr)  \
-vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) { 255 }), ptr)
+vec_mstrgb32(__typeof__(a), c, b, a, ((__typeof__(a)) 
vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
 #define out_rgba(a, b, c, ptr)  \
-vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) { 255 }), ptr)
+vec_mstrgb32(__typeof__(a), a, b, c, ((__typeof__(a)) 
vec_splat((__typeof__(a)){ 255 }, 0)), ptr)
 #define out_argb(a, b, c, ptr)  \
-vec_mstrgb32(__typeof__(a), ((__typeof__(a)) { 255 }), a, b, c, ptr)
+vec_mstrgb32(__typeof__(a), ((__typeof__(a)) vec_splat((__typeof__(a)){ 
255 }, 0)), a, b, c, ptr)
 #define out_rgb24(a, b, c, ptr) vec_mstrgb24(a, b, c, ptr)
 #define out_bgr24(a, b, c, ptr) vec_mstbgr24(a, b, c, ptr)
 

___
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] tests/fate/fits: Add a todo for a 64bit test.

2021-01-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Jan 24 
17:13:19 2021 +0100| [3ee45eca98cd46aa31b74f7b9cb42be37ae5ae2b] | committer: 
Carl Eugen Hoyos

tests/fate/fits: Add a todo for a 64bit test.

The test should currently fail on big endian but passes because of the
unsuitable input file.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ee45eca98cd46aa31b74f7b9cb42be37ae5ae2b
---

 tests/fate/fits.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak
index 0ed8cdb425..8c2995a4c6 100644
--- a/tests/fate/fits.mak
+++ b/tests/fate/fits.mak
@@ -5,6 +5,7 @@ tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | 
tests/data
 -y $(TARGET_PATH)/$(@) 2>/dev/null
 
 #mapping of fits file formats to png filenames
+# TODO: Use an actual 64bit input file and fix the gbrp16 test on big-endian
 map.tests/data/lena-gray.fits:= gray8
 map.tests/data/lena-gbrp.fits:= rgb24
 map.tests/data/lena-gbrp16.fits  := rgb48

___
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] tests/fate/hlsenc: ffprobe is needed for hls-fmp4_ac3.

2021-01-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Jan 24 
17:12:05 2021 +0100| [9c9174b9c18c442ef8d948f90838483ba71a72be] | committer: 
Carl Eugen Hoyos

tests/fate/hlsenc: ffprobe is needed for hls-fmp4_ac3.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c9174b9c18c442ef8d948f90838483ba71a72be
---

 tests/fate/hlsenc.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak
index 15097842f4..02f041a7c2 100644
--- a/tests/fate/hlsenc.mak
+++ b/tests/fate/hlsenc.mak
@@ -106,7 +106,7 @@ tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | 
tests/data
$(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null
 
 FATE_HLSENC-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
-fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8
+fate-hls-fmp4_ac3: ffprobe$(PROGSSUF)$(EXESUF) tests/data/hls_fmp4_ac3.m3u8
 fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4
 
 FATE_SAMPLES_FFMPEG += $(FATE_HLSENC-yes)

___
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] lavf/img2dec: Increase score for very large jpeg images.

2020-12-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Dec 24 
13:16:44 2020 +0100| [2943c3debd611c0f37f8ff5eafb34ed369009a9c] | committer: 
Carl Eugen Hoyos

lavf/img2dec: Increase score for very large jpeg images.

Avoids a conflict with the raw mjpeg demuxer.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2943c3debd611c0f37f8ff5eafb34ed369009a9c
---

 libavformat/img2dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index ccb933ae33..1279d47f54 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -817,7 +817,7 @@ static int jpeg_probe(const AVProbeData *p)
 return AVPROBE_SCORE_EXTENSION + 1;
 if (state == SOS)
 return AVPROBE_SCORE_EXTENSION / 2;
-return AVPROBE_SCORE_EXTENSION / 8;
+return AVPROBE_SCORE_EXTENSION / 8 + 1;
 }
 
 static int jpegls_probe(const AVProbeData *p)

___
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] lavd/decklink_dec: Do not set codec_tags.

2020-12-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Dec 13 
11:01:02 2020 +0100| [b0a882cc93eb659d3e564b07f4c1f3eb87684bda] | committer: 
Carl Eugen Hoyos

lavd/decklink_dec: Do not set codec_tags.

Only set the pix_fmt for rawvideo.

Fixes ticket #9005.

Reviewed-by: Marton Balint

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0a882cc93eb659d3e564b07f4c1f3eb87684bda
---

 libavdevice/decklink_dec.cpp | 8 
 1 file changed, 8 deletions(-)

diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index d56d31ebea..6bd4676f5e 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -1320,34 +1320,26 @@ av_cold int ff_decklink_read_header(AVFormatContext 
*avctx)
 switch(ctx->raw_format) {
 case bmdFormat8BitYUV:
 st->codecpar->codec_id= AV_CODEC_ID_RAWVIDEO;
-st->codecpar->codec_tag   = MKTAG('U', 'Y', 'V', 'Y');
 st->codecpar->format  = AV_PIX_FMT_UYVY422;
 st->codecpar->bit_rate= av_rescale(ctx->bmd_width * 
ctx->bmd_height * 16, st->time_base.den, st->time_base.num);
 break;
 case bmdFormat10BitYUV:
 st->codecpar->codec_id= AV_CODEC_ID_V210;
-st->codecpar->codec_tag   = MKTAG('V','2','1','0');
 st->codecpar->bit_rate= av_rescale(ctx->bmd_width * 
ctx->bmd_height * 64, st->time_base.den, st->time_base.num * 3);
-st->codecpar->bits_per_coded_sample = 10;
 break;
 case bmdFormat8BitARGB:
 st->codecpar->codec_id= AV_CODEC_ID_RAWVIDEO;
 st->codecpar->format  = AV_PIX_FMT_0RGB;
-st->codecpar->codec_tag   = avcodec_pix_fmt_to_codec_tag((enum 
AVPixelFormat)st->codecpar->format);
 st->codecpar->bit_rate= av_rescale(ctx->bmd_width * 
ctx->bmd_height * 32, st->time_base.den, st->time_base.num);
 break;
 case bmdFormat8BitBGRA:
 st->codecpar->codec_id= AV_CODEC_ID_RAWVIDEO;
 st->codecpar->format  = AV_PIX_FMT_BGR0;
-st->codecpar->codec_tag   = avcodec_pix_fmt_to_codec_tag((enum 
AVPixelFormat)st->codecpar->format);
 st->codecpar->bit_rate= av_rescale(ctx->bmd_width * 
ctx->bmd_height * 32, st->time_base.den, st->time_base.num);
 break;
 case bmdFormat10BitRGB:
 st->codecpar->codec_id= AV_CODEC_ID_R210;
-st->codecpar->codec_tag   = MKTAG('R','2','1','0');
-st->codecpar->format  = AV_PIX_FMT_RGB48LE;
 st->codecpar->bit_rate= av_rescale(ctx->bmd_width * 
ctx->bmd_height * 30, st->time_base.den, st->time_base.num);
-st->codecpar->bits_per_coded_sample = 10;
 break;
 default:
 char fourcc_str[AV_FOURCC_MAX_STRING_SIZE] = {0};

___
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] lavf/rawdec: Return a low score if the mjpeg probe function detected one frame.

2020-12-10 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Dec  9 
23:42:33 2020 +0100| [7ab5192260c387a10998481fe1468f1304f6ebd2] | committer: 
Carl Eugen Hoyos

lavf/rawdec: Return a low score if the mjpeg probe function detected one frame.

Fixes ticket #9026.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ab5192260c387a10998481fe1468f1304f6ebd2
---

 libavformat/rawdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 10c37c5cb9..122afca1b6 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -208,6 +208,8 @@ static int mjpeg_probe(const AVProbeData *p)
 return AVPROBE_SCORE_EXTENSION / 2;
 return AVPROBE_SCORE_EXTENSION / 4;
 }
+if (!nb_invalid && nb_frames)
+return AVPROBE_SCORE_EXTENSION / 4;
 
 return 0;
 }

___
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] lsws/x86/yuv2rgb: Fix compilation with mmxext or ssse3 disabled.

2020-11-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Nov 14 
15:37:57 2020 +0100| [46e362b76551d6587747e6a41e97b1673df2ada9] | committer: 
Carl Eugen Hoyos

lsws/x86/yuv2rgb: Fix compilation with mmxext or ssse3 disabled.

Fixes ticket #8986.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46e362b76551d6587747e6a41e97b1673df2ada9
---

 libswscale/x86/yuv2rgb.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
index c12e88cbb5..2143026a0d 100644
--- a/libswscale/x86/yuv2rgb.c
+++ b/libswscale/x86/yuv2rgb.c
@@ -59,22 +59,18 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 
0x0707070707070707ULL;
 #endif /* HAVE_MMX */
 
 // MMXEXT versions
-#if HAVE_MMXEXT
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #define COMPILE_TEMPLATE_MMXEXT 1
 #define RENAME(a) a ## _mmxext
 #include "yuv2rgb_template.c"
-#endif /* HAVE_MMXEXT */
 
 //SSSE3 versions
-#if HAVE_SSSE3
 #undef RENAME
 #undef COMPILE_TEMPLATE_MMXEXT
 #define COMPILE_TEMPLATE_MMXEXT 0
 #define RENAME(a) a ## _ssse3
 #include "yuv2rgb_template.c"
-#endif
 
 #endif /* HAVE_X86ASM */
 

___
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] lavfi/Makefile: Remove opencl object files when calling make clean.

2020-10-25 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Oct 25 
21:18:34 2020 +0100| [7b0d1791956c9a7632370d76d0def9a05dc87c85] | committer: 
Carl Eugen Hoyos

lavfi/Makefile: Remove opencl object files when calling make clean.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b0d1791956c9a7632370d76d0def9a05dc87c85
---

 libavfilter/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index efdea39ccc..1e60c55f6f 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -537,7 +537,7 @@ TESTPROGS = drawutils filtfmts formats integral
 TOOLS-$(CONFIG_LIBZMQ) += zmqsend
 
 clean::
-   $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%)
+   $(RM) $(CLEANSUFFIXES:%=libavfilter/dnn/%) 
$(CLEANSUFFIXES:%=libavfilter/opencl/%)
 
 OPENCL = $(subst $(SRC_PATH)/,,$(wildcard $(SRC_PATH)/libavfilter/opencl/*.cl))
 .SECONDARY: $(OPENCL:.cl=.c)

___
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] lavc, lavf: Remove newlines from calls to avpriv_request_sample().

2020-10-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Oct 11 
19:59:24 2020 +0200| [86f0bba776018cd83642c0195ac3f41f3c87c1d3] | committer: 
Carl Eugen Hoyos

lavc, lavf: Remove newlines from calls to avpriv_request_sample().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86f0bba776018cd83642c0195ac3f41f3c87c1d3
---

 libavcodec/adpcm.c | 2 +-
 libavcodec/alsdec.c| 2 +-
 libavcodec/g2meet.c| 2 +-
 libavcodec/h264_direct.c   | 2 +-
 libavcodec/mpeg4videodec.c | 2 +-
 libavcodec/tiff.c  | 4 ++--
 libavformat/dhav.c | 4 ++--
 libavformat/vividas.c  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 37d503ff6c..f7da3dcf89 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -129,7 +129,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
 min_channels = 2;
 max_channels = 8;
 if (avctx->channels & 1) {
-avpriv_request_sample(avctx, "channel count %d\n", 
avctx->channels);
+avpriv_request_sample(avctx, "channel count %d", avctx->channels);
 return AVERROR_PATCHWELCOME;
 }
 break;
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 62c6036037..c2c460a29c 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -350,7 +350,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
 return AVERROR_INVALIDDATA;
 
 if (avctx->channels > FF_SANE_NB_CHANNELS) {
-avpriv_request_sample(avctx, "Huge number of channels\n");
+avpriv_request_sample(avctx, "Huge number of channels");
 return AVERROR_PATCHWELCOME;
 }
 
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 7ef275c9fe..6b870ae3d4 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -560,7 +560,7 @@ static uint32_t epic_decode_pixel_pred(ePICContext *dc, int 
x, int y,
 }
 
 if (R<0 || G<0 || B<0 || R > 255 || G > 255 || B > 255) {
-avpriv_request_sample(NULL, "RGB %d %d %d is out of range\n", R, G, B);
+avpriv_request_sample(NULL, "RGB %d %d %d (out of range)", R, G, B);
 return 0;
 }
 
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index a01d823e7a..8f07981130 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -43,7 +43,7 @@ static int get_scale_factor(H264SliceContext *sl,
 int td = av_clip_int8(pocdiff);
 
 if (pocdiff != (int)pocdiff)
-avpriv_request_sample(sl->h264->avctx, "pocdiff overflow\n");
+avpriv_request_sample(sl->h264->avctx, "pocdiff overflow");
 
 if (td == 0 || sl->ref_list[0][i].parent->long_ref) {
 return 256;
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 14fb79261d..95a0e63a29 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -3347,7 +3347,7 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, 
GetBitContext *gb, int
 next_start_code_studio(gb);
 extension_and_user_data(s, gb, 0);
 } else if (s->studio_profile) {
-avpriv_request_sample(s->avctx, "Mixes studio and non studio 
profile\n");
+avpriv_request_sample(s->avctx, "Mix of studio and non studio 
profile");
 return AVERROR_PATCHWELCOME;
 }
 s->avctx->profile = profile;
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 9bf08b1900..2e45464218 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1590,7 +1590,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
 break;
 case TIFF_GEO_KEY_DIRECTORY:
 if (s->geotag_count) {
-avpriv_request_sample(s->avctx, "Multiple geo key directories\n");
+avpriv_request_sample(s->avctx, "Multiple geo key directories");
 return AVERROR_INVALIDDATA;
 }
 ADD_METADATA(1, "GeoTIFF_Version", NULL);
@@ -1860,7 +1860,7 @@ again:
 return AVERROR_INVALIDDATA;
 }
 if (off <= last_off) {
-avpriv_request_sample(s->avctx, "non increasing IFD offset\n");
+avpriv_request_sample(s->avctx, "non increasing IFD offset");
 return AVERROR_INVALIDDATA;
 }
 if (off >= UINT_MAX - 14 || avpkt->size < off + 14) {
diff --git a/libavformat/dhav.c b/libavformat/dhav.c
index 5e9abdb611..79afe9be03 100644
--- a/libavformat/dhav.c
+++ b/libavformat/dhav.c
@@ -359,7 +359,7 @@ retry:
 case 0x4:
 case 0x8: st->codecpar->codec_id = AV_CODEC_ID_H264;  break;
 case 0xc: st->codecpar->codec_id = AV_CODEC_ID_HEVC;  break;
-default: avpriv_request_sample(s, "

[FFmpeg-cvslog] lavf/img2dec: Auto-detect Cintel scanner images.

2020-10-08 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Oct  8 
09:34:55 2020 +0200| [bc43588a71181a6b2ea01119a7551f0d76a37b32] | committer: 
Carl Eugen Hoyos

lavf/img2dec: Auto-detect Cintel scanner images.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc43588a71181a6b2ea01119a7551f0d76a37b32
---

 libavformat/allformats.c |  1 +
 libavformat/img2dec.c| 12 
 libavformat/version.h|  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 3912b60ec3..96b9bc2a0c 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -489,6 +489,7 @@ extern AVInputFormat  ff_yuv4mpegpipe_demuxer;
 extern AVOutputFormat ff_yuv4mpegpipe_muxer;
 /* image demuxers */
 extern AVInputFormat  ff_image_bmp_pipe_demuxer;
+extern AVInputFormat  ff_image_cri_pipe_demuxer;
 extern AVInputFormat  ff_image_dds_pipe_demuxer;
 extern AVInputFormat  ff_image_dpx_pipe_demuxer;
 extern AVInputFormat  ff_image_exr_pipe_demuxer;
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 9a3c9fad02..4f9bfc635a 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -684,6 +684,17 @@ static int bmp_probe(const AVProbeData *p)
 return AVPROBE_SCORE_EXTENSION / 4;
 }
 
+static int cri_probe(const AVProbeData *p)
+{
+const uint8_t *b = p->buf;
+
+if (   AV_RL32(b) == 1
+&& AV_RL32(b + 4) == 4
+&& AV_RN32(b + 8) == AV_RN32("DVCC"))
+return AVPROBE_SCORE_MAX - 1;
+return 0;
+}
+
 static int dds_probe(const AVProbeData *p)
 {
 const uint8_t *b = p->buf;
@@ -1101,6 +1112,7 @@ AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\
 };
 
 IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP)
+IMAGEAUTO_DEMUXER(cri, AV_CODEC_ID_CRI)
 IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS)
 IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX)
 IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR)
diff --git a/libavformat/version.h b/libavformat/version.h
index 6a601f0c92..86e0a232ee 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
-#define LIBAVFORMAT_VERSION_MINOR  61
+#define LIBAVFORMAT_VERSION_MINOR  62
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

___
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] lavf/img2dec: Auto-detect Kodak Photo CD image files.

2020-09-05 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Sep  5 
10:45:52 2020 +0200| [d263838958def82118bc2abe7fe1ccb0821af550] | committer: 
Carl Eugen Hoyos

lavf/img2dec: Auto-detect Kodak Photo CD image files.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d263838958def82118bc2abe7fe1ccb0821af550
---

 libavformat/Makefile |  1 +
 libavformat/allformats.c |  1 +
 libavformat/img2dec.c| 12 
 libavformat/version.h|  2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 7f852c05ff..2368bc15ac 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -261,6 +261,7 @@ OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o 
img2.o
 OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o
 OBJS-$(CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER)  += img2dec.o img2.o
 OBJS-$(CONFIG_IMAGE_PGM_PIPE_DEMUXER) += img2dec.o img2.o
+OBJS-$(CONFIG_IMAGE_PHOTOCD_DEMUXER)  += img2dec.o img2.o
 OBJS-$(CONFIG_IMAGE_PICTOR_PIPE_DEMUXER)  += img2dec.o img2.o
 OBJS-$(CONFIG_IMAGE_PNG_PIPE_DEMUXER) += img2dec.o img2.o
 OBJS-$(CONFIG_IMAGE_PPM_PIPE_DEMUXER) += img2dec.o img2.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 8a733b3f4d..3438a14141 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -494,6 +494,7 @@ extern AVInputFormat  ff_image_pcx_pipe_demuxer;
 extern AVInputFormat  ff_image_pgmyuv_pipe_demuxer;
 extern AVInputFormat  ff_image_pgm_pipe_demuxer;
 extern AVInputFormat  ff_image_pgx_pipe_demuxer;
+extern AVInputFormat  ff_image_photocd_pipe_demuxer;
 extern AVInputFormat  ff_image_pictor_pipe_demuxer;
 extern AVInputFormat  ff_image_png_pipe_demuxer;
 extern AVInputFormat  ff_image_ppm_pipe_demuxer;
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index a7e89cd056..9a3c9fad02 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -1070,6 +1070,17 @@ static int gif_probe(const AVProbeData *p)
 return AVPROBE_SCORE_MAX - 1;
 }
 
+static int photocd_probe(const AVProbeData *p)
+{
+if (!memcmp(p->buf, "PCD_OPA", 7))
+return AVPROBE_SCORE_MAX - 1;
+
+if (p->buf_size < 0x807 || memcmp(p->buf + 0x800, "PCD_IPI", 7))
+return 0;
+
+return AVPROBE_SCORE_MAX - 1;
+}
+
 #define IMAGEAUTO_DEMUXER(imgname, codecid)\
 static const AVClass imgname ## _class = {\
 .class_name = AV_STRINGIFY(imgname) " demuxer",\
@@ -1103,6 +1114,7 @@ IMAGEAUTO_DEMUXER(pcx, AV_CODEC_ID_PCX)
 IMAGEAUTO_DEMUXER(pgm, AV_CODEC_ID_PGM)
 IMAGEAUTO_DEMUXER(pgmyuv,  AV_CODEC_ID_PGMYUV)
 IMAGEAUTO_DEMUXER(pgx, AV_CODEC_ID_PGX)
+IMAGEAUTO_DEMUXER(photocd, AV_CODEC_ID_PHOTOCD)
 IMAGEAUTO_DEMUXER(pictor,  AV_CODEC_ID_PICTOR)
 IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG)
 IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM)
diff --git a/libavformat/version.h b/libavformat/version.h
index 4208d38072..7771a6abf2 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
 // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
-#define LIBAVFORMAT_VERSION_MINOR  53
+#define LIBAVFORMAT_VERSION_MINOR  54
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

___
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] lavf/rtpdec_jpeg: Fix JFIF version.

2020-08-25 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu May 21 
22:03:08 2020 +0200| [09e260f69aec891860419d8bd9c0d0cbab9f2d40] | committer: 
Carl Eugen Hoyos

lavf/rtpdec_jpeg: Fix JFIF version.

See also b1931321

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09e260f69aec891860419d8bd9c0d0cbab9f2d40
---

 libavformat/rtpdec_jpeg.c | 2 +-
 libavformat/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 931463cec4..b32d074136 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -112,7 +112,7 @@ static int jpeg_create_header(uint8_t *buf, int size, 
uint32_t type, uint32_t w,
 jpeg_put_marker(&pbc, APP0);
 bytestream2_put_be16(&pbc, 16);
 bytestream2_put_buffer(&pbc, "JFIF", 5);
-bytestream2_put_be16(&pbc, 0x0201);
+bytestream2_put_be16(&pbc, 0x0102);
 bytestream2_put_byte(&pbc, 0);
 bytestream2_put_be16(&pbc, 1);
 bytestream2_put_be16(&pbc, 1);
diff --git a/libavformat/version.h b/libavformat/version.h
index aa309ecc77..88876aec79 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -33,7 +33,7 @@
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
 #define LIBAVFORMAT_VERSION_MINOR  51
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \

___
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] lavc: Lower MediaFoundation audio encoder priority.

2020-08-25 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.3 | Carl Eugen Hoyos  | Tue Jun 
23 20:41:46 2020 +0200| [0a012a5338b4dd36b82aaa4b382a8292f5096c7c] | committer: 
Carl Eugen Hoyos

lavc: Lower MediaFoundation audio encoder priority.

The actual encoders may not be available.
Fixes ticket #8699.

(cherry picked from commit 13db5061ff3c0ff0ad29294e276f7829d3456f5b)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a012a5338b4dd36b82aaa4b382a8292f5096c7c
---

 libavcodec/allcodecs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 80f128cade..fa0c08d42e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -679,9 +679,7 @@ extern AVCodec ff_xsub_decoder;
 /* external libraries */
 extern AVCodec ff_aac_at_encoder;
 extern AVCodec ff_aac_at_decoder;
-extern AVCodec ff_aac_mf_encoder;
 extern AVCodec ff_ac3_at_decoder;
-extern AVCodec ff_ac3_mf_encoder;
 extern AVCodec ff_adpcm_ima_qt_at_decoder;
 extern AVCodec ff_alac_at_encoder;
 extern AVCodec ff_alac_at_decoder;
@@ -693,7 +691,6 @@ extern AVCodec ff_ilbc_at_decoder;
 extern AVCodec ff_mp1_at_decoder;
 extern AVCodec ff_mp2_at_decoder;
 extern AVCodec ff_mp3_at_decoder;
-extern AVCodec ff_mp3_mf_encoder;
 extern AVCodec ff_pcm_alaw_at_encoder;
 extern AVCodec ff_pcm_alaw_at_decoder;
 extern AVCodec ff_pcm_mulaw_at_encoder;
@@ -757,6 +754,8 @@ extern AVCodec ff_idf_decoder;
 
 /* external libraries, that shouldn't be used by default if one of the
  * above is available */
+extern AVCodec ff_aac_mf_encoder;
+extern AVCodec ff_ac3_mf_encoder;
 extern AVCodec ff_h263_v4l2m2m_encoder;
 extern AVCodec ff_libaom_av1_decoder;
 extern AVCodec ff_libopenh264_encoder;
@@ -789,6 +788,7 @@ extern AVCodec ff_mjpeg_cuvid_decoder;
 extern AVCodec ff_mjpeg_qsv_encoder;
 extern AVCodec ff_mjpeg_qsv_decoder;
 extern AVCodec ff_mjpeg_vaapi_encoder;
+extern AVCodec ff_mp3_mf_encoder;
 extern AVCodec ff_mpeg1_cuvid_decoder;
 extern AVCodec ff_mpeg2_cuvid_decoder;
 extern AVCodec ff_mpeg2_qsv_encoder;

___
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] doc/examples: Always open files as "binary", not "text".

2020-08-25 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Jun 25 
00:01:36 2020 +0200| [68f637b6f94d25f45eee2e9320e0057a548b92e0] | committer: 
Carl Eugen Hoyos

doc/examples: Always open files as "binary", not "text".

Fixes ticket #8638.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68f637b6f94d25f45eee2e9320e0057a548b92e0
---

 doc/examples/decode_video.c | 2 +-
 doc/examples/hw_decode.c| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c
index 169188a4b9..18ee90a6c0 100644
--- a/doc/examples/decode_video.c
+++ b/doc/examples/decode_video.c
@@ -41,7 +41,7 @@ static void pgm_save(unsigned char *buf, int wrap, int xsize, 
int ysize,
 FILE *f;
 int i;
 
-f = fopen(filename,"w");
+f = fopen(filename,"wb");
 fprintf(f, "P5\n%d %d\n%d\n", xsize, ysize, 255);
 for (i = 0; i < ysize; i++)
 fwrite(buf + i * wrap, 1, xsize, f);
diff --git a/doc/examples/hw_decode.c b/doc/examples/hw_decode.c
index f3286f472d..71be6e6709 100644
--- a/doc/examples/hw_decode.c
+++ b/doc/examples/hw_decode.c
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
 }
 
 /* open the file to dump raw data */
-output_file = fopen(argv[3], "w+");
+output_file = fopen(argv[3], "w+b");
 
 /* actual decoding and dump the raw data */
 while (ret >= 0) {

___
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] lavfi/hflip: Support Bayer pixel formats.

2020-08-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Jul 26 
21:58:31 2020 +0200| [b61376bdee61c08732105fa331eb076497eface9] | committer: 
Carl Eugen Hoyos

lavfi/hflip: Support Bayer pixel formats.

Fixes part of ticket #8819.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b61376bdee61c08732105fa331eb076497eface9
---

 libavfilter/hflip.h   | 1 +
 libavfilter/vf_hflip.c| 4 +++-
 tests/checkasm/vf_hflip.c | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavfilter/hflip.h b/libavfilter/hflip.h
index 204090dbb4..a40b98470b 100644
--- a/libavfilter/hflip.h
+++ b/libavfilter/hflip.h
@@ -27,6 +27,7 @@
 typedef struct FlipContext {
 const AVClass *class;
 int max_step[4];///< max pixel step for each plane, expressed as a 
number of bytes
+int bayer_plus1;///< 1 .. not a Bayer input format, 2 .. Bayer input 
format
 int planewidth[4];  ///< width of each plane
 int planeheight[4]; ///< height of each plane
 
diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c
index b77afc77fc..8d7bd9b4db 100644
--- a/libavfilter/vf_hflip.c
+++ b/libavfilter/vf_hflip.c
@@ -138,6 +138,7 @@ static int config_props(AVFilterLink *inlink)
 s->planewidth[1]  = s->planewidth[2]  = AV_CEIL_RSHIFT(inlink->w, hsub);
 s->planeheight[0] = s->planeheight[3] = inlink->h;
 s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, vsub);
+s->bayer_plus1= !!(pix_desc->flags & AV_PIX_FMT_FLAG_BAYER) + 1;
 
 nb_planes = av_pix_fmt_count_planes(inlink->format);
 
@@ -149,6 +150,7 @@ int ff_hflip_init(FlipContext *s, int step[4], int 
nb_planes)
 int i;
 
 for (i = 0; i < nb_planes; i++) {
+step[i] *= s->bayer_plus1;
 switch (step[i]) {
 case 1: s->flip_line[i] = hflip_byte_c;  break;
 case 2: s->flip_line[i] = hflip_short_c; break;
@@ -180,7 +182,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, 
int job, int nb_jobs)
 int i, plane, step;
 
 for (plane = 0; plane < 4 && in->data[plane] && in->linesize[plane]; 
plane++) {
-const int width  = s->planewidth[plane];
+const int width  = s->planewidth[plane] / s->bayer_plus1;
 const int height = s->planeheight[plane];
 const int start = (height *  job   ) / nb_jobs;
 const int end   = (height * (job+1)) / nb_jobs;
diff --git a/tests/checkasm/vf_hflip.c b/tests/checkasm/vf_hflip.c
index 6bb4d09d64..48ebf85fdb 100644
--- a/tests/checkasm/vf_hflip.c
+++ b/tests/checkasm/vf_hflip.c
@@ -40,6 +40,7 @@ static void check_hflip(int step, const char * report_name){
 int i;
 int step_array[4] = {1, 1, 1, 1};
 FlipContext s;
+s.bayer_plus1 = 1;
 
 declare_func(void, const uint8_t *src, uint8_t *dst, int w);
 

___
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] lavf/mxfdec: Limit score for files with run-in.

2020-08-24 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Aug 24 
21:37:00 2020 +0200| [3092a53cbc48252d29007177205f599c9c6f8769] | committer: 
Carl Eugen Hoyos

lavf/mxfdec: Limit score for files with run-in.

Only return AVPROBE_SCORE_MAX if the header partition pack key
is at the start of the file.
Fixes ticket #8846.

Reviewed-by: Tomas Härdin

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3092a53cbc48252d29007177205f599c9c6f8769
---

 libavformat/mxfdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 4b56984b77..3a090147a0 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -3615,7 +3615,7 @@ static int mxf_probe(const AVProbeData *p) {
 AV_RN32(bufp+ 4) == AV_RN32(mxf_header_partition_pack_key+ 4) 
&&
 AV_RN32(bufp+ 8) == AV_RN32(mxf_header_partition_pack_key+ 8) 
&&
 AV_RN16(bufp+12) == AV_RN16(mxf_header_partition_pack_key+12))
-return AVPROBE_SCORE_MAX;
+return bufp == p->buf ? AVPROBE_SCORE_MAX : AVPROBE_SCORE_MAX 
- 1;
 bufp ++;
 } else
 bufp += 10;

___
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] lavc/sgienc: Fix default 16bit encoding.

2020-07-19 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Jul 19 
21:57:41 2020 +0200| [c4b6ee55c0a5dbf1a56c5be95eb19f86e762ddcb] | committer: 
Carl Eugen Hoyos

lavc/sgienc: Fix default 16bit encoding.

Broken since 7c56b879

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4b6ee55c0a5dbf1a56c5be95eb19f86e762ddcb
---

 libavcodec/sgienc.c | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index 13756f1608..40771d4666 100644
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -219,7 +219,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
 bytestream2_put_be32(&taboff_pcb, bytestream2_tell_p(&pbc));
 
 for (x = 0; x < width * bytes_per_channel; x += 
bytes_per_channel)
-encode_buf[x] = in_buf[depth * x];
+if (bytes_per_channel == 1) {
+encode_buf[x] = in_buf[depth * x];
+} else if (HAVE_BIGENDIAN ^ put_be) {
+encode_buf[x + 1] = in_buf[depth * x];
+encode_buf[x] = in_buf[depth * x + 1];
+} else {
+encode_buf[x] = in_buf[depth * x];
+encode_buf[x + 1] = in_buf[depth * x + 1];
+}
 
 length = sgi_rle_encode(&pbc, encode_buf, width,
 bytes_per_channel);

___
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] lavc: Lower MediaFoundation audio encoder priority.

2020-06-23 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Jun 23 
20:41:46 2020 +0200| [13db5061ff3c0ff0ad29294e276f7829d3456f5b] | committer: 
Carl Eugen Hoyos

lavc: Lower MediaFoundation audio encoder priority.

The actual encoders may not be available.
Fixes ticket #8699.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13db5061ff3c0ff0ad29294e276f7829d3456f5b
---

 libavcodec/allcodecs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 80f128cade..fa0c08d42e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -679,9 +679,7 @@ extern AVCodec ff_xsub_decoder;
 /* external libraries */
 extern AVCodec ff_aac_at_encoder;
 extern AVCodec ff_aac_at_decoder;
-extern AVCodec ff_aac_mf_encoder;
 extern AVCodec ff_ac3_at_decoder;
-extern AVCodec ff_ac3_mf_encoder;
 extern AVCodec ff_adpcm_ima_qt_at_decoder;
 extern AVCodec ff_alac_at_encoder;
 extern AVCodec ff_alac_at_decoder;
@@ -693,7 +691,6 @@ extern AVCodec ff_ilbc_at_decoder;
 extern AVCodec ff_mp1_at_decoder;
 extern AVCodec ff_mp2_at_decoder;
 extern AVCodec ff_mp3_at_decoder;
-extern AVCodec ff_mp3_mf_encoder;
 extern AVCodec ff_pcm_alaw_at_encoder;
 extern AVCodec ff_pcm_alaw_at_decoder;
 extern AVCodec ff_pcm_mulaw_at_encoder;
@@ -757,6 +754,8 @@ extern AVCodec ff_idf_decoder;
 
 /* external libraries, that shouldn't be used by default if one of the
  * above is available */
+extern AVCodec ff_aac_mf_encoder;
+extern AVCodec ff_ac3_mf_encoder;
 extern AVCodec ff_h263_v4l2m2m_encoder;
 extern AVCodec ff_libaom_av1_decoder;
 extern AVCodec ff_libopenh264_encoder;
@@ -789,6 +788,7 @@ extern AVCodec ff_mjpeg_cuvid_decoder;
 extern AVCodec ff_mjpeg_qsv_encoder;
 extern AVCodec ff_mjpeg_qsv_decoder;
 extern AVCodec ff_mjpeg_vaapi_encoder;
+extern AVCodec ff_mp3_mf_encoder;
 extern AVCodec ff_mpeg1_cuvid_decoder;
 extern AVCodec ff_mpeg2_cuvid_decoder;
 extern AVCodec ff_mpeg2_qsv_encoder;

___
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] lavc/opus: Reset alloc_trim when doing decoder bit-allocation.

2020-05-02 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat May  2 
10:09:01 2020 +0200| [0d81edcbba5149e46b11d447790f3a57a6eaa635] | committer: 
Carl Eugen Hoyos

lavc/opus: Reset alloc_trim when doing decoder bit-allocation.

Fixes ticket #8649.
Reported-by: irc user Xogium

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d81edcbba5149e46b11d447790f3a57a6eaa635
---

 libavcodec/opus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/opus.c b/libavcodec/opus.c
index f74278a7e3..64de246720 100644
--- a/libavcodec/opus.c
+++ b/libavcodec/opus.c
@@ -613,6 +613,8 @@ void ff_celt_bitalloc(CeltFrame *f, OpusRangeCoder *rc, int 
encode)
 }
 
 /* Allocation trim */
+if (!encode)
+f->alloc_trim = 5;
 if (opus_rc_tell_frac(rc) + (6 << 3) <= tbits_8ths)
 if (encode)
 ff_opus_rc_enc_cdf(rc, f->alloc_trim, ff_celt_model_alloc_trim);

___
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] lavc/jpeg2000dec: Cosmetics, re-indent after last commit.

2020-04-15 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Apr 15 
20:03:33 2020 +0200| [d727fea4dadebaf3e6ffe89a875d3ed51edde377] | committer: 
Carl Eugen Hoyos

lavc/jpeg2000dec: Cosmetics, re-indent after last commit.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d727fea4dadebaf3e6ffe89a875d3ed51edde377
---

 libavcodec/jpeg2000dec.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 440b856a3a..af6dcee228 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -406,12 +406,12 @@ static int get_siz(Jpeg2000DecoderContext *s)
 && !pix_fmt_match(s->avctx->pix_fmt, ncomponents, s->precision, 
log2_chroma_wh, s->pal8))
 s->avctx->pix_fmt = AV_PIX_FMT_NONE;
 if (s->avctx->pix_fmt == AV_PIX_FMT_NONE)
-for (i = 0; i < possible_fmts_nb; ++i) {
-if (pix_fmt_match(possible_fmts[i], ncomponents, s->precision, 
log2_chroma_wh, s->pal8)) {
-s->avctx->pix_fmt = possible_fmts[i];
-break;
+for (i = 0; i < possible_fmts_nb; ++i) {
+if (pix_fmt_match(possible_fmts[i], ncomponents, s->precision, 
log2_chroma_wh, s->pal8)) {
+s->avctx->pix_fmt = possible_fmts[i];
+break;
+}
 }
-}
 
 if (i == possible_fmts_nb) {
 if (ncomponents == 4 &&

___
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] lavc/jpeg2000dec: Allow to force a compatible pix_fmt.

2020-04-15 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Apr 13 
16:25:02 2020 +0200| [cbe3f1b1fbc0e0bd2c265f1d9b78e29ac185f17b] | committer: 
Carl Eugen Hoyos

lavc/jpeg2000dec: Allow to force a compatible pix_fmt.

This copies the behaviour of the libopenjpeg decoder.
Fixes ticket #5919.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbe3f1b1fbc0e0bd2c265f1d9b78e29ac185f17b
---

 libavcodec/jpeg2000dec.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 7196cba6b4..440b856a3a 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -402,6 +402,10 @@ static int get_siz(Jpeg2000DecoderContext *s)
 break;
 }
 }
+if (   s->avctx->pix_fmt != AV_PIX_FMT_NONE
+&& !pix_fmt_match(s->avctx->pix_fmt, ncomponents, s->precision, 
log2_chroma_wh, s->pal8))
+s->avctx->pix_fmt = AV_PIX_FMT_NONE;
+if (s->avctx->pix_fmt == AV_PIX_FMT_NONE)
 for (i = 0; i < possible_fmts_nb; ++i) {
 if (pix_fmt_match(possible_fmts[i], ncomponents, s->precision, 
log2_chroma_wh, s->pal8)) {
 s->avctx->pix_fmt = possible_fmts[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] ffmpeg: Do not clip timestamps at LONG_MAX.

2020-04-15 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Apr 13 
14:01:14 2020 +0200| [d5bf704f507d75d3ca996703440b51a68b87d5ba] | committer: 
Carl Eugen Hoyos

ffmpeg: Do not clip timestamps at LONG_MAX.

Fixes ticket #8612.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5bf704f507d75d3ca996703440b51a68b87d5ba
---

 fftools/ffmpeg.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 0578265c1e..d896b14a14 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1147,7 +1147,7 @@ static void do_video_out(OutputFile *of,
 av_log(NULL, AV_LOG_DEBUG, "Not duplicating %d initial 
frames\n", (int)lrintf(delta0));
 delta = duration;
 delta0 = 0;
-ost->sync_opts = lrint(sync_ipts);
+ost->sync_opts = llrint(sync_ipts);
 }
 case VSYNC_CFR:
 // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
@@ -1158,18 +1158,18 @@ static void do_video_out(OutputFile *of,
 else if (delta > 1.1) {
 nb_frames = lrintf(delta);
 if (delta0 > 1.1)
-nb0_frames = lrintf(delta0 - 0.6);
+nb0_frames = llrintf(delta0 - 0.6);
 }
 break;
 case VSYNC_VFR:
 if (delta <= -0.6)
 nb_frames = 0;
 else if (delta > 0.6)
-ost->sync_opts = lrint(sync_ipts);
+ost->sync_opts = llrint(sync_ipts);
 break;
 case VSYNC_DROP:
 case VSYNC_PASSTHROUGH:
-ost->sync_opts = lrint(sync_ipts);
+ost->sync_opts = llrint(sync_ipts);
 break;
 default:
 av_assert0(0);

___
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] lavu/mem: Make other alloc functions more similar to av_malloc().

2020-04-12 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Apr 12 
00:36:30 2020 +0200| [b7d9507bb8c4d1b8bf99158d6859a5b2ecd73298] | committer: 
Carl Eugen Hoyos

lavu/mem: Make other alloc functions more similar to av_malloc().

Do not limit the array allocation functions and av_calloc() to allocations
of INT_MAX, instead depend on max_alloc_size like av_malloc().

Allows a workaround for ticket #7140.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7d9507bb8c4d1b8bf99158d6859a5b2ecd73298
---

 libavutil/mem.c | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 88fe09b179..a29c224264 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -183,23 +183,26 @@ int av_reallocp(void *ptr, size_t size)
 
 void *av_malloc_array(size_t nmemb, size_t size)
 {
-if (!size || nmemb >= INT_MAX / size)
+size_t result;
+if (av_size_mult(nmemb, size, &result) < 0)
 return NULL;
-return av_malloc(nmemb * size);
+return av_malloc(result);
 }
 
 void *av_mallocz_array(size_t nmemb, size_t size)
 {
-if (!size || nmemb >= INT_MAX / size)
+size_t result;
+if (av_size_mult(nmemb, size, &result) < 0)
 return NULL;
-return av_mallocz(nmemb * size);
+return av_mallocz(result);
 }
 
 void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
 {
-if (!size || nmemb >= INT_MAX / size)
+size_t result;
+if (av_size_mult(nmemb, size, &result) < 0)
 return NULL;
-return av_realloc(ptr, nmemb * size);
+return av_realloc(ptr, result);
 }
 
 int av_reallocp_array(void *ptr, size_t nmemb, size_t size)
@@ -243,9 +246,10 @@ void *av_mallocz(size_t size)
 
 void *av_calloc(size_t nmemb, size_t size)
 {
-if (size <= 0 || nmemb >= INT_MAX / size)
+size_t result;
+if (av_size_mult(nmemb, size, &result) < 0)
 return NULL;
-return av_mallocz(nmemb * size);
+return av_mallocz(result);
 }
 
 char *av_strdup(const char *s)

___
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] lavc/amrwbdec: Add a comment about the missing muting technique.

2020-04-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Apr 11 
14:23:51 2020 +0200| [53254234370367b0996d9322f871de985ebbfa3c] | committer: 
Carl Eugen Hoyos

lavc/amrwbdec: Add a comment about the missing muting technique.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53254234370367b0996d9322f871de985ebbfa3c
---

 libavcodec/amrwbdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 7d357a2685..555c4bc45d 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1125,6 +1125,8 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void 
*data,
 av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n");
 
 if (ctx->fr_cur_mode == NO_DATA || !ctx->fr_quality) {
+/* The specification suggests a "random signal" and
+   "a muting technique" to "gradually decrease the output level". */
 av_samples_set_silence(&frame->data[0], 0, frame->nb_samples, 1, 
AV_SAMPLE_FMT_FLT);
 *got_frame_ptr = 1;
 return expected_fr_size;

___
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] lavc/amrwbdec: Remove a dead comparison.

2020-04-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Apr 11 
14:08:49 2020 +0200| [8f01fa378fb3f54941d02918ba343811822a605a] | committer: 
Carl Eugen Hoyos

lavc/amrwbdec: Remove a dead comparison.

Modes > MODE_SID are already filtered out at this point.
Simplifies the following change.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f01fa378fb3f54941d02918ba343811822a605a
---

 libavcodec/amrwbdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 5943bfc84e..3d82b6ba71 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1139,7 +1139,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void 
*data,
 return AVERROR_INVALIDDATA;
 }
 
-if (!ctx->fr_quality || ctx->fr_cur_mode > MODE_SID)
+if (!ctx->fr_quality)
 av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n");
 
 if (ctx->fr_cur_mode == MODE_SID) { /* Comfort noise frame */

___
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] lavc/amrwbdec: Output silence for frames marked as corrupt.

2020-04-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Apr  5 
17:35:38 2020 +0200| [e426f71c96e9fac3ff87f51cfe7df603220fbd5d] | committer: 
Carl Eugen Hoyos

lavc/amrwbdec: Output silence for frames marked as corrupt.

Fixes ticket #7113.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e426f71c96e9fac3ff87f51cfe7df603220fbd5d
---

 libavcodec/amrwbdec.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 3d82b6ba71..7d357a2685 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1121,7 +1121,10 @@ static int amrwb_decode_frame(AVCodecContext *avctx, 
void *data,
 header_size  = decode_mime_header(ctx, buf);
 expected_fr_size = ((cf_sizes_wb[ctx->fr_cur_mode] + 7) >> 3) + 1;
 
-if (ctx->fr_cur_mode == NO_DATA) {
+if (!ctx->fr_quality)
+av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n");
+
+if (ctx->fr_cur_mode == NO_DATA || !ctx->fr_quality) {
 av_samples_set_silence(&frame->data[0], 0, frame->nb_samples, 1, 
AV_SAMPLE_FMT_FLT);
 *got_frame_ptr = 1;
 return expected_fr_size;
@@ -1139,9 +1142,6 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void 
*data,
 return AVERROR_INVALIDDATA;
 }
 
-if (!ctx->fr_quality)
-av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n");
-
 if (ctx->fr_cur_mode == MODE_SID) { /* Comfort noise frame */
 avpriv_request_sample(avctx, "SID mode");
 return AVERROR_PATCHWELCOME;

___
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] lavfi/telecine: Mark telecined frames as interlaced.

2020-04-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Apr  5 
01:00:44 2020 +0200| [dbc5c0c1c8b205b7f2af6c00177d99d5f44e9207] | committer: 
Carl Eugen Hoyos

lavfi/telecine: Mark telecined frames as interlaced.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbc5c0c1c8b205b7f2af6c00177d99d5f44e9207
---

 libavfilter/vf_telecine.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libavfilter/vf_telecine.c b/libavfilter/vf_telecine.c
index 62599a7a3a..ff8151dfc9 100644
--- a/libavfilter/vf_telecine.c
+++ b/libavfilter/vf_telecine.c
@@ -207,6 +207,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*inpicref)
 s->stride[i],
 (s->planeheight[i] - !s->first_field + 1) / 2);
 }
+s->frame[nout]->interlaced_frame = 1;
+s->frame[nout]->top_field_first  = !s->first_field;
 nout++;
 len--;
 s->occupied = 0;
@@ -220,6 +222,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*inpicref)
 inpicref->data[i], inpicref->linesize[i],
 s->stride[i],
 s->planeheight[i]);
+s->frame[nout]->interlaced_frame = inpicref->interlaced_frame;
+s->frame[nout]->top_field_first  = inpicref->top_field_first;
 nout++;
 len -= 2;
 }
@@ -236,6 +240,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*inpicref)
 
 for (i = 0; i < nout; i++) {
 AVFrame *frame = av_frame_clone(s->frame[i]);
+int interlaced = frame->interlaced_frame;
+int tff= frame->top_field_first;
 
 if (!frame) {
 av_frame_free(&inpicref);
@@ -243,6 +249,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*inpicref)
 }
 
 av_frame_copy_props(frame, inpicref);
+frame->interlaced_frame = interlaced;
+frame->top_field_first  = tff;
 frame->pts = ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time) +
  av_rescale(outlink->frame_count_in, s->ts_unit.num,
 s->ts_unit.den);

___
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] lavf/chromaprint: Silence compilation warnings

2020-04-05 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Aug 13 
12:42:27 2019 +0200| [8defd0ca7b4ac6658e6beb9dcdc0183b2d3e53d8] | committer: 
Carl Eugen Hoyos

lavf/chromaprint: Silence compilation warnings

Fixes the following warnings:
libavformat/chromaprint.c:117:42: warning: passing argument 2 of 
‘chromaprint_feed’ from incompatible pointer type
libavformat/chromaprint.c:132:52: warning: passing argument 2 of 
‘chromaprint_get_raw_fingerprint’ from incompatible pointer type
libavformat/chromaprint.c:143:71: warning: passing argument 4 of 
‘chromaprint_encode_fingerprint’ from incompatible pointer type

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8defd0ca7b4ac6658e6beb9dcdc0183b2d3e53d8
---

 libavformat/chromaprint.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
index faa92ca0db..0cd7cdeb26 100644
--- a/libavformat/chromaprint.c
+++ b/libavformat/chromaprint.c
@@ -114,14 +114,15 @@ fail:
 static int write_packet(AVFormatContext *s, AVPacket *pkt)
 {
 ChromaprintMuxContext *cpr = s->priv_data;
-return chromaprint_feed(cpr->ctx, pkt->data, pkt->size / 2) ? 0 : 
AVERROR(EINVAL);
+return chromaprint_feed(cpr->ctx, (const int16_t *)pkt->data, pkt->size / 
2) ? 0 : AVERROR(EINVAL);
 }
 
 static int write_trailer(AVFormatContext *s)
 {
 ChromaprintMuxContext *cpr = s->priv_data;
 AVIOContext *pb = s->pb;
-void *fp = NULL, *enc_fp = NULL;
+void *fp = NULL;
+char *enc_fp = NULL;
 int size, enc_size, ret = AVERROR(EINVAL);
 
 if (!chromaprint_finish(cpr->ctx)) {
@@ -129,7 +130,7 @@ static int write_trailer(AVFormatContext *s)
 goto fail;
 }
 
-if (!chromaprint_get_raw_fingerprint(cpr->ctx, &fp, &size)) {
+if (!chromaprint_get_raw_fingerprint(cpr->ctx, (uint32_t **)&fp, &size)) {
 av_log(s, AV_LOG_ERROR, "Failed to retrieve fingerprint\n");
 goto fail;
 }

___
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] lavc/amrwbdec: Use av_samples_set_silence().

2020-04-05 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Apr  5 
17:04:44 2020 +0200| [559c2e96e371f30eedccf370d4606fc86706ab75] | committer: 
Carl Eugen Hoyos

lavc/amrwbdec: Use av_samples_set_silence().

Suggested-by: James Almer

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=559c2e96e371f30eedccf370d4606fc86706ab75
---

 libavcodec/amrwbdec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index b488a5d3c7..5943bfc84e 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1122,8 +1122,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void 
*data,
 expected_fr_size = ((cf_sizes_wb[ctx->fr_cur_mode] + 7) >> 3) + 1;
 
 if (ctx->fr_cur_mode == NO_DATA) {
-for (i = 0; i < frame->nb_samples; i++)
-buf_out[i] = 0.f;
+av_samples_set_silence(&frame->data[0], 0, frame->nb_samples, 1, 
AV_SAMPLE_FMT_FLT);
 *got_frame_ptr = 1;
 return expected_fr_size;
 }

___
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] Revert "avformat/rtp: Pass sources and block filter addresses via sdp file for rtp"

2020-04-05 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.2 | Carl Eugen Hoyos  | Sun Apr  
5 11:58:02 2020 +0200| [d1e8be34114d5782a5a4ea79ef0b9e92b6b37bc7] | committer: 
Carl Eugen Hoyos

Revert "avformat/rtp: Pass sources and block filter addresses via sdp file for 
rtp"

This reverts commit b71685865fe761925feedda3cd0b288224d9a509.

The commit lead to the use of an uninitialized variable.
Other issues were listed by Andreas Rheinhardt:
https://ffmpeg.org/pipermail/ffmpeg-devel/2020-March/259150.html

(cherry picked from commit 8b1f07ef518a0ad9cc6a456bc62869c76fa3461f)

In addition, it is not understandable why the patch that neither
claims to fix a regression nor a security issue was backported.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1e8be34114d5782a5a4ea79ef0b9e92b6b37bc7
---

 libavformat/rtsp.c | 49 +
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 9c237d5bfd..859defa592 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -2447,8 +2447,8 @@ static int rtp_probe(const AVProbeData *p)
 static int rtp_read_header(AVFormatContext *s)
 {
 uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
-char host[500], sdp[1000], filters_buf[1000];
-int ret, port, sdp_length, nc;
+char host[500], sdp[500];
+int ret, port;
 URLContext* in = NULL;
 int payload_type;
 AVCodecParameters *par = NULL;
@@ -2456,7 +2456,6 @@ static int rtp_read_header(AVFormatContext *s)
 AVIOContext pb;
 socklen_t addrlen = sizeof(addr);
 RTSPState *rt = s->priv_data;
-const char *p;
 
 if (!ff_network_init())
 return AVERROR(EIO);
@@ -2514,40 +2513,13 @@ static int rtp_read_header(AVFormatContext *s)
 av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port,
  NULL, 0, s->url);
 
-sdp_length = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
-  "v=0\r\nc=IN IP%d %s\r\n",
-  addr.ss_family == AF_INET ? 4 : 6, host);
-
-p = strchr(s->url, '?');
-if (p) {
-static const char *filters[][2] = {{"sources", "incl"}, {"block", 
"excl"}, {NULL, NULL}};
-int i;
-char *q;
-for (i = 0; filters[i][0]; i++) {
-if (av_find_info_tag(filters_buf, sizeof(filters_buf), 
filters[i][0], p)) {
-q = filters_buf;
-while ((q = strchr(q, ',')) != NULL)
-*q = ' ';
-nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
-  "a=source-filter:%s IN IP%d %s %s\r\n",
-  filters[i][1],
-  addr.ss_family == AF_INET ? 4 : 6, host,
-  filters_buf);
-if (nc < 0 || nc + sdp_length >= sizeof(sdp))
-goto fail_nobuf;
-sdp_length += nc;
-}
-}
-}
-
-nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
-  "m=%s %d RTP/AVP %d\r\n",
-  par->codec_type == AVMEDIA_TYPE_DATA  ? "application" :
-  par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
-  port, payload_type);
-if (nc < 0 || nc + sdp_length >= sizeof(sdp))
-goto fail_nobuf;
-sdp_length += nc;
+snprintf(sdp, sizeof(sdp),
+ "v=0\r\nc=IN IP%d %s\r\nm=%s %d RTP/AVP %d\r\n",
+ addr.ss_family == AF_INET ? 4 : 6, host,
+ par->codec_type == AVMEDIA_TYPE_DATA  ? "application" :
+ par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
+ port, payload_type);
+av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp);
 avcodec_parameters_free(&par);
 
 ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL);
@@ -2562,9 +2534,6 @@ static int rtp_read_header(AVFormatContext *s)
 s->pb = NULL;
 return ret;
 
-fail_nobuf:
-ret = AVERROR(ENOBUFS);
-av_log(s, AV_LOG_ERROR, "rtp_read_header(): not enough buffer space for 
sdp-headers\n");
 fail:
 avcodec_parameters_free(&par);
 if (in)

___
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] Revert "avformat/rtp: Pass sources and block filter addresses via sdp file for rtp"

2020-04-05 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Apr  5 
11:58:02 2020 +0200| [8b1f07ef518a0ad9cc6a456bc62869c76fa3461f] | committer: 
Carl Eugen Hoyos

Revert "avformat/rtp: Pass sources and block filter addresses via sdp file for 
rtp"

This reverts commit b71685865fe761925feedda3cd0b288224d9a509.

The commit lead to the use of an uninitialized variable.
Other issues were listed by Andreas Rheinhardt:
https://ffmpeg.org/pipermail/ffmpeg-devel/2020-March/259150.html

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b1f07ef518a0ad9cc6a456bc62869c76fa3461f
---

 libavformat/rtsp.c | 49 +
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index a69484d78b..cd6fc32a29 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -2447,8 +2447,8 @@ static int rtp_probe(const AVProbeData *p)
 static int rtp_read_header(AVFormatContext *s)
 {
 uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
-char host[500], sdp[1000], filters_buf[1000];
-int ret, port, sdp_length, nc;
+char host[500], sdp[500];
+int ret, port;
 URLContext* in = NULL;
 int payload_type;
 AVCodecParameters *par = NULL;
@@ -2456,7 +2456,6 @@ static int rtp_read_header(AVFormatContext *s)
 AVIOContext pb;
 socklen_t addrlen = sizeof(addr);
 RTSPState *rt = s->priv_data;
-const char *p;
 
 if (!ff_network_init())
 return AVERROR(EIO);
@@ -2514,40 +2513,13 @@ static int rtp_read_header(AVFormatContext *s)
 av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port,
  NULL, 0, s->url);
 
-sdp_length = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
-  "v=0\r\nc=IN IP%d %s\r\n",
-  addr.ss_family == AF_INET ? 4 : 6, host);
-
-p = strchr(s->url, '?');
-if (p) {
-static const char *filters[][2] = {{"sources", "incl"}, {"block", 
"excl"}, {NULL, NULL}};
-int i;
-char *q;
-for (i = 0; filters[i][0]; i++) {
-if (av_find_info_tag(filters_buf, sizeof(filters_buf), 
filters[i][0], p)) {
-q = filters_buf;
-while ((q = strchr(q, ',')) != NULL)
-*q = ' ';
-nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
-  "a=source-filter:%s IN IP%d %s %s\r\n",
-  filters[i][1],
-  addr.ss_family == AF_INET ? 4 : 6, host,
-  filters_buf);
-if (nc < 0 || nc + sdp_length >= sizeof(sdp))
-goto fail_nobuf;
-sdp_length += nc;
-}
-}
-}
-
-nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
-  "m=%s %d RTP/AVP %d\r\n",
-  par->codec_type == AVMEDIA_TYPE_DATA  ? "application" :
-  par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
-  port, payload_type);
-if (nc < 0 || nc + sdp_length >= sizeof(sdp))
-goto fail_nobuf;
-sdp_length += nc;
+snprintf(sdp, sizeof(sdp),
+ "v=0\r\nc=IN IP%d %s\r\nm=%s %d RTP/AVP %d\r\n",
+ addr.ss_family == AF_INET ? 4 : 6, host,
+ par->codec_type == AVMEDIA_TYPE_DATA  ? "application" :
+ par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
+ port, payload_type);
+av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp);
 avcodec_parameters_free(&par);
 
 ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL);
@@ -2562,9 +2534,6 @@ static int rtp_read_header(AVFormatContext *s)
 s->pb = NULL;
 return ret;
 
-fail_nobuf:
-ret = AVERROR(ENOBUFS);
-av_log(s, AV_LOG_ERROR, "rtp_read_header(): not enough buffer space for 
sdp-headers\n");
 fail:
 avcodec_parameters_free(&par);
 if (in)

___
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] lavc/amrwbdec: Do not ignore NO_DATA frames.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Jan 29 
22:46:37 2019 +0100| [bef3c14dd1a9a38d996497da7ea416aa372283bf] | committer: 
Carl Eugen Hoyos

lavc/amrwbdec: Do not ignore NO_DATA frames.

Fixes the actual output duration of the sample in ticket #7113.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bef3c14dd1a9a38d996497da7ea416aa372283bf
---

 libavcodec/amrwbdata.h | 2 +-
 libavcodec/amrwbdec.c  | 9 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h
index 8a8cbfdddf..95c0aaa37b 100644
--- a/libavcodec/amrwbdata.h
+++ b/libavcodec/amrwbdata.h
@@ -1884,7 +1884,7 @@ static const float lpf_7_coef[31] = { // low pass, 7kHz 
cutoff
 /** Core frame sizes in each mode */
 static const uint16_t cf_sizes_wb[] = {
 132, 177, 253, 285, 317, 365, 397, 461, 477,
-40 /// SID/comfort noise frame
+40, 0, 0, 0, 0, 0, 0
 };
 
 #endif /* AVCODEC_AMRWBDATA_H */
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 47fe7eb55e..b488a5d3c7 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1119,12 +1119,19 @@ static int amrwb_decode_frame(AVCodecContext *avctx, 
void *data,
 buf_out = (float *)frame->data[0];
 
 header_size  = decode_mime_header(ctx, buf);
+expected_fr_size = ((cf_sizes_wb[ctx->fr_cur_mode] + 7) >> 3) + 1;
+
+if (ctx->fr_cur_mode == NO_DATA) {
+for (i = 0; i < frame->nb_samples; i++)
+buf_out[i] = 0.f;
+*got_frame_ptr = 1;
+return expected_fr_size;
+}
 if (ctx->fr_cur_mode > MODE_SID) {
 av_log(avctx, AV_LOG_ERROR,
"Invalid mode %d\n", ctx->fr_cur_mode);
 return AVERROR_INVALIDDATA;
 }
-expected_fr_size = ((cf_sizes_wb[ctx->fr_cur_mode] + 7) >> 3) + 1;
 
 if (buf_size < expected_fr_size) {
 av_log(avctx, AV_LOG_ERROR,

___
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] lavc/aacdec_template: Only warn once about unusual 7.1 encoding.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Fri Mar 27 
22:37:23 2020 +0100| [4d9b9c5e4637ac15205467f16fcac92a28e18f18] | committer: 
Carl Eugen Hoyos

lavc/aacdec_template: Only warn once about unusual 7.1 encoding.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d9b9c5e4637ac15205467f16fcac92a28e18f18
---

 libavcodec/aac.h |  2 +-
 libavcodec/aacdec_template.c | 20 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index c2b9c980cb..d422ea5b13 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -356,7 +356,7 @@ struct AACContext {
 OutputConfiguration oc[2];
 int warned_num_aac_frames;
 int warned_960_sbr;
-
+unsigned warned_71_wide;
 int warned_gain_control;
 
 /* aacdec functions pointers */
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index bb11de3458..3c7818530a 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -520,14 +520,14 @@ static void flush(AVCodecContext *avctx)
  *
  * @return  Returns error status. 0 - OK, !0 - error
  */
-static int set_default_channel_config(AVCodecContext *avctx,
+static int set_default_channel_config(AACContext *ac,
   uint8_t (*layout_map)[3],
   int *tags,
   int channel_config)
 {
 if (channel_config < 1 || (channel_config > 7 && channel_config < 11) ||
 channel_config > 12) {
-av_log(avctx, AV_LOG_ERROR,
+av_log(ac->avctx, AV_LOG_ERROR,
"invalid default channel configuration (%d)\n",
channel_config);
 return AVERROR_INVALIDDATA;
@@ -547,8 +547,8 @@ static int set_default_channel_config(AVCodecContext *avctx,
  * As actual intended 7.1(wide) streams are very rare, default to assuming 
a
  * 7.1 layout was intended.
  */
-if (channel_config == 7 && avctx->strict_std_compliance < 
FF_COMPLIANCE_STRICT) {
-av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 
channel layout"
+if (channel_config == 7 && ac->avctx->strict_std_compliance < 
FF_COMPLIANCE_STRICT && !ac->warned_71_wide++) {
+av_log(ac->avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 
channel layout"
" instead of a spec-compliant 7.1(wide) layout, use -strict %d 
to decode"
" according to the specification instead.\n", 
FF_COMPLIANCE_STRICT);
 layout_map[2][2] = AAC_CHANNEL_SIDE;
@@ -573,7 +573,7 @@ static ChannelElement *get_che(AACContext *ac, int type, 
int elem_id)
 
 av_log(ac->avctx, AV_LOG_DEBUG, "mono with CPE\n");
 
-if (set_default_channel_config(ac->avctx, layout_map,
+if (set_default_channel_config(ac, layout_map,
&layout_map_tags, 2) < 0)
 return NULL;
 if (output_configure(ac, layout_map, layout_map_tags,
@@ -592,7 +592,7 @@ static ChannelElement *get_che(AACContext *ac, int type, 
int elem_id)
 
 av_log(ac->avctx, AV_LOG_DEBUG, "stereo with SCE\n");
 
-if (set_default_channel_config(ac->avctx, layout_map,
+if (set_default_channel_config(ac, layout_map,
&layout_map_tags, 1) < 0)
 return NULL;
 if (output_configure(ac, layout_map, layout_map_tags,
@@ -841,7 +841,7 @@ static int decode_ga_specific_config(AACContext *ac, 
AVCodecContext *avctx,
 if (tags < 0)
 return tags;
 } else {
-if ((ret = set_default_channel_config(avctx, layout_map,
+if ((ret = set_default_channel_config(ac, layout_map,
   &tags, channel_config)))
 return ret;
 }
@@ -937,7 +937,7 @@ static int decode_eld_specific_config(AACContext *ac, 
AVCodecContext *avctx,
 skip_bits_long(gb, 8 * len);
 }
 
-if ((ret = set_default_channel_config(avctx, layout_map,
+if ((ret = set_default_channel_config(ac, layout_map,
   &tags, channel_config)))
 return ret;
 
@@ -1200,7 +1200,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
 ac->oc[1].m4ac.chan_config = i;
 
 if (ac->oc[1].m4ac.chan_config) {
-int ret = set_default_channel_config(avctx, layout_map,
+int ret = set_default_channel_config(ac, layout_map,
 &layout_map_tags, ac->oc[1].m4ac.chan_config);
 if (!ret)
 output_configure(ac, layout_map, layout_map_tags,
@@ -3002,7 +3002,7 @@ static int parse_adts_frame_header(AACContext *ac, 
GetBitContext *gb)
 push_output_configuration(ac);
 if (hdr_info.cha

[FFmpeg-cvslog] configure: Filter -Wl, linker flags out for msvc compilation.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Apr  1 
16:57:40 2020 +0200| [84abd1012cca766bf3b82b527880cf4ec2475cda] | committer: 
Carl Eugen Hoyos

configure: Filter -Wl, linker flags out for msvc compilation.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84abd1012cca766bf3b82b527880cf4ec2475cda
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 5fe9950e20..28197b3c9d 100755
--- a/configure
+++ b/configure
@@ -4439,6 +4439,7 @@ msvc_common_flags(){
 -l*)  echo ${flag#-l}.lib ;;
 -LARGEADDRESSAWARE)   echo $flag ;;
 -L*)  echo -libpath:${flag#-L} ;;
+-Wl,*);;
 *)echo $flag ;;
 esac
 done

___
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] lavc/sbc: Remove bool usage.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Apr  1 
21:28:09 2020 +0200| [c59233d50336c8f8eedd94f960ef927ffbae5c29] | committer: 
Carl Eugen Hoyos

lavc/sbc: Remove bool usage.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c59233d50336c8f8eedd94f960ef927ffbae5c29
---

 libavcodec/sbcdec.c | 1 -
 libavcodec/sbcenc.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c
index 2ebde46627..5361ee2c89 100644
--- a/libavcodec/sbcdec.c
+++ b/libavcodec/sbcdec.c
@@ -30,7 +30,6 @@
  * SBC decoder implementation
  */
 
-#include 
 #include "avcodec.h"
 #include "internal.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c
index e2929e22ac..631acf7905 100644
--- a/libavcodec/sbcenc.c
+++ b/libavcodec/sbcenc.c
@@ -30,7 +30,6 @@
  * SBC encoder implementation
  */
 
-#include 
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "internal.h"
@@ -95,7 +94,7 @@ static int sbc_analyze_audio(SBCDSPContext *s, struct 
sbc_frame *frame)
  * Returns the length of the packed frame.
  */
 static size_t sbc_pack_frame(AVPacket *avpkt, struct sbc_frame *frame,
- int joint, bool msbc)
+ int joint, int msbc)
 {
 PutBitContext pb;
 

___
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] lavf, lavfi: Remove uses of sizeof(char).

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Apr  4 
01:30:14 2020 +0200| [61dcaf5fb74d11209683da1a98aa324df54147ed] | committer: 
Carl Eugen Hoyos

lavf, lavfi: Remove uses of sizeof(char).

The C standard requires sizeof(char) == 1.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61dcaf5fb74d11209683da1a98aa324df54147ed
---

 libavfilter/dnn/dnn_backend_tf.c | 2 +-
 libavfilter/vf_deshake.c | 4 ++--
 libavformat/webmdashenc.c| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c
index a921667424..9ceca5cea0 100644
--- a/libavfilter/dnn/dnn_backend_tf.c
+++ b/libavfilter/dnn/dnn_backend_tf.c
@@ -95,7 +95,7 @@ static TF_Tensor *allocate_input_tensor(const DNNData *input)
 break;
 case DNN_UINT8:
 dt = TF_UINT8;
-size = sizeof(char);
+size = 1;
 break;
 default:
 av_assert0(!"should not reach here");
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index b516ea2d59..28a541b94a 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -354,7 +354,7 @@ static av_cold int init(AVFilterContext *ctx)
 if (deshake->filename)
 deshake->fp = fopen(deshake->filename, "w");
 if (deshake->fp)
-fwrite("Ori x, Avg x, Fin x, Ori y, Avg y, Fin y, Ori angle, Avg 
angle, Fin angle, Ori zoom, Avg zoom, Fin zoom\n", sizeof(char), 104, 
deshake->fp);
+fwrite("Ori x, Avg x, Fin x, Ori y, Avg y, Fin y, Ori angle, Avg 
angle, Fin angle, Ori zoom, Avg zoom, Fin zoom\n", 1, 104, deshake->fp);
 
 // Quadword align left edge of box for MMX code, adjust width if necessary
 // to keep right margin
@@ -485,7 +485,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
 // Write statistics to file
 if (deshake->fp) {
 snprintf(tmp, 256, "%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n", 
orig.vec.x, deshake->avg.vec.x, t.vec.x, orig.vec.y, deshake->avg.vec.y, 
t.vec.y, orig.angle, deshake->avg.angle, t.angle, orig.zoom, deshake->avg.zoom, 
t.zoom);
-fwrite(tmp, sizeof(char), strlen(tmp), deshake->fp);
+fwrite(tmp, 1, strlen(tmp), deshake->fp);
 }
 
 // Turn relative current frame motion into absolute by adding it to the
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c
index d05b265330..7847659c63 100644
--- a/libavformat/webmdashenc.c
+++ b/libavformat/webmdashenc.c
@@ -439,7 +439,7 @@ static int write_adaptation_set(AVFormatContext *s, int 
as_index)
 static int to_integer(char *p, int len)
 {
 int ret;
-char *q = av_malloc(sizeof(char) * len);
+char *q = av_malloc(len);
 if (!q)
 return AVERROR(ENOMEM);
 av_strlcpy(q, p, len);

___
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] lavc/qsvenc: Fix format specifiers for two variables of type int.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Apr  1 
16:52:19 2020 +0200| [d46a91b7f38f5abce2d01d247f22ec4435204efe] | committer: 
Carl Eugen Hoyos

lavc/qsvenc: Fix format specifiers for two variables of type int.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d46a91b7f38f5abce2d01d247f22ec4435204efe
---

 libavcodec/qsvenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 52b4e43979..afab8fd715 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -218,9 +218,9 @@ static void dump_video_param(AVCodecContext *avctx, 
QSVEncContext *q,
"RecoveryPointSEI: %s IntRefType: %"PRIu16"; IntRefCycleSize: 
%"PRIu16"; IntRefQPDelta: %"PRId16"\n",
print_threestate(co->RecoveryPointSEI), co2->IntRefType, 
co2->IntRefCycleSize, co2->IntRefQPDelta);
 
-av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %"PRIu16"; ", 
co2->MaxFrameSize);
+av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; ", co2->MaxFrameSize);
 #if QSV_HAVE_MAX_SLICE_SIZE
-av_log(avctx, AV_LOG_VERBOSE, "MaxSliceSize: %"PRIu16"; ", 
co2->MaxSliceSize);
+av_log(avctx, AV_LOG_VERBOSE, "MaxSliceSize: %d; ", co2->MaxSliceSize);
 #endif
 av_log(avctx, AV_LOG_VERBOSE, "\n");
 

___
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] lavfi/scale_qsv: Fix a format specifier for a variable of type int.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Apr  1 
16:53:04 2020 +0200| [e61767c40a978f0d1c41c848c134d537b5494cb3] | committer: 
Carl Eugen Hoyos

lavfi/scale_qsv: Fix a format specifier for a variable of type int.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e61767c40a978f0d1c41c848c134d537b5494cb3
---

 libavfilter/vf_scale_qsv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
index d1fa9424d2..5064dcbb60 100644
--- a/libavfilter/vf_scale_qsv.c
+++ b/libavfilter/vf_scale_qsv.c
@@ -410,7 +410,7 @@ static int init_out_session(AVFilterContext *ctx)
 s->scale_conf.Header.BufferSz = sizeof(mfxExtVPPScaling);
 s->scale_conf.ScalingMode = s->mode;
 s->ext_buffers[s->num_ext_buf++]  = (mfxExtBuffer*)&s->scale_conf;
-av_log(ctx, AV_LOG_VERBOSE, "Scaling mode: %"PRIu16"\n", s->mode);
+av_log(ctx, AV_LOG_VERBOSE, "Scaling mode: %d\n", s->mode);
 #endif
 
 par.ExtParam= s->ext_buffers;

___
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] lavc: Use supported_samplerates for Dolby Digital encoders.

2020-04-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Feb 11 
00:20:52 2020 +0100| [4679a474f06c229b10976d7f0b4eee0613c2715a] | committer: 
Carl Eugen Hoyos

lavc: Use supported_samplerates for Dolby Digital encoders.

Fixes ticket #8518.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4679a474f06c229b10976d7f0b4eee0613c2715a
---

 libavcodec/ac3enc_fixed.c | 1 +
 libavcodec/ac3enc_float.c | 1 +
 libavcodec/ac3tab.c   | 2 +-
 libavcodec/ac3tab.h   | 2 +-
 libavcodec/eac3enc.c  | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
index b23fc64776..e57d035294 100644
--- a/libavcodec/ac3enc_fixed.c
+++ b/libavcodec/ac3enc_fixed.c
@@ -155,6 +155,7 @@ AVCodec ff_ac3_fixed_encoder = {
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P,
   AV_SAMPLE_FMT_NONE },
 .priv_class  = &ac3enc_class,
+.supported_samplerates = ff_ac3_sample_rate_tab,
 .channel_layouts = ff_ac3_channel_layouts,
 .defaults= ac3_defaults,
 };
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index d6e658b2b4..1f3111af0e 100644
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -150,6 +150,7 @@ AVCodec ff_ac3_encoder = {
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
   AV_SAMPLE_FMT_NONE },
 .priv_class  = &ac3enc_class,
+.supported_samplerates = ff_ac3_sample_rate_tab,
 .channel_layouts = ff_ac3_channel_layouts,
 .defaults= ac3_defaults,
 };
diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c
index bd88f32d92..96ef8ebaeb 100644
--- a/libavcodec/ac3tab.c
+++ b/libavcodec/ac3tab.c
@@ -126,7 +126,7 @@ const uint8_t ff_ac3_dec_channel_map[8][2][6] = {
 };
 
 /* possible frequencies */
-const uint16_t ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 };
+const int ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 };
 
 /* possible bitrates */
 const uint16_t ff_ac3_bitrate_tab[19] = {
diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h
index aa71acbce1..f0f6e6ccc4 100644
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@@ -33,7 +33,7 @@ extern const uint8_t  ff_ac3_channels_tab[8];
 extern av_export_avcodec const uint16_t avpriv_ac3_channel_layout_tab[8];
 extern const uint8_t  ff_ac3_enc_channel_map[8][2][6];
 extern const uint8_t  ff_ac3_dec_channel_map[8][2][6];
-extern const uint16_t ff_ac3_sample_rate_tab[3];
+extern const int  ff_ac3_sample_rate_tab[3];
 extern const uint16_t ff_ac3_bitrate_tab[19];
 extern const uint8_t  ff_ac3_rematrix_band_tab[5];
 extern const uint8_t  ff_eac3_default_cpl_band_struct[18];
diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c
index e1d61f68bf..6a90571e56 100644
--- a/libavcodec/eac3enc.c
+++ b/libavcodec/eac3enc.c
@@ -263,6 +263,7 @@ AVCodec ff_eac3_encoder = {
 .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
   AV_SAMPLE_FMT_NONE },
 .priv_class  = &eac3enc_class,
+.supported_samplerates = ff_ac3_sample_rate_tab,
 .channel_layouts = ff_ac3_channel_layouts,
 .defaults= ac3_defaults,
 };

___
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] lavfi/deshake_opencl: Do not use bool, powerpc does not like it.

2020-04-01 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Mar 31 
22:20:10 2020 +0200| [00ce1ec6a5d301b4075e2e7e5c9ea3b37c9c4be5] | committer: 
Carl Eugen Hoyos

lavfi/deshake_opencl: Do not use bool, powerpc does not like it.

Fixes ticket #8591.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00ce1ec6a5d301b4075e2e7e5c9ea3b37c9c4be5
---

 libavfilter/vf_deshake_opencl.c | 61 -
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c
index 0ef015808f..4f1bb09362 100644
--- a/libavfilter/vf_deshake_opencl.c
+++ b/libavfilter/vf_deshake_opencl.c
@@ -45,7 +45,6 @@
  * the use of this software, even if advised of the possibility of such damage.
  */
 
-#include 
 #include 
 #include 
 #include "libavutil/opt.h"
@@ -205,7 +204,7 @@ typedef struct DeshakeOpenCLContext {
 
 // These variables are used in the activate callback
 int64_t duration;
-bool eof;
+int eof;
 
 // State for random number generation
 AVLFG alfg;
@@ -233,7 +232,7 @@ typedef struct DeshakeOpenCLContext {
 CropInfo crop_uv;
 
 // Whether or not we are processing YUV input (as oppposed to RGB)
-bool is_yuv;
+int is_yuv;
 // The underlying format of the hardware surfaces
 int sw_format;
 
@@ -357,7 +356,7 @@ static void run_estimate_kernel(const MotionVector 
*point_pairs, double *model)
 }
 
 // Checks that the 3 points in the given array are not collinear
-static bool points_not_collinear(const cl_float2 **points)
+static int points_not_collinear(const cl_float2 **points)
 {
 int j, k, i = 2;
 
@@ -373,17 +372,17 @@ static bool points_not_collinear(const cl_float2 **points)
 // (3839, 2159), this prevents a third point from being within 
roughly
 // 0.5 of a pixel of the line connecting the two on both axes
 if (fabs(dx2*dy1 - dy2*dx1) <= 1.0) {
-return false;
+return 0;
 }
 }
 }
 
-return true;
+return 1;
 }
 
 // Checks a subset of 3 point pairs to make sure that the points are not 
collinear
 // and not too close to each other
-static bool check_subset(const MotionVector *pairs_subset)
+static int check_subset(const MotionVector *pairs_subset)
 {
 const cl_float2 *prev_points[] = {
 &pairs_subset[0].p.p1,
@@ -401,7 +400,7 @@ static bool check_subset(const MotionVector *pairs_subset)
 }
 
 // Selects a random subset of 3 points from point_pairs and places them in 
pairs_subset
-static bool get_subset(
+static int get_subset(
 AVLFG *alfg,
 const MotionVector *point_pairs,
 const int num_point_pairs,
@@ -482,10 +481,10 @@ static int find_inliers(
 for (i = 0; i < n; i++) {
 if (err[i] <= t) {
 // This is an inlier
-point_pairs[i].should_consider = true;
+point_pairs[i].should_consider = 1;
 num_inliers += 1;
 } else {
-point_pairs[i].should_consider = false;
+point_pairs[i].should_consider = 0;
 }
 }
 
@@ -525,7 +524,7 @@ static int ransac_update_num_iters(double confidence, 
double num_outliers, int m
 
 // Estimates an affine transform between the given pairs of points using RANdom
 // SAmple Consensus
-static bool estimate_affine_2d(
+static int estimate_affine_2d(
 DeshakeOpenCLContext *deshake_ctx,
 MotionVector *point_pairs,
 DebugMatches *debug_matches,
@@ -535,7 +534,7 @@ static bool estimate_affine_2d(
 const int max_iters,
 const double confidence
 ) {
-bool result = false;
+int result = 0;
 double best_model[6], model[6];
 MotionVector pairs_subset[3], best_pairs[3];
 
@@ -544,24 +543,24 @@ static bool estimate_affine_2d(
 
 // We need at least 3 points to build a model from
 if (num_point_pairs < 3) {
-return false;
+return 0;
 } else if (num_point_pairs == 3) {
 // There are only 3 points, so RANSAC doesn't apply here
 run_estimate_kernel(point_pairs, model_out);
 
 for (int i = 0; i < 3; ++i) {
-point_pairs[i].should_consider = true;
+point_pairs[i].should_consider = 1;
 }
 
-return true;
+return 1;
 }
 
 for (iter = 0; iter < niters; ++iter) {
-bool found = get_subset(&deshake_ctx->alfg, point_pairs, 
num_point_pairs, pairs_subset, 1);
+int found = get_subset(&deshake_ctx->alfg, point_pairs, 
num_point_pairs, pairs_subset, 1);
 
 if (!found) {
 if (iter == 0) {
-return false;
+return 0;
 }
 
 break;
@@ -600,7 +599,7 @@ static bool estimate_affine_2d(
 
 // Find the inliers again for the best model for debugging
 find_inliers(point_pairs, num_point_pairs, best_model, 
deshake_ctx->ransac_err, threshold);
-result

[FFmpeg-cvslog] ffmpeg: Print an error instead of a debug message on exit.

2020-03-30 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Mar 31 
00:41:13 2020 +0200| [b5a8ad5623e6fd488f3d03f5f9bdb70c5bbb9bcb] | committer: 
Carl Eugen Hoyos

ffmpeg: Print an error instead of a debug message on exit.

Reported-by: Forum user NewPlaza

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5a8ad5623e6fd488f3d03f5f9bdb70c5bbb9bcb
---

 fftools/ffmpeg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index aaaf241314..4fca8b4896 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -788,6 +788,8 @@ static void write_packet(OutputFile *of, AVPacket *pkt, 
OutputStream *ost, int u
 int64_t max = ost->last_mux_dts + !(s->oformat->flags & 
AVFMT_TS_NONSTRICT);
 if (pkt->dts < max) {
 int loglevel = max - pkt->dts > 2 || st->codecpar->codec_type 
== AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG;
+if (exit_on_error)
+loglevel = AV_LOG_ERROR;
 av_log(s, loglevel, "Non-monotonous DTS in output stream "
"%d:%d; previous: %"PRId64", current: %"PRId64"; ",
ost->file_index, ost->st->index, ost->last_mux_dts, 
pkt->dts);

___
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] configure: Get the correct ident for clang-cl.exe

2020-03-26 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Mar 26 
00:00:10 2020 +0100| [9f1d2f47db0112d41dbc423c9215ff886512efd3] | committer: 
Carl Eugen Hoyos

configure: Get the correct ident for clang-cl.exe

Instead of "No input file specified"

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f1d2f47db0112d41dbc423c9215ff886512efd3
---

 configure | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 90aaab92a9..aae9818d70 100755
--- a/configure
+++ b/configure
@@ -4663,7 +4663,11 @@ probe_cc(){
 _ld_path='-libpath:'
 elif $_cc -nologo- 2>&1 | grep -q Microsoft || { $_cc -v 2>&1 | grep -q 
clang && $_cc -? > /dev/null 2>&1; }; then
 _type=msvc
-_ident=$($_cc 2>&1 | head -n1 | tr -d '\r')
+if $_cc -nologo- 2>&1 | grep -q Microsoft; then
+_ident=$($_cc 2>&1 | head -n1 | tr -d '\r')
+else
+_ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r')
+fi
 _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk 
'\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) 
print "$@:", $$0 }'\'' > $(@:.o=.d)'
 _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
 _cflags_speed="-O2"

___
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] configure: Remove all C standard versions from the MSVC command line.

2020-03-26 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Mar 25 
23:59:11 2020 +0100| [580d13e73d8f2d9dcd6b857ac8ec8a89377fbfda] | committer: 
Carl Eugen Hoyos

configure: Remove all C standard versions from the MSVC command line.

Silences a warning for every file when compiling with clang-cl.exe

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=580d13e73d8f2d9dcd6b857ac8ec8a89377fbfda
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 18f2841765..90aaab92a9 100755
--- a/configure
+++ b/configure
@@ -4420,7 +4420,7 @@ msvc_common_flags(){
 # generic catch all at the bottom will print the original flag.
 -Wall);;
 -Wextra)  ;;
--std=c99) ;;
+-std=c*)  ;;
 # Common flags
 -fomit-frame-pointer) ;;
 -g)   echo -Z7 ;;

___
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] lavf/subviewerdec: Support higher sub-second precision.

2020-03-21 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Fri Mar 20 
09:02:59 2020 +0100| [559ce9c8454fda5fe7fc0debf94cbcfbba33c66a] | committer: 
Carl Eugen Hoyos

lavf/subviewerdec: Support higher sub-second precision.

Fixes ticket #8575.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=559ce9c8454fda5fe7fc0debf94cbcfbba33c66a
---

 libavformat/subviewerdec.c | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c
index 06b827b70f..83378eab5f 100644
--- a/libavformat/subviewerdec.c
+++ b/libavformat/subviewerdec.c
@@ -56,11 +56,21 @@ static int read_ts(const char *s, int64_t *start, int 
*duration)
 int64_t end;
 int hh1, mm1, ss1, ms1;
 int hh2, mm2, ss2, ms2;
+int multiplier = 1;
 
+if (sscanf(s, "%u:%u:%u.%2u,%u:%u:%u.%2u",
+   &hh1, &mm1, &ss1, &ms1, &hh2, &mm2, &ss2, &ms2) == 8) {
+multiplier = 10;
+} else if (sscanf(s, "%u:%u:%u.%1u,%u:%u:%u.%1u",
+  &hh1, &mm1, &ss1, &ms1, &hh2, &mm2, &ss2, &ms2) == 8) {
+multiplier = 100;
+}
 if (sscanf(s, "%u:%u:%u.%u,%u:%u:%u.%u",
&hh1, &mm1, &ss1, &ms1, &hh2, &mm2, &ss2, &ms2) == 8) {
-end= (hh2*3600LL + mm2*60LL + ss2) * 100LL + ms2;
-*start = (hh1*3600LL + mm1*60LL + ss1) * 100LL + ms1;
+ms1 = FFMIN(ms1, 999);
+ms2 = FFMIN(ms2, 999);
+end= (hh2*3600LL + mm2*60LL + ss2) * 1000LL + ms2 * multiplier;
+*start = (hh1*3600LL + mm1*60LL + ss1) * 1000LL + ms1 * multiplier;
 *duration = end - *start;
 return 0;
 }
@@ -84,7 +94,7 @@ static int subviewer_read_header(AVFormatContext *s)
 return res;
 if (avio_rb24(s->pb) != 0xefbbbf)
 avio_seek(s->pb, -3, SEEK_CUR);
-avpriv_set_pts_info(st, 64, 1, 100);
+avpriv_set_pts_info(st, 64, 1, 1000);
 st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
 st->codecpar->codec_id   = AV_CODEC_ID_SUBVIEWER;
 

___
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] common.mak: Also clean Windows debug files.

2020-03-21 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Mar 19 
00:35:21 2020 +0100| [0123a0fd140a8d56cb5a8d19a1b5d116b442b800] | committer: 
Carl Eugen Hoyos

common.mak: Also clean Windows debug files.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0123a0fd140a8d56cb5a8d19a1b5d116b442b800
---

 ffbuild/common.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index 7355508ea0..a60d27c9bd 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -162,7 +162,7 @@ $(TOOLOBJS): | tools
 
 OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) 
$(TESTOBJS))
 
-CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.c 
*.ver *.version *$(DEFAULT_X86ASMD).asm *~
+CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.c 
*.ver *.version *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb
 LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
 
 define RULES

___
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] lavf/tty: Reduce probe score to fix ffmetadata auto-detection.

2020-03-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Fri Mar 13 
00:53:16 2020 +0100| [b601e24ab39b8bdfb4aec49b6b339dd9b34a2b5e] | committer: 
Carl Eugen Hoyos

lavf/tty: Reduce probe score to fix ffmetadata auto-detection.

Fixes ticket #8568.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b601e24ab39b8bdfb4aec49b6b339dd9b34a2b5e
---

 libavformat/tty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tty.c b/libavformat/tty.c
index 56438d5f1c..aed5c888c3 100644
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -65,7 +65,7 @@ static int read_probe(const AVProbeData *p)
 for (int i = 8; i < p->buf_size; i++)
 cnt += !!isansicode(p->buf[i]);
 
-return (cnt * 100LL / p->buf_size) * (cnt > 400) *
+return (cnt * 99LL / p->buf_size) * (cnt > 400) *
 !!av_match_ext(p->filename, tty_extensions);
 }
 

___
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] lsws/input: Do not change transparency range.

2020-03-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Feb 15 
10:07:51 2020 +0100| [5f8c38345247be4baa6d6f0b4ef5f5ce94c1ba7d] | committer: 
Carl Eugen Hoyos

lsws/input: Do not change transparency range.

Fixes ticket #8509.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f8c38345247be4baa6d6f0b4ef5f5ce94c1ba7d
---

 libswscale/input.c|   6 +-
 libswscale/version.h  |   2 +-
 tests/ref/fate/ffmpeg-filter_colorkey |  20 +--
 tests/ref/fate/filter-overlay-dvdsub-2397 | 180 +-
 tests/ref/fate/filter-overlay_gbrap_gbrap |   2 +-
 tests/ref/fate/filter-overlay_gbrp_gbrap  |   2 +-
 tests/ref/fate/filter-overlay_yuv420_yuva420  |   2 +-
 tests/ref/fate/filter-overlay_yuv422_yuva422  |   2 +-
 tests/ref/fate/filter-overlay_yuv444_yuva444  |   2 +-
 tests/ref/fate/filter-overlay_yuva420_yuva420 |   2 +-
 tests/ref/fate/filter-overlay_yuva422_yuva422 |   2 +-
 tests/ref/fate/filter-overlay_yuva444_yuva444 |   2 +-
 12 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/libswscale/input.c b/libswscale/input.c
index 8346cf4da6..099661cb6d 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -437,7 +437,7 @@ static void abgrToA_c(uint8_t *_dst, const uint8_t *src, 
const uint8_t *unused1,
 int16_t *dst = (int16_t *)_dst;
 int i;
 for (i=0; i>2;
 }
 }
 
@@ -446,7 +446,7 @@ static void rgbaToA_c(uint8_t *_dst, const uint8_t *src, 
const uint8_t *unused1,
 int16_t *dst = (int16_t *)_dst;
 int i;
 for (i=0; i>2;
 }
 }
 
@@ -457,7 +457,7 @@ static void palToA_c(uint8_t *_dst, const uint8_t *src, 
const uint8_t *unused1,
 for (i=0; i> 24)<<6;
+dst[i]= (pal[d] >> 24)<<6 | pal[d]>>26;
 }
 }
 
diff --git a/libswscale/version.h b/libswscale/version.h
index cc434c0439..1dbb5618af 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@
 
 #define LIBSWSCALE_VERSION_MAJOR   5
 #define LIBSWSCALE_VERSION_MINOR   6
-#define LIBSWSCALE_VERSION_MICRO 100
+#define LIBSWSCALE_VERSION_MICRO 101
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
LIBSWSCALE_VERSION_MINOR, \
diff --git a/tests/ref/fate/ffmpeg-filter_colorkey 
b/tests/ref/fate/ffmpeg-filter_colorkey
index effc13b12f..490a0f9aa6 100644
--- a/tests/ref/fate/ffmpeg-filter_colorkey
+++ b/tests/ref/fate/ffmpeg-filter_colorkey
@@ -3,13 +3,13 @@
 #codec_id 0: rawvideo
 #dimensions 0: 720x576
 #sar 0: 0/1
-0,  0,  0,1,   622080, 0x4e30accb
-0,  1,  1,1,   622080, 0x7d941c14
-0,  2,  2,1,   622080, 0xf7451c5b
-0,  3,  3,1,   622080, 0xb2c74319
-0,  4,  4,1,   622080, 0xc9b80b79
-0,  5,  5,1,   622080, 0x92ce1194
-0,  6,  6,1,   622080, 0x43ae99ac
-0,  7,  7,1,   622080, 0x4ec3a554
-0,  8,  8,1,   622080, 0x3200250c
-0,  9,  9,1,   622080, 0x94ebb3f3
+0,  0,  0,1,   622080, 0x78efb628
+0,  1,  1,1,   622080, 0x641f2564
+0,  2,  2,1,   622080, 0x348f25c3
+0,  3,  3,1,   622080, 0x6afc485a
+0,  4,  4,1,   622080, 0xe949107f
+0,  5,  5,1,   622080, 0x171716e5
+0,  6,  6,1,   622080, 0x2985a01f
+0,  7,  7,1,   622080, 0xc5ddabd7
+0,  8,  8,1,   622080, 0xb4dd2b7f
+0,  9,  9,1,   622080, 0x6e75ba82
diff --git a/tests/ref/fate/filter-overlay-dvdsub-2397 
b/tests/ref/fate/filter-overlay-dvdsub-2397
index b86a2184b7..483e5fa4e0 100644
--- a/tests/ref/fate/filter-overlay-dvdsub-2397
+++ b/tests/ref/fate/filter-overlay-dvdsub-2397
@@ -490,368 +490,368 @@
 1,   3877,   3877,   10, 2013, 0x95a39f9c
 1,   3887,   3887,   10, 2013, 0x4f7ea123
 1,   3897,   3897,   10, 2013, 0x9efb9ba1
-0,117,117,1,   518400, 0x949e1e8b
+0,117,117,1,   518400, 0xbf8523da
 1,   3907,   3907,   10, 2013, 0xf395b2cd
 1,   3917,   3917,   10, 2013, 0x261a881e
 1,   3927,   3927,   10, 2013, 0x7f2d9f72
 1,   3937,   3937,   10, 2013, 0x0105b38d
-0,118,118,1,   518400, 0xfc6c09aa
+0,118,118,1,   518400, 0x41890ed6
 1,   3952,   3952,   10, 2013, 0x0e5db67e
 1,   3962,   3962,   10, 2013, 0xfc9baf97
-0,119,119,1,   518400, 0x561c2ff5
+0,119,119,1,   518400, 0x588534fc
 1,   3972,   3972,   10, 2013, 0x8e02a1b1
 1,   3982,   3982,   10,

[FFmpeg-cvslog] lavc/aarch64: Remove unneeded file vp9mc_aarch64.c

2020-03-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Mar 11 
14:36:07 2020 +0100| [34d7c8d942c370965d3823e017c79b58f18285ca] | committer: 
Carl Eugen Hoyos

lavc/aarch64: Remove unneeded file vp9mc_aarch64.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34d7c8d942c370965d3823e017c79b58f18285ca
---

 libavcodec/aarch64/vp9mc_aarch64.c | 81 --
 1 file changed, 81 deletions(-)

diff --git a/libavcodec/aarch64/vp9mc_aarch64.c 
b/libavcodec/aarch64/vp9mc_aarch64.c
deleted file mode 100644
index f17a8cf04a..00
--- a/libavcodec/aarch64/vp9mc_aarch64.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2016 Google 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
- */
-
-#include "libavutil/aarch64/asm.S"
-
-// All public functions in this file have the following signature:
-// typedef void (*vp9_mc_func)(uint8_t *dst, ptrdiff_t dst_stride,
-//const uint8_t *ref, ptrdiff_t ref_stride,
-//int h, int mx, int my);
-
-function ff_vp9_copy128_aarch64, export=1
-1:
-ldp x5,  x6,  [x2]
-ldp x7,  x8,  [x2, #16]
-stp x5,  x6,  [x0]
-ldp x9,  x10, [x2, #32]
-stp x7,  x8,  [x0, #16]
-subsw4,  w4,  #1
-ldp x11, x12, [x2, #48]
-stp x9,  x10, [x0, #32]
-stp x11, x12, [x0, #48]
-ldp x5,  x6,  [x2, #64]
-ldp x7,  x8,  [x2, #80]
-stp x5,  x6,  [x0, #64]
-ldp x9,  x10, [x2, #96]
-stp x7,  x8,  [x0, #80]
-ldp x11, x12, [x2, #112]
-stp x9,  x10, [x0, #96]
-stp x11, x12, [x0, #112]
-add x2,  x2,  x3
-add x0,  x0,  x1
-b.ne1b
-ret
-endfunc
-
-function ff_vp9_copy64_aarch64, export=1
-1:
-ldp x5,  x6,  [x2]
-ldp x7,  x8,  [x2, #16]
-stp x5,  x6,  [x0]
-ldp x9,  x10, [x2, #32]
-stp x7,  x8,  [x0, #16]
-subsw4,  w4,  #1
-ldp x11, x12, [x2, #48]
-stp x9,  x10, [x0, #32]
-stp x11, x12, [x0, #48]
-add x2,  x2,  x3
-add x0,  x0,  x1
-b.ne1b
-ret
-endfunc
-
-function ff_vp9_copy32_aarch64, export=1
-1:
-ldp x5,  x6,  [x2]
-ldp x7,  x8,  [x2, #16]
-stp x5,  x6,  [x0]
-subsw4,  w4,  #1
-stp x7,  x8,  [x0, #16]
-add x2,  x2,  x3
-add x0,  x0,  x1
-b.ne1b
-ret
-endfunc

___
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] lavc/aarch64: Fix suffix of new file vp9mc_aarch64.

2020-03-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Mar 11 
14:29:22 2020 +0100| [951bd2557294d7f4d6b1c2b81dde21204a2b71bc] | committer: 
Carl Eugen Hoyos

lavc/aarch64: Fix suffix of new file vp9mc_aarch64.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=951bd2557294d7f4d6b1c2b81dde21204a2b71bc
---

 libavcodec/aarch64/vp9mc_aarch64.S | 81 ++
 1 file changed, 81 insertions(+)

diff --git a/libavcodec/aarch64/vp9mc_aarch64.S 
b/libavcodec/aarch64/vp9mc_aarch64.S
new file mode 100644
index 00..f17a8cf04a
--- /dev/null
+++ b/libavcodec/aarch64/vp9mc_aarch64.S
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Google 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
+ */
+
+#include "libavutil/aarch64/asm.S"
+
+// All public functions in this file have the following signature:
+// typedef void (*vp9_mc_func)(uint8_t *dst, ptrdiff_t dst_stride,
+//const uint8_t *ref, ptrdiff_t ref_stride,
+//int h, int mx, int my);
+
+function ff_vp9_copy128_aarch64, export=1
+1:
+ldp x5,  x6,  [x2]
+ldp x7,  x8,  [x2, #16]
+stp x5,  x6,  [x0]
+ldp x9,  x10, [x2, #32]
+stp x7,  x8,  [x0, #16]
+subsw4,  w4,  #1
+ldp x11, x12, [x2, #48]
+stp x9,  x10, [x0, #32]
+stp x11, x12, [x0, #48]
+ldp x5,  x6,  [x2, #64]
+ldp x7,  x8,  [x2, #80]
+stp x5,  x6,  [x0, #64]
+ldp x9,  x10, [x2, #96]
+stp x7,  x8,  [x0, #80]
+ldp x11, x12, [x2, #112]
+stp x9,  x10, [x0, #96]
+stp x11, x12, [x0, #112]
+add x2,  x2,  x3
+add x0,  x0,  x1
+b.ne1b
+ret
+endfunc
+
+function ff_vp9_copy64_aarch64, export=1
+1:
+ldp x5,  x6,  [x2]
+ldp x7,  x8,  [x2, #16]
+stp x5,  x6,  [x0]
+ldp x9,  x10, [x2, #32]
+stp x7,  x8,  [x0, #16]
+subsw4,  w4,  #1
+ldp x11, x12, [x2, #48]
+stp x9,  x10, [x0, #32]
+stp x11, x12, [x0, #48]
+add x2,  x2,  x3
+add x0,  x0,  x1
+b.ne1b
+ret
+endfunc
+
+function ff_vp9_copy32_aarch64, export=1
+1:
+ldp x5,  x6,  [x2]
+ldp x7,  x8,  [x2, #16]
+stp x5,  x6,  [x0]
+subsw4,  w4,  #1
+stp x7,  x8,  [x0, #16]
+add x2,  x2,  x3
+add x0,  x0,  x1
+b.ne1b
+ret
+endfunc

___
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] lavc/aarch64: Move non-neon vp9 copy functions out of neon source file.

2020-03-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Mar 11 
13:01:02 2020 +0100| [9a217549043ff25a37973555f71122f4725ba54e] | committer: 
Carl Eugen Hoyos

lavc/aarch64: Move non-neon vp9 copy functions out of neon source file.

Fixes part of ticket #8565.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a217549043ff25a37973555f71122f4725ba54e
---

 libavcodec/aarch64/Makefile   |  1 +
 libavcodec/aarch64/vp9mc_16bpp_neon.S | 25 ---
 libavcodec/aarch64/vp9mc_aarch64.c| 81 +++
 libavcodec/aarch64/vp9mc_neon.S   | 30 -
 4 files changed, 82 insertions(+), 55 deletions(-)

diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
index 00f93bf59f..90e7210ee0 100644
--- a/libavcodec/aarch64/Makefile
+++ b/libavcodec/aarch64/Makefile
@@ -21,6 +21,7 @@ OBJS-$(CONFIG_VC1DSP)   += 
aarch64/vc1dsp_init_aarch64.o
 OBJS-$(CONFIG_VORBIS_DECODER)   += aarch64/vorbisdsp_init.o
 OBJS-$(CONFIG_VP9_DECODER)  += aarch64/vp9dsp_init_10bpp_aarch64.o 
\
aarch64/vp9dsp_init_12bpp_aarch64.o 
\
+   aarch64/vp9mc_aarch64.o 
\
aarch64/vp9dsp_init_aarch64.o
 
 # ARMv8 optimizations
diff --git a/libavcodec/aarch64/vp9mc_16bpp_neon.S 
b/libavcodec/aarch64/vp9mc_16bpp_neon.S
index cac6428709..53b372c262 100644
--- a/libavcodec/aarch64/vp9mc_16bpp_neon.S
+++ b/libavcodec/aarch64/vp9mc_16bpp_neon.S
@@ -25,31 +25,6 @@
 //const uint8_t *ref, ptrdiff_t ref_stride,
 //int h, int mx, int my);
 
-function ff_vp9_copy128_aarch64, export=1
-1:
-ldp x5,  x6,  [x2]
-ldp x7,  x8,  [x2, #16]
-stp x5,  x6,  [x0]
-ldp x9,  x10, [x2, #32]
-stp x7,  x8,  [x0, #16]
-subsw4,  w4,  #1
-ldp x11, x12, [x2, #48]
-stp x9,  x10, [x0, #32]
-stp x11, x12, [x0, #48]
-ldp x5,  x6,  [x2, #64]
-ldp x7,  x8,  [x2, #80]
-stp x5,  x6,  [x0, #64]
-ldp x9,  x10, [x2, #96]
-stp x7,  x8,  [x0, #80]
-ldp x11, x12, [x2, #112]
-stp x9,  x10, [x0, #96]
-stp x11, x12, [x0, #112]
-add x2,  x2,  x3
-add x0,  x0,  x1
-b.ne1b
-ret
-endfunc
-
 function ff_vp9_avg64_16_neon, export=1
 mov x5,  x0
 sub x1,  x1,  #64
diff --git a/libavcodec/aarch64/vp9mc_aarch64.c 
b/libavcodec/aarch64/vp9mc_aarch64.c
new file mode 100644
index 00..f17a8cf04a
--- /dev/null
+++ b/libavcodec/aarch64/vp9mc_aarch64.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Google 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
+ */
+
+#include "libavutil/aarch64/asm.S"
+
+// All public functions in this file have the following signature:
+// typedef void (*vp9_mc_func)(uint8_t *dst, ptrdiff_t dst_stride,
+//const uint8_t *ref, ptrdiff_t ref_stride,
+//int h, int mx, int my);
+
+function ff_vp9_copy128_aarch64, export=1
+1:
+ldp x5,  x6,  [x2]
+ldp x7,  x8,  [x2, #16]
+stp x5,  x6,  [x0]
+ldp x9,  x10, [x2, #32]
+stp x7,  x8,  [x0, #16]
+subsw4,  w4,  #1
+ldp x11, x12, [x2, #48]
+stp x9,  x10, [x0, #32]
+stp x11, x12, [x0, #48]
+ldp x5,  x6,  [x2, #64]
+ldp x7,  x8,  [x2, #80]
+stp x5,  x6,  [x0, #64]
+ldp x9,  x10, [x2, #96]
+stp x7,  x8,  [x0, #80]
+ldp x11, x12, [x2, #112]
+stp x9,  x10, [x0, #96]
+stp x11, x12, [x0, #112]
+add x2,  x2,  x3
+add x0,  x0,  x1
+b.ne1b
+

[FFmpeg-cvslog] lavc/aarch64: Fix compilation with --disable-neon

2020-03-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Mar 11 
13:16:47 2020 +0100| [213c79656162ffcf1c2e2377977cfea7238c4651] | committer: 
Carl Eugen Hoyos

lavc/aarch64: Fix compilation with --disable-neon

Fixes ticket #8565.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=213c79656162ffcf1c2e2377977cfea7238c4651
---

 libavcodec/aarch64/Makefile   | 4 ++--
 libavcodec/aarch64/idctdsp_init_aarch64.c | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile
index 90e7210ee0..52da7036f3 100644
--- a/libavcodec/aarch64/Makefile
+++ b/libavcodec/aarch64/Makefile
@@ -6,6 +6,7 @@ OBJS-$(CONFIG_H264DSP)  += 
aarch64/h264dsp_init_aarch64.o
 OBJS-$(CONFIG_H264PRED) += aarch64/h264pred_init.o
 OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_init_aarch64.o
 OBJS-$(CONFIG_HPELDSP)  += aarch64/hpeldsp_init_aarch64.o
+OBJS-$(CONFIG_IDCTDSP)  += aarch64/idctdsp_init_aarch64.o
 OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o
 OBJS-$(CONFIG_NEON_CLOBBER_TEST)+= aarch64/neontest.o
 OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o
@@ -42,8 +43,7 @@ NEON-OBJS-$(CONFIG_H264PRED)+= 
aarch64/h264pred_neon.o
 NEON-OBJS-$(CONFIG_H264QPEL)+= aarch64/h264qpel_neon.o 
\
aarch64/hpeldsp_neon.o
 NEON-OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_neon.o
-NEON-OBJS-$(CONFIG_IDCTDSP) += aarch64/idctdsp_init_aarch64.o  
\
-   aarch64/simple_idct_neon.o
+NEON-OBJS-$(CONFIG_IDCTDSP) += aarch64/simple_idct_neon.o
 NEON-OBJS-$(CONFIG_MDCT)+= aarch64/mdct_neon.o
 NEON-OBJS-$(CONFIG_MPEGAUDIODSP)+= aarch64/mpegaudiodsp_neon.o
 NEON-OBJS-$(CONFIG_VP8DSP)  += aarch64/vp8dsp_neon.o
diff --git a/libavcodec/aarch64/idctdsp_init_aarch64.c 
b/libavcodec/aarch64/idctdsp_init_aarch64.c
index 0406e60830..742a3372e3 100644
--- a/libavcodec/aarch64/idctdsp_init_aarch64.c
+++ b/libavcodec/aarch64/idctdsp_init_aarch64.c
@@ -21,6 +21,8 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavutil/arm/cpu.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/idctdsp.h"
 #include "idct.h"
@@ -28,7 +30,9 @@
 av_cold void ff_idctdsp_init_aarch64(IDCTDSPContext *c, AVCodecContext *avctx,
  unsigned high_bit_depth)
 {
-if (!avctx->lowres && !high_bit_depth) {
+int cpu_flags = av_get_cpu_flags();
+
+if (have_neon(cpu_flags) && !avctx->lowres && !high_bit_depth) {
 if (avctx->idct_algo == FF_IDCT_AUTO ||
 avctx->idct_algo == FF_IDCT_SIMPLEAUTO ||
 avctx->idct_algo == FF_IDCT_SIMPLENEON) {

___
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] Makefile: Delete more created files when running "make distclean".

2020-03-11 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Mar 11 
11:39:44 2020 +0100| [613de37a6c5d6c2fdceb18b62fbe8d70c52b6cd5] | committer: 
Carl Eugen Hoyos

Makefile: Delete more created files when running "make distclean".

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=613de37a6c5d6c2fdceb18b62fbe8d70c52b6cd5
---

 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index b7ecea855d..45a22b0cb3 100644
--- a/Makefile
+++ b/Makefile
@@ -151,6 +151,7 @@ distclean:: clean
version.h libavutil/ffversion.h libavcodec/codec_names.h \
libavcodec/bsf_list.c libavformat/protocol_list.c \
libavcodec/codec_list.c libavcodec/parser_list.c \
+   libavfilter/filter_list.c libavdevice/indev_list.c 
libavdevice/outdev_list.c \
libavformat/muxer_list.c libavformat/demuxer_list.c
 ifeq ($(SRC_LINK),src)
$(RM) src

___
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] mailmap: Add another old mail address I used.

2020-02-27 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Feb 27 
13:02:06 2020 +0100| [516e9b9d72be1698bc232db652dad19389a16db5] | committer: 
Carl Eugen Hoyos

mailmap: Add another old mail address I used.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=516e9b9d72be1698bc232db652dad19389a16db5
---

 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 59819a1453..330cdd13dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,7 +9,7 @@
  
  
  
- 
+  
  
  
  

___
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] test/fate: Add missing exe suffix to h265_levels test.

2020-01-27 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Jan 28 
00:02:01 2020 +0100| [d89f69e1424c04cb5ec7c3cbbf19802865c27ea6] | committer: 
Carl Eugen Hoyos

test/fate: Add missing exe suffix to h265_levels test.

Fixes fate on WSL using mingw.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d89f69e1424c04cb5ec7c3cbbf19802865c27ea6
---

 tests/fate/libavcodec.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index d9b26bae93..747dae3704 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -53,7 +53,7 @@ fate-h264-levels: REF = /dev/null
 
 FATE_LIBAVCODEC-$(CONFIG_HEVC_METADATA_BSF) += fate-h265-levels
 fate-h265-levels: libavcodec/tests/h265_levels$(EXESUF)
-fate-h265-levels: CMD = run libavcodec/tests/h265_levels
+fate-h265-levels: CMD = run libavcodec/tests/h265_levels$(EXESUF)
 fate-h265-levels: REF = /dev/null
 
 FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter

___
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] ffmpeg: Do not print "SDP:" on top of sdp files.

2020-01-27 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Jan 26 
21:47:26 2020 +0100| [26c7f91e6624b1a46e39fb887b07b77db6cee328] | committer: 
Carl Eugen Hoyos

ffmpeg: Do not print "SDP:" on top of sdp files.

Fixes ticket #7068.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26c7f91e6624b1a46e39fb887b07b77db6cee328
---

 fftools/ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 6bcd7b94d2..b0bffe0a54 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2776,7 +2776,7 @@ static void print_sdp(void)
 if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) 
< 0) {
 av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", 
sdp_filename);
 } else {
-avio_printf(sdp_pb, "SDP:\n%s", sdp);
+avio_print(sdp_pb, sdp);
 avio_closep(&sdp_pb);
 av_freep(&sdp_filename);
 }

___
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] doc/outdevs: Mention "sdl2" alias for "sdl".

2020-01-26 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Jan 26 
13:15:07 2020 +0100| [c2d03216619421859c86a1592dad60f9f48a966f] | committer: 
Carl Eugen Hoyos

doc/outdevs: Mention "sdl2" alias for "sdl".

Fixes ticket #8498.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2d03216619421859c86a1592dad60f9f48a966f
---

 doc/outdevs.texi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/outdevs.texi b/doc/outdevs.texi
index 27f543fa1a..60606eb6e7 100644
--- a/doc/outdevs.texi
+++ b/doc/outdevs.texi
@@ -329,6 +329,8 @@ ffmpeg  -i INPUT -f pulse "stream name"
 
 SDL (Simple DirectMedia Layer) output device.
 
+"sdl2" can be used as alias for "sdl".
+
 This output device allows one to show a video stream in an SDL
 window. Only one SDL window is allowed per application, so you can
 have only one instance of this output device in an application.

___
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] lavc/mjpegenc: Fix not writing RST tag after final slice.

2020-01-21 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Jan 20 
23:57:38 2020 +0100| [f2e78644962fa93edb0b1cf92397f99e772d92d6] | committer: 
Carl Eugen Hoyos

lavc/mjpegenc: Fix not writing RST tag after final slice.

Fixes ticket #8412.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2e78644962fa93edb0b1cf92397f99e772d92d6
---

 libavcodec/mjpegenc_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 31868c9bed..3038ebde6e 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -573,7 +573,7 @@ int ff_mjpeg_encode_stuffing(MpegEncContext *s)
 
 ff_mjpeg_escape_FF(pbc, s->esc_pos);
 
-if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height)
+if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height 
- 1)
 put_marker(pbc, RST0 + (mb_y&7));
 s->esc_pos = put_bits_count(pbc) >> 3;
 fail:

___
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] lavf/hlsenc: Do not mix declarations and code.

2020-01-07 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.1 | Carl Eugen Hoyos  | Fri Nov 
16 22:03:37 2018 +0100| [4521700f295f35da4768f88b570e0836a858ce7b] | committer: 
Michael Niedermayer

lavf/hlsenc: Do not mix declarations and code.

Fixes the following warnings:
libavformat/hlsenc.c: In function 'hls_write_trailer':
libavformat/hlsenc.c:2364:17: warning: ISO C90 forbids mixed declarations and 
code [-Wdeclaration-after-statement]
 uint8_t *buffer = NULL;
 ^~~
libavformat/hlsenc.c:2372:17: warning: ISO C90 forbids mixed declarations and 
code [-Wdeclaration-after-statement]
 int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || 
(hls->max_seg_size > 0);
 ^~~
libavformat/hlsenc.c:2379:13: warning: ISO C90 forbids mixed declarations and 
code [-Wdeclaration-after-statement]
 int range_length = 0;
 ^~~

(cherry picked from commit fc94e9704e056a2dc85745ffec685ffb6fcd142e)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4521700f295f35da4768f88b570e0836a858ce7b
---

 libavformat/hlsenc.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index f8f060d065..fa45a62844 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -2348,26 +2348,26 @@ static int hls_write_trailer(struct AVFormatContext *s)
 return AVERROR(ENOMEM);
 }
 if ( hls->segment_type == SEGMENT_TYPE_FMP4) {
+int range_length = 0;
 if (!vs->init_range_length) {
+uint8_t *buffer = NULL;
+int range_length, byterange_mode;
 av_write_frame(vs->avf, NULL); /* Flush any buffered data */
 avio_flush(oc->pb);
 
-uint8_t *buffer = NULL;
-int range_length = avio_close_dyn_buf(oc->pb, &buffer);
+range_length = avio_close_dyn_buf(oc->pb, &buffer);
 avio_write(vs->out, buffer, range_length);
 av_free(buffer);
 vs->init_range_length = range_length;
 avio_open_dyn_buf(&oc->pb);
 vs->packets_written = 0;
 vs->start_pos = range_length;
-int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || 
(hls->max_seg_size > 0);
+byterange_mode = (hls->flags & HLS_SINGLE_FILE) || 
(hls->max_seg_size > 0);
 if (!byterange_mode) {
 ff_format_io_close(s, &vs->out);
 hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
 }
 }
-
-int range_length = 0;
 if (!(hls->flags & HLS_SINGLE_FILE)) {
 ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL);
 if (ret < 0) {

___
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] lavc/vdpau_vp9: Do not mix declarations and code.

2020-01-06 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Jan  6 
22:57:54 2020 +0100| [a665a2ecda021012e5ec277ff16ca0014aa36b1d] | committer: 
Carl Eugen Hoyos

lavc/vdpau_vp9: Do not mix declarations and code.

Fixes the following gcc warning:
libavcodec/vdpau_vp9.c:45:5: warning: ISO C90 forbids mixed declarations and 
code

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a665a2ecda021012e5ec277ff16ca0014aa36b1d
---

 libavcodec/vdpau_vp9.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c
index f1ee4ac5e0..54e060fad5 100644
--- a/libavcodec/vdpau_vp9.c
+++ b/libavcodec/vdpau_vp9.c
@@ -35,16 +35,15 @@ static int vdpau_vp9_start_frame(AVCodecContext *avctx,
 {
 VP9Context *s = avctx->priv_data;
 VP9SharedContext *h = &(s->s);
-const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
-if (!pixdesc) {
-return AV_PIX_FMT_NONE;
-}
-
 VP9Frame pic = h->frames[CUR_FRAME];
 struct vdpau_picture_context *pic_ctx = pic.hwaccel_picture_private;
 int i;
 
 VdpPictureInfoVP9 *info = &pic_ctx->info.vp9;
+const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
+if (!pixdesc) {
+return AV_PIX_FMT_NONE;
+}
 
 info->width = avctx->width;
 info->height = avctx->height;

___
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] Silence "string-plus-int" warning shown by clang.

2020-01-06 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Jan  6 
16:16:18 2020 +0100| [96fab29e9659c9492783f6369c5e14c0316bb94b] | committer: 
Carl Eugen Hoyos

Silence "string-plus-int" warning shown by clang.

libswscale/utils.c:89:42: warning: adding 'unsigned long' to a string does not 
append to the string [-Wstring-plus-int]

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96fab29e9659c9492783f6369c5e14c0316bb94b
---

 libavcodec/utils.c | 2 +-
 libavdevice/avdevice.c | 2 +-
 libavfilter/avfilter.c | 2 +-
 libavformat/utils.c| 2 +-
 libavutil/utils.c  | 2 +-
 libpostproc/postprocess.c  | 2 +-
 libswresample/swresample.c | 2 +-
 libswscale/utils.c | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c935e07538..fd5565a5e8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1444,7 +1444,7 @@ const char *avcodec_configuration(void)
 const char *avcodec_license(void)
 {
 #define LICENSE_PREFIX "libavcodec license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 72e1b67887..3d03d89f04 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -75,7 +75,7 @@ const char * avdevice_configuration(void)
 const char * avdevice_license(void)
 {
 #define LICENSE_PREFIX "libavdevice license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 static void *device_next(void *prev, int output,
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index baafd029e9..394811916d 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -88,7 +88,7 @@ const char *avfilter_configuration(void)
 const char *avfilter_license(void)
 {
 #define LICENSE_PREFIX "libavfilter license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 void ff_command_queue_pop(AVFilterContext *filter)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b472762dd1..2470a6ac0e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -77,7 +77,7 @@ const char *avformat_configuration(void)
 const char *avformat_license(void)
 {
 #define LICENSE_PREFIX "libavformat license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 int ff_lock_avformat(void)
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 230081ea47..c1cd452eee 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -70,7 +70,7 @@ const char *avutil_configuration(void)
 const char *avutil_license(void)
 {
 #define LICENSE_PREFIX "libavutil license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 const char *av_get_media_type_string(enum AVMediaType media_type)
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 1fef8747c0..e16ef259ce 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -108,7 +108,7 @@ const char *postproc_configuration(void)
 const char *postproc_license(void)
 {
 #define LICENSE_PREFIX "libpostproc license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 #define GET_MODE_BUFFER_SIZE 500
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 1ac5ef9a30..a7bb69dd4f 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -46,7 +46,7 @@ const char *swresample_configuration(void)
 const char *swresample_license(void)
 {
 #define LICENSE_PREFIX "libswresample license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map){
diff --git a/libswscale/utils.c b/libswscale/utils.c
index c915cf0fca..b2c08a5983 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -86,7 +86,7 @@ const char *swscale_configuration(void)
 const char *swscale_license(void)
 {
 #define LICENSE_PREFIX "libswscale license: "
-return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
 typedef struct FormatEntry {

___
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] doc: Fix a typo.

2020-01-04 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Jan  4 
20:58:10 2020 +0100| [f7c945abc071770fad2e1d730eb3295432b6aeb0] | committer: 
Carl Eugen Hoyos

doc: Fix a typo.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7c945abc071770fad2e1d730eb3295432b6aeb0
---

 doc/filters.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index b5f136d79b..c806a66849 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3440,7 +3440,7 @@ In general, smaller parameters result in stronger 
compression, and vice versa.
 Values below 3.0 are not recommended, because audible distortion may appear.
 
 @item threshold, t
-Set the target threshold value. This specifies the loweset permissible
+Set the target threshold value. This specifies the lowest permissible
 magnitude level for the audio input which will be normalized.
 If input frame volume is above this value frame will be normalized.
 Otherwise frame may not be normalized at all. The default value is set

___
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] fftools/ffmpeg_opt: Add a missing closing brackets.

2019-12-28 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Dec 28 
20:11:01 2019 +0100| [2e700ec3a7ee0f74803a51c343d70b3b9ad45d0e] | committer: 
Carl Eugen Hoyos

fftools/ffmpeg_opt: Add a missing closing brackets.

Fixes ticket #8447.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e700ec3a7ee0f74803a51c343d70b3b9ad45d0e
---

 fftools/ffmpeg_opt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 71063cc443..1510e026ea 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -3202,7 +3202,7 @@ void show_help_default(const char *opt, const char *arg)
   OPT_EXIT, 0, 0);
 
 show_help_options(options, "Global options (affect whole program "
-  "instead of just one file:",
+  "instead of just one file):",
   0, per_file | OPT_EXIT | OPT_EXPERT, 0);
 if (show_advanced)
 show_help_options(options, "Advanced global options:", OPT_EXPERT,

___
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] lavc/allcodecs: Add mpeg4 omx encoder, missed in 0e387232

2019-12-16 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Dec 16 
22:45:34 2019 +0100| [9f6a06d9271a11781717fd0b134db2bcd716508e] | committer: 
Carl Eugen Hoyos

lavc/allcodecs: Add mpeg4 omx encoder, missed in 0e387232

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f6a06d9271a11781717fd0b134db2bcd716508e
---

 libavcodec/allcodecs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index c33edf23c9..ec7366144f 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -776,6 +776,7 @@ extern AVCodec ff_mpeg2_qsv_encoder;
 extern AVCodec ff_mpeg2_vaapi_encoder;
 extern AVCodec ff_mpeg4_cuvid_decoder;
 extern AVCodec ff_mpeg4_mediacodec_decoder;
+extern AVCodec ff_mpeg4_omx_encoder;
 extern AVCodec ff_mpeg4_v4l2m2m_encoder;
 extern AVCodec ff_vc1_cuvid_decoder;
 extern AVCodec ff_vp8_cuvid_decoder;

___
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] lavu/log: Also print the log level for level trace.

2019-12-16 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Dec 16 
13:08:40 2019 +0100| [84db67894f9aec4aa0c8df67265019e0391c7572] | committer: 
Carl Eugen Hoyos

lavu/log: Also print the log level for level trace.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84db67894f9aec4aa0c8df67265019e0391c7572
---

 libavutil/log.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/log.c b/libavutil/log.c
index 93a156b8e4..e8a0db7716 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -226,6 +226,8 @@ static const char *get_level_str(int level)
 return "quiet";
 case AV_LOG_DEBUG:
 return "debug";
+case AV_LOG_TRACE:
+return "trace";
 case AV_LOG_VERBOSE:
 return "verbose";
 case AV_LOG_INFO:

___
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] lavu/pixfmt: Cosmetics, remove wrong end-of-comment markers.

2019-12-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Dec 14 
16:09:41 2019 +0100| [8b5ef2dcffe56e94c26278645f0b3bcf0805c64d] | committer: 
Carl Eugen Hoyos

lavu/pixfmt: Cosmetics, remove wrong end-of-comment markers.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b5ef2dcffe56e94c26278645f0b3bcf0805c64d
---

 libavutil/pixfmt.h | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index d78e863d4b..37ecebd501 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -257,18 +257,18 @@ enum AVPixelFormat {
 AV_PIX_FMT_GBRP14LE,///< planar GBR 4:4:4 42bpp, little-endian
 AV_PIX_FMT_YUVJ411P,///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample 
per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P 
and setting color_range
 
-AV_PIX_FMT_BAYER_BGGR8,///< bayer, BGBG..(odd line), GRGR..(even 
line), 8-bit samples */
-AV_PIX_FMT_BAYER_RGGB8,///< bayer, RGRG..(odd line), GBGB..(even 
line), 8-bit samples */
-AV_PIX_FMT_BAYER_GBRG8,///< bayer, GBGB..(odd line), RGRG..(even 
line), 8-bit samples */
-AV_PIX_FMT_BAYER_GRBG8,///< bayer, GRGR..(odd line), BGBG..(even 
line), 8-bit samples */
-AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even 
line), 16-bit samples, little-endian */
-AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even 
line), 16-bit samples, big-endian */
-AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even 
line), 16-bit samples, little-endian */
-AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even 
line), 16-bit samples, big-endian */
-AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even 
line), 16-bit samples, little-endian */
-AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even 
line), 16-bit samples, big-endian */
-AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even 
line), 16-bit samples, little-endian */
-AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even 
line), 16-bit samples, big-endian */
+AV_PIX_FMT_BAYER_BGGR8,///< bayer, BGBG..(odd line), GRGR..(even 
line), 8-bit samples
+AV_PIX_FMT_BAYER_RGGB8,///< bayer, RGRG..(odd line), GBGB..(even 
line), 8-bit samples
+AV_PIX_FMT_BAYER_GBRG8,///< bayer, GBGB..(odd line), RGRG..(even 
line), 8-bit samples
+AV_PIX_FMT_BAYER_GRBG8,///< bayer, GRGR..(odd line), BGBG..(even 
line), 8-bit samples
+AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even 
line), 16-bit samples, little-endian
+AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even 
line), 16-bit samples, big-endian
+AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even 
line), 16-bit samples, little-endian
+AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even 
line), 16-bit samples, big-endian
+AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even 
line), 16-bit samples, little-endian
+AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even 
line), 16-bit samples, big-endian
+AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even 
line), 16-bit samples, little-endian
+AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even 
line), 16-bit samples, big-endian
 
 AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
 

___
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] lavc/pnmdec: Fix 16bit decoding.

2019-12-14 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Fri Dec 13 
19:10:15 2019 +0100| [193143486e8a7b1108147b1ea44134b5a80e5e17] | committer: 
Carl Eugen Hoyos

lavc/pnmdec: Fix 16bit decoding.

Regression since cdb5479c
Reported by irc user tTh from Mixart-Myrys

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=193143486e8a7b1108147b1ea44134b5a80e5e17
---

 libavcodec/pnmdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index 958c5e43b0..dbcaef3884 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -143,7 +143,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void 
*data,
 v = (*s->bytestream++)&1;
 } else {
 /* read a sequence of digits */
-for (k = 0; k < 5 && c <= 9; k += 1) {
+for (k = 0; k < 6 && c <= 9; k += 1) {
 v = 10*v + c;
 c = (*s->bytestream++) - '0';
 }

___
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] lavc/qsvenc: Fix compilation for some build environments.

2019-11-26 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Nov 27 
00:03:33 2019 +0100| [a2fbdc6898fc72f7f289e750f2199ee66216f2f8] | committer: 
Carl Eugen Hoyos

lavc/qsvenc: Fix compilation for some build environments.

Reported and tested by Sean Darcy.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2fbdc6898fc72f7f289e750f2199ee66216f2f8
---

 libavcodec/qsvenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 93d49ba21d..1bc5600061 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -824,7 +824,9 @@ static int qsv_retrieve_enc_vp9_params(AVCodecContext 
*avctx, QSVEncContext *q)
 #endif
 
 mfxExtBuffer *ext_buffers[] = {
+#if QSV_HAVE_EXT_VP9_PARAM
 (mfxExtBuffer*)&vp9_extend_buf,
+#endif
 #if QSV_HAVE_CO2
 (mfxExtBuffer*)&co2,
 #endif

___
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] lavc/tableprint_vlc: Remove avpriv_request_sample() from included files.

2019-11-21 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.0 | Carl Eugen Hoyos  | Wed Jun 
19 13:41:01 2019 +0200| [5e98ede2da98cd4579c13095a8918882e753d08a] | committer: 
Michael Niedermayer

lavc/tableprint_vlc: Remove avpriv_request_sample() from included files.

Fixes compilation with --enable-hardcoded-tables.
Fixes ticket #7962.

(cherry picked from commit c8232e50074f6f9f9b0674d0a5433f49d73a4e50)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e98ede2da98cd4579c13095a8918882e753d08a
---

 libavcodec/tableprint_vlc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h
index 3004be3f9c..b3ff36562b 100644
--- a/libavcodec/tableprint_vlc.h
+++ b/libavcodec/tableprint_vlc.h
@@ -36,6 +36,7 @@
 #define AVCODEC_AVCODEC_H
 #define AVCODEC_INTERNAL_H
 #define AV_INPUT_BUFFER_PADDING_SIZE 64 // the value does not matter for this
+#define avpriv_request_sample(...)
 #include "tableprint.h"
 #include "get_bits.h"
 #include "mathtables.c"

___
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] lavf/Makefile: Specify sln demuxer requirements.

2019-11-17 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Nov 17 
23:40:14 2019 +0100| [56f25c11a9e88cbe2958d9dd1ebf5773c7f3e4a8] | committer: 
Carl Eugen Hoyos

lavf/Makefile: Specify sln demuxer requirements.

Mentioned in ticket #8378.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56f25c11a9e88cbe2958d9dd1ebf5773c7f3e4a8
---

 libavformat/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 47fe625cbc..52f29b1a6d 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -479,6 +479,7 @@ OBJS-$(CONFIG_SER_DEMUXER)   += serdec.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)   += shortendec.o rawdec.o
 OBJS-$(CONFIG_SIFF_DEMUXER)  += siff.o
 OBJS-$(CONFIG_SINGLEJPEG_MUXER)  += rawenc.o
+OBJS-$(CONFIG_SLN_DEMUXER)   += pcmdec.o pcm.o
 OBJS-$(CONFIG_SMACKER_DEMUXER)   += smacker.o
 OBJS-$(CONFIG_SMJPEG_DEMUXER)+= smjpegdec.o smjpeg.o
 OBJS-$(CONFIG_SMJPEG_MUXER)  += smjpegenc.o smjpeg.o

___
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] configure: Add fft dependency for showspatial filter.

2019-11-17 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Nov 17 
23:29:23 2019 +0100| [ce8faea9fddbe84c50bf6e17dacf8b541e965e17] | committer: 
Carl Eugen Hoyos

configure: Add fft dependency for showspatial filter.

Mentioned in ticket #8378.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce8faea9fddbe84c50bf6e17dacf8b541e965e17
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 2d98d964e1..8f4f2884cf 100755
--- a/configure
+++ b/configure
@@ -3548,6 +3548,7 @@ showcqt_filter_suggest="libfontconfig libfreetype"
 showcqt_filter_select="fft"
 showfreqs_filter_deps="avcodec"
 showfreqs_filter_select="fft"
+showspatial_filter_select="fft"
 showspectrum_filter_deps="avcodec"
 showspectrum_filter_select="fft"
 showspectrumpic_filter_deps="avcodec"

___
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] configure: Add fft dependency for headphone filter.

2019-11-17 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Nov 17 
23:24:38 2019 +0100| [8038a87d49563acd385c335b57c68705bac5d95c] | committer: 
Carl Eugen Hoyos

configure: Add fft dependency for headphone filter.

Mentioned in ticket #8378.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8038a87d49563acd385c335b57c68705bac5d95c
---

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 31a3744dc6..2d98d964e1 100755
--- a/configure
+++ b/configure
@@ -3499,6 +3499,7 @@ frei0r_filter_deps="frei0r libdl"
 frei0r_src_filter_deps="frei0r libdl"
 fspp_filter_deps="gpl"
 geq_filter_deps="gpl"
+headphone_filter_select="fft"
 histeq_filter_deps="gpl"
 hqdn3d_filter_deps="gpl"
 interlace_filter_deps="gpl"

___
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] lavc/libopencore-amr: Silence a warning about an unused function.

2019-11-16 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Nov 17 
00:35:14 2019 +0100| [eeab18329f030bdcc2576eb6789cb5ed700eda33] | committer: 
Carl Eugen Hoyos

lavc/libopencore-amr: Silence a warning about an unused function.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eeab18329f030bdcc2576eb6789cb5ed700eda33
---

 libavcodec/libopencore-amr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 516f625720..614b3a2218 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -29,6 +29,7 @@
 #include "audio_frame_queue.h"
 #include "internal.h"
 
+#if CONFIG_LIBOPENCORE_AMRNB_DECODER || CONFIG_LIBOPENCORE_AMRWB_DECODER
 static int amr_decode_fix_avctx(AVCodecContext *avctx)
 {
 const int is_amr_wb = 1 + (avctx->codec_id == AV_CODEC_ID_AMR_WB);
@@ -46,6 +47,7 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx)
 avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 return 0;
 }
+#endif
 
 #if CONFIG_LIBOPENCORE_AMRNB
 

___
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] lavc/tableprint_vlc: Remove avpriv_request_sample() from included files.

2019-11-15 Thread Carl Eugen Hoyos

ffmpeg | branch: release/3.4 | Carl Eugen Hoyos  | Wed Jun 
19 13:41:01 2019 +0200| [1b814e6afffb99eb471b61fce986e9b117856835] | committer: 
Michael Niedermayer

lavc/tableprint_vlc: Remove avpriv_request_sample() from included files.

Fixes compilation with --enable-hardcoded-tables.
Fixes ticket #7962.

(cherry picked from commit c8232e50074f6f9f9b0674d0a5433f49d73a4e50)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b814e6afffb99eb471b61fce986e9b117856835
---

 libavcodec/tableprint_vlc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h
index 3004be3f9c..b3ff36562b 100644
--- a/libavcodec/tableprint_vlc.h
+++ b/libavcodec/tableprint_vlc.h
@@ -36,6 +36,7 @@
 #define AVCODEC_AVCODEC_H
 #define AVCODEC_INTERNAL_H
 #define AV_INPUT_BUFFER_PADDING_SIZE 64 // the value does not matter for this
+#define avpriv_request_sample(...)
 #include "tableprint.h"
 #include "get_bits.h"
 #include "mathtables.c"

___
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] lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.

2019-10-01 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Aug 25 
16:12:28 2019 +0200| [87b7e141a6fda7f450aff4560b776d546af313ed] | committer: 
Carl Eugen Hoyos

lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.

Usage of strtok() was removed from x264, see also b02490a4

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87b7e141a6fda7f450aff4560b776d546af313ed
---

 libavcodec/libx264.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 8788286fae..bfd91bb900 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1180,7 +1180,11 @@ AVCodec ff_libx264_encoder = {
 .priv_class   = &x264_class,
 .defaults = x264_defaults,
 .init_static_data = X264_init_static,
+#if X264_BUILD >= 158
+.caps_internal= FF_CODEC_CAP_INIT_CLEANUP | 
FF_CODEC_CAP_INIT_THREADSAFE,
+#else
 .caps_internal= FF_CODEC_CAP_INIT_CLEANUP,
+#endif
 .wrapper_name = "libx264",
 };
 #endif
@@ -1207,7 +1211,11 @@ AVCodec ff_libx264rgb_encoder = {
 .priv_class = &rgbclass,
 .defaults   = x264_defaults,
 .pix_fmts   = pix_fmts_8bit_rgb,
+#if X264_BUILD >= 158
+.caps_internal  = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE,
+#else
 .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
+#endif
 .wrapper_name   = "libx264",
 };
 #endif

___
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] lavfi/movie: Use filter thread count for decoding threads.

2019-10-01 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Aug 25 
18:42:02 2019 +0200| [7ffa458d600eccbd2582d755af75c03bdaa9e51f] | committer: 
Carl Eugen Hoyos

lavfi/movie: Use filter thread count for decoding threads.

Fixes ticket #7542.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ffa458d600eccbd2582d755af75c03bdaa9e51f
---

 libavfilter/src_movie.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index bcabfcc4c2..79423a894d 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -153,14 +153,14 @@ static AVStream *find_stream(void *log, AVFormatContext 
*avf, const char *spec)
 return found;
 }
 
-static int open_stream(void *log, MovieStream *st)
+static int open_stream(AVFilterContext *ctx, MovieStream *st)
 {
 AVCodec *codec;
 int ret;
 
 codec = avcodec_find_decoder(st->st->codecpar->codec_id);
 if (!codec) {
-av_log(log, AV_LOG_ERROR, "Failed to find any codec\n");
+av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n");
 return AVERROR(EINVAL);
 }
 
@@ -173,9 +173,10 @@ static int open_stream(void *log, MovieStream *st)
 return ret;
 
 st->codec_ctx->refcounted_frames = 1;
+st->codec_ctx->thread_count = ff_filter_get_nb_threads(ctx);
 
 if ((ret = avcodec_open2(st->codec_ctx, codec, NULL)) < 0) {
-av_log(log, AV_LOG_ERROR, "Failed to open codec\n");
+av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n");
 return ret;
 }
 

___
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] lavf/avio: Print https warning also for avio_find_protocol_name().

2019-10-01 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Sep 25 
11:32:57 2019 +0200| [a650e8c8e957d81959282d9b6c1f20e87f385031] | committer: 
Carl Eugen Hoyos

lavf/avio: Print https warning also for avio_find_protocol_name().

Helps to fix ticket #8197.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a650e8c8e957d81959282d9b6c1f20e87f385031
---

 libavformat/avio.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 663789ec02..c1bad312cd 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -283,6 +283,9 @@ static const struct URLProtocol *url_find_protocol(const 
char *filename)
 }
 }
 av_freep(&protocols);
+if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", 
NULL))
+av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile 
FFmpeg with "
+ "openssl, gnutls or securetransport 
enabled.\n");
 
 return NULL;
 }
@@ -297,10 +300,6 @@ int ffurl_alloc(URLContext **puc, const char *filename, 
int flags,
return url_alloc_for_protocol(puc, p, filename, flags, int_cb);
 
 *puc = NULL;
-if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", 
NULL))
-av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile 
FFmpeg with "
- "openssl, gnutls "
- "or securetransport enabled.\n");
 return AVERROR_PROTOCOL_NOT_FOUND;
 }
 

___
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] Revert "lavc/tiff: correct the default value of YCbCrSubsampling to 2x2"

2019-09-25 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Thu Sep 26 
00:34:44 2019 +0200| [dbd3dbb4766126a806e7aeaa3e2dfbc3557f66f9] | committer: 
Carl Eugen Hoyos

Revert "lavc/tiff: correct the default value of YCbCrSubsampling to 2x2"

This reverts commit eb5d0f18ff609ba2280cea4e2c6286d216c8756b.

Together with 89f464e9, it breaks decoding of tiff files like 
fate-suite/exif/image_small.tiff

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbd3dbb4766126a806e7aeaa3e2dfbc3557f66f9
---

 libavcodec/tiff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index c8b2a3680e..9f24796a88 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -2065,7 +2065,7 @@ static av_cold int tiff_init(AVCodecContext *avctx)
 s->width  = 0;
 s->height = 0;
 s->subsampling[0] =
-s->subsampling[1] = 2;
+s->subsampling[1] = 1;
 s->avctx  = avctx;
 ff_lzw_decode_open(&s->lzw);
 if (!s->lzw)

___
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] lavc/cook: Remove an incorrect comment.

2019-09-19 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Fri Sep 20 
01:36:13 2019 +0200| [f9f9d5943f794f7dc9f5c02d32f6038ad0fede2d] | committer: 
Carl Eugen Hoyos

lavc/cook: Remove an incorrect comment.

Multichannel cook was implemented in 67da3182.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9f9d5943f794f7dc9f5c02d32f6038ad0fede2d
---

 libavcodec/cook.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index c5f68c98ba..aa11205166 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -60,7 +60,7 @@
 #define MONO0x101
 #define STEREO  0x102
 #define JOINT_STEREO0x103
-#define MC_COOK 0x200   // multichannel Cook, not supported
+#define MC_COOK 0x200
 
 #define SUBBAND_SIZE20
 #define MAX_SUBPACKETS   5

___
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] lavc/g729dec: Support decoding Sipro ACELP.KELVIN.

2019-09-16 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Sep 16 
20:57:53 2019 +0200| [551fcbbccbca8e78443c049421f01f350d4bc370] | committer: 
Carl Eugen Hoyos

lavc/g729dec: Support decoding Sipro ACELP.KELVIN.

Fixes ticket #4799.
Analyzed-by: Aleksandr Ustinov

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=551fcbbccbca8e78443c049421f01f350d4bc370
---

 Changelog|  1 +
 doc/general.texi |  1 +
 libavcodec/Makefile  |  1 +
 libavcodec/allcodecs.c   |  1 +
 libavcodec/avcodec.h |  1 +
 libavcodec/codec_desc.c  |  6 ++
 libavcodec/g729_parser.c |  5 +++--
 libavcodec/g729dec.c | 21 +++--
 libavcodec/version.h |  4 ++--
 libavformat/riff.c   |  1 +
 10 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index 4b29e015a0..08b7464cb1 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,7 @@ version :
 - Supoort AMD AMF encoder on Linux (via Vulkan)
 - IMM5 video decoder
 - ZeroMQ protocol
+- support Sipro ACELP.KELVIN decoding
 
 
 version 4.2:
diff --git a/doc/general.texi b/doc/general.texi
index 2744c238cf..79a23e1718 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -1067,6 +1067,7 @@ following image formats are supported:
 @item AAC+   @tab  E  @tab  IX
 @tab encoding supported through external library libfdk-aac
 @item AC-3   @tab IX  @tab  IX
+@item ACELP.KELVIN   @tab @tab  X
 @item ADPCM 4X Movie @tab @tab  X
 @item APDCM Yamaha AICA  @tab @tab  X
 @item ADPCM CDROM XA @tab @tab  X
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6bc4383c8f..37a84a6bb4 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -173,6 +173,7 @@ OBJS-$(CONFIG_AC3_FIXED_DECODER)   += ac3dec_fixed.o 
ac3dec_data.o ac3.o kbd
 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \
   ac3.o kbdwin.o
 OBJS-$(CONFIG_AC3_FIXED_ENCODER)   += ac3enc_fixed.o ac3enc.o ac3tab.o 
ac3.o
+OBJS-$(CONFIG_ACELP_KELVIN_DECODER)+= g729dec.o lsp.o celp_math.o 
celp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o 
g729postfilter.o
 OBJS-$(CONFIG_AGM_DECODER) += agm.o
 OBJS-$(CONFIG_AIC_DECODER) += aic.o
 OBJS-$(CONFIG_ALAC_DECODER)+= alac.o alac_data.o alacdsp.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index d5dfba1877..41f680101f 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -388,6 +388,7 @@ extern AVCodec ff_ac3_encoder;
 extern AVCodec ff_ac3_decoder;
 extern AVCodec ff_ac3_fixed_encoder;
 extern AVCodec ff_ac3_fixed_decoder;
+extern AVCodec ff_acelp_kelvin_decoder;
 extern AVCodec ff_alac_encoder;
 extern AVCodec ff_alac_decoder;
 extern AVCodec ff_als_decoder;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index de4feb6a65..0ec3e73865 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -653,6 +653,7 @@ enum AVCodecID {
 AV_CODEC_ID_SBC,
 AV_CODEC_ID_ATRAC9,
 AV_CODEC_ID_HCOM,
+AV_CODEC_ID_ACELP_KELVIN,
 
 /* subtitle codecs */
 AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,  ///< A dummy ID pointing at 
the start of subtitle codecs.
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index e6373be504..d2c6863d3c 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2992,6 +2992,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
 .long_name = NULL_IF_CONFIG_SMALL("HCOM Audio"),
 .props = AV_CODEC_PROP_LOSSY,
 },
+{
+.id= AV_CODEC_ID_ACELP_KELVIN,
+.name  = "acelp.kelvin",
+.long_name = NULL_IF_CONFIG_SMALL("Sipro ACELP.KELVIN"),
+.props = AV_CODEC_PROP_LOSSY,
+},
 
 /* subtitle codecs */
 {
diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c
index 9982dbfffc..5a57025d62 100644
--- a/libavcodec/g729_parser.c
+++ b/libavcodec/g729_parser.c
@@ -45,9 +45,10 @@ static int g729_parse(AVCodecParserContext *s1, 
AVCodecContext *avctx,
 int next;
 
 if (!s->block_size) {
-av_assert1(avctx->codec_id == AV_CODEC_ID_G729);
 /* FIXME: replace this heuristic block_size with more precise estimate 
*/
 s->block_size = (avctx->bit_rate < 8000) ? G729D_6K4_BLOCK_SIZE : 
G729_8K_BLOCK_SIZE;
+if (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)
+s->block_size++;
 s->block_size *= avctx->channels;
 s->duration   = avctx->frame_size;
 }
@@ -76,7 +77,7 @@ static int g729_parse(AVCodecParserContext *s1, 
AVCodecContext *avctx,
 }
 
 AVCodecParser ff_g729_parser = {
-.codec_ids  = { AV_CODEC_ID_G729 },
+.codec_ids  = { AV_CODEC_ID_G729, AV_CODEC_ID_ACELP_KELVIN },
 .priv_data_size = sizeof(G729ParseContext),
 .parser_parse   = g729_parse,
 .parser_clo

[FFmpeg-cvslog] lavf/rawenc: Only accept the appropriate stream type for raw muxers.

2019-09-06 Thread Carl Eugen Hoyos

ffmpeg | branch: release/3.2 | Carl Eugen Hoyos  | Mon Jul  
1 00:37:08 2019 +0200| [9b236547f480a012cab32f8cad2dfe02774537c1] | committer: 
James Almer

lavf/rawenc: Only accept the appropriate stream type for raw muxers.

This does not affect the rawvideo muxer.

Fixes ticket #7979.

(cherry picked from commit aef24efb0c1e65097ab77a4bf9264189bdf3ace3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b236547f480a012cab32f8cad2dfe02774537c1
---

 libavformat/rawenc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 730e99a020..12274ca22b 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
 return AVERROR(EINVAL);
 }
+if (   s->oformat->audio_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
+if (   s->oformat->video_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
 return 0;
 }
 

___
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] lavf/rawenc: Only accept the appropriate stream type for raw muxers.

2019-09-06 Thread Carl Eugen Hoyos

ffmpeg | branch: release/3.4 | Carl Eugen Hoyos  | Mon Jul  
1 00:37:08 2019 +0200| [cfa7c079f72b65bfe038af84d95d384a609d4f0a] | committer: 
James Almer

lavf/rawenc: Only accept the appropriate stream type for raw muxers.

This does not affect the rawvideo muxer.

Fixes ticket #7979.

(cherry picked from commit aef24efb0c1e65097ab77a4bf9264189bdf3ace3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfa7c079f72b65bfe038af84d95d384a609d4f0a
---

 libavformat/rawenc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index f640121cb4..440ea4a598 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
 return AVERROR(EINVAL);
 }
+if (   s->oformat->audio_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
+if (   s->oformat->video_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
 return 0;
 }
 

___
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] lavf/rawenc: Only accept the appropriate stream type for raw muxers.

2019-09-06 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.0 | Carl Eugen Hoyos  | Mon Jul  
1 00:37:08 2019 +0200| [4a79f30d774dd81bde2da751fbd588e3413da2d7] | committer: 
James Almer

lavf/rawenc: Only accept the appropriate stream type for raw muxers.

This does not affect the rawvideo muxer.

Fixes ticket #7979.

(cherry picked from commit aef24efb0c1e65097ab77a4bf9264189bdf3ace3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a79f30d774dd81bde2da751fbd588e3413da2d7
---

 libavformat/rawenc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 809ca23b1a..6e5d175483 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
 return AVERROR(EINVAL);
 }
+if (   s->oformat->audio_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
+if (   s->oformat->video_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
 return 0;
 }
 

___
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] lavf/rawenc: Only accept the appropriate stream type for raw muxers.

2019-09-06 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.1 | Carl Eugen Hoyos  | Mon Jul  
1 00:37:08 2019 +0200| [60094fc2f552aace794395648110408a6eb825ad] | committer: 
James Almer

lavf/rawenc: Only accept the appropriate stream type for raw muxers.

This does not affect the rawvideo muxer.

Fixes ticket #7979.

(cherry picked from commit aef24efb0c1e65097ab77a4bf9264189bdf3ace3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60094fc2f552aace794395648110408a6eb825ad
---

 libavformat/rawenc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 993d232b70..32704f9bfd 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
 return AVERROR(EINVAL);
 }
+if (   s->oformat->audio_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
+if (   s->oformat->video_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
 return 0;
 }
 

___
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] lavf/rawenc: Only accept the appropriate stream type for raw muxers.

2019-09-06 Thread Carl Eugen Hoyos

ffmpeg | branch: release/4.2 | Carl Eugen Hoyos  | Mon Jul  
1 00:37:08 2019 +0200| [1dec90d45656d9d142deb1f3134bc1a0b3fa5522] | committer: 
James Almer

lavf/rawenc: Only accept the appropriate stream type for raw muxers.

This does not affect the rawvideo muxer.

Fixes ticket #7979.

(cherry picked from commit aef24efb0c1e65097ab77a4bf9264189bdf3ace3)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dec90d45656d9d142deb1f3134bc1a0b3fa5522
---

 libavformat/rawenc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 993d232b70..32704f9bfd 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
 return AVERROR(EINVAL);
 }
+if (   s->oformat->audio_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
+if (   s->oformat->video_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
 return 0;
 }
 

___
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] lavf/rawenc: Only accept the appropriate stream type for raw muxers.

2019-09-06 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Mon Jul  1 
00:37:08 2019 +0200| [aef24efb0c1e65097ab77a4bf9264189bdf3ace3] | committer: 
James Almer

lavf/rawenc: Only accept the appropriate stream type for raw muxers.

This does not affect the rawvideo muxer.

Fixes ticket #7979.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aef24efb0c1e65097ab77a4bf9264189bdf3ace3
---

 libavformat/rawenc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 993d232b70..32704f9bfd 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
 return AVERROR(EINVAL);
 }
+if (   s->oformat->audio_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
+if (   s->oformat->video_codec != AV_CODEC_ID_NONE
+&& s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+   s->oformat->name);
+return AVERROR(EINVAL);
+}
 return 0;
 }
 

___
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] lavc/x264: Also clean-up libx264rgb after init errors.

2019-08-25 Thread Carl Eugen Hoyos

ffmpeg | branch: master | Carl Eugen Hoyos  | Sun Aug 25 
16:09:40 2019 +0200| [434588596fef6bd2cef17f8c9c2979a010153edd] | committer: 
Carl Eugen Hoyos

lavc/x264: Also clean-up libx264rgb after init errors.

Missed in c180f0f6

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=434588596fef6bd2cef17f8c9c2979a010153edd
---

 libavcodec/libx264.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index a99c1f3163..86e3530e79 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1195,6 +1195,7 @@ AVCodec ff_libx264rgb_encoder = {
 .priv_class = &rgbclass,
 .defaults   = x264_defaults,
 .pix_fmts   = pix_fmts_8bit_rgb,
+.caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 .wrapper_name   = "libx264",
 };
 #endif

___
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".

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1058 matches

Mail list logo