[FFmpeg-cvslog] avformat/mpegts: use actually read packet size in mpegts_resync special case

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Thu Sep 16 23:12:42 2021 +0200| [bfc04caa2fe66a4dab2a02ac96fa487fd825f8b6] | 
committer: Michael Niedermayer

avformat/mpegts: use actually read packet size in mpegts_resync special case

Fixes: infinite loop
Fixes: 
37986/clusterfuzz-testcase-minimized-ffmpeg_dem_MPEGTSRAW_fuzzer-5292311517462528
 -

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Marton Balint 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 83b2e4c8f15a00f037040131e26e20de83f0d842)
Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index b0137ceb7a..7b1be3b5e2 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2847,8 +2847,8 @@ static int mpegts_resync(AVFormatContext *s, int 
seekback, const uint8_t *curren
 int64_t back = FFMIN(seekback, pos);
 
 //Special case for files like 01c56b0dc1.ts
-if (current_packet[0] == 0x80 && current_packet[12] == 0x47) {
-avio_seek(pb, 12 - back, SEEK_CUR);
+if (current_packet[0] == 0x80 && current_packet[12] == 0x47 && pos >= 
TS_PACKET_SIZE) {
+avio_seek(pb, 12 - TS_PACKET_SIZE, SEEK_CUR);
 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] oavformat/avidec: Check offset in odml

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Sun Sep 19 21:51:28 2021 +0200| [9d4a293b423fefd789b3c3176dac9742b49be4dd] | 
committer: Michael Niedermayer

oavformat/avidec: Check offset in odml

Fixes: signed integer overflow: 9223372036854775807 + 8 cannot be represented 
in type 'long'
Fixes: 
38787/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-485984579980

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 255a7b423ed5e07536bdc72e993056daa4efe009)
Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index cbccd19f16..cd7bd08567 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -236,7 +236,7 @@ static int read_odml_index(AVFormatContext *s, int64_t 
frame_num)
 avio_rl32(pb);   /* size */
 duration = avio_rl32(pb);
 
-if (avio_feof(pb))
+if (avio_feof(pb) || offset > INT64_MAX - 8)
 return AVERROR_INVALIDDATA;
 
 pos = avio_tell(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] avformat/rmdec: Check for multiple audio_stream_info

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Wed Sep 29 20:49:27 2021 +0200| [974799368bda4dc95b3c6a265d5285c31cb1d6fe] | 
committer: Michael Niedermayer

avformat/rmdec: Check for multiple audio_stream_info

Fixes: memleak
Fixes: 
39166/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5153276690038784

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 8fe3566b8fdf4bcf5eed419c1aab6eb848287ff3)
Signed-off-by: Michael Niedermayer 

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

 libavformat/rmdec.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index a5d03da974..67a68bb2d0 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -128,6 +128,10 @@ static int rm_read_audio_stream_info(AVFormatContext *s, 
AVIOContext *pb,
 uint32_t version;
 int ret;
 
+// Duplicate tags
+if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+return AVERROR_INVALIDDATA;
+
 /* ra type header */
 version = avio_rb16(pb); /* version */
 if (version == 3) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/apedec: Use 64bit to avoid overflow

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Wed Sep 29 20:53:53 2021 +0200| [2ad2da390c4c3770aff0f7617c8c2974c6656072] | 
committer: Michael Niedermayer

avcodec/apedec: Use 64bit to avoid overflow

Fixes: runtime error: signed integer overflow: 727298502 * 3 cannot be 
represented in type 'int'
Fixes: 
39172/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-638602483033702

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit f059b56195da9c0e2c11a5f7f357a3d6101e6bf0)
Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index d6a504f2bd..3bbb8c1aac 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -1309,7 +1309,7 @@ static void do_apply_filter(APEContext *ctx, int version, 
APEFilter *f,
 absres = res < 0 ? -(unsigned)res : res;
 if (absres)
 *f->adaptcoeffs = APESIGN(res) *
-  (8 << ((absres > f->avg * 3) + (absres > 
(f->avg + f->avg / 3;
+  (8 << ((absres > f->avg * 3LL) + (absres > 
(f->avg + f->avg / 3;
 /* equivalent to the following code
 if (absres <= f->avg * 4 / 3)
 *f->adaptcoeffs = APESIGN(res) * 8;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/apedec: Fix undefined integer overflow in long_filter_ehigh_3830()

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Tue Sep 28 00:11:50 2021 +0200| [134b4d85a1a18e5de7bcec5483fe8d616e8efa7a] | 
committer: Michael Niedermayer

avcodec/apedec: Fix undefined integer overflow in long_filter_ehigh_3830()

Fixes: signed integer overflow: -2145648640 - 3357696 cannot be represented in 
type 'int'
Fixes: 
38899/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5358815017566208

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit ad517ee6e44f093e28021ffd51c7eb2e1394b1a9)
Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 8bd12f2315..d6a504f2bd 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -952,7 +952,7 @@ static void long_filter_ehigh_3830(int32_t *buffer, int 
length)
 for (j = 7; j > 0; j--)
 delay[j] = delay[j - 1];
 delay[0] = buffer[i];
-buffer[i] -= dotprod >> 9;
+buffer[i] -= (unsigned)(dotprod >> 9);
 }
 }
 

___
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] avformat/wavdec: Check smv_block_size

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Mon Oct  4 23:54:46 2021 +0200| [4069494725d70082d343f6aa6bca330424932987] | 
committer: Michael Niedermayer

avformat/wavdec: Check smv_block_size

Fixes: Timeout
Fixes: 
39554/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-4915221701984256

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 849138f476f4b08656681bfc3aec5beac4fb)
Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 11763cf0ce..0e3de6e2e6 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -480,6 +480,8 @@ static int wav_read_header(AVFormatContext *s)
 wav->smv_data_ofs = avio_tell(pb) + (size - 5) * 3;
 avio_rl24(pb);
 wav->smv_block_size = avio_rl24(pb);
+if (!wav->smv_block_size)
+return AVERROR_INVALIDDATA;
 avpriv_set_pts_info(vst, 32, 1, avio_rl24(pb));
 vst->duration = avio_rl24(pb);
 avio_rl24(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] avformat/matroskadec: Reset state also on failure in matroska_reset_status()

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Thu Jun 24 19:53:47 2021 +0200| [13044f729d799132d1e3df21ee731ebc0cafbbe5] | 
committer: Michael Niedermayer

avformat/matroskadec: Reset state also on failure in matroska_reset_status()

The calling code does not handle failures and will fail with assertion failures 
later.
Seeking can always fail even when the position was previously read.

Fixes: Assertion failure
Fixes: 
35253/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-4693059982983168

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit d115eec97929e23fd1b06df2d95f48cf5000eb87)
Signed-off-by: Michael Niedermayer 

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

 libavformat/matroskadec.c | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 27ba2c8999..25e629d358 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -778,20 +778,22 @@ static int matroska_read_close(AVFormatContext *s);
 static int matroska_reset_status(MatroskaDemuxContext *matroska,
  uint32_t id, int64_t position)
 {
+int64_t err = 0;
 if (position >= 0) {
-int64_t err = avio_seek(matroska->ctx->pb, position, SEEK_SET);
-if (err < 0)
-return err;
-}
+err = avio_seek(matroska->ctx->pb, position, SEEK_SET);
+if (err > 0)
+err = 0;
+} else
+position = avio_tell(matroska->ctx->pb);
 
 matroska->current_id= id;
 matroska->num_levels= 1;
 matroska->unknown_count = 0;
-matroska->resync_pos = avio_tell(matroska->ctx->pb);
+matroska->resync_pos= position;
 if (id)
 matroska->resync_pos -= (av_log2(id) + 7) / 8;
 
-return 0;
+return err;
 }
 
 static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
@@ -1824,6 +1826,7 @@ static int 
matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska,
 uint32_t saved_id  = matroska->current_id;
 int64_t before_pos = avio_tell(matroska->ctx->pb);
 int ret = 0;
+int ret2;
 
 /* seek */
 if (avio_seek(matroska->ctx->pb, pos, SEEK_SET) == pos) {
@@ -1848,7 +1851,9 @@ static int 
matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska,
 }
 /* Seek back - notice that in all instances where this is used
  * it is safe to set the level to 1. */
-matroska_reset_status(matroska, saved_id, before_pos);
+ret2 = matroska_reset_status(matroska, saved_id, before_pos);
+if (ret >= 0)
+ret = ret2;
 
 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] Changelog: update

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/4.3 | Michael Niedermayer  | 
Wed Oct 20 23:20:01 2021 +0200| [361c4ad20bc594fc3d336e98360d31821868207d] | 
committer: Michael Niedermayer

Changelog: update

Signed-off-by: Michael Niedermayer 

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

 Changelog | 9 +
 1 file changed, 9 insertions(+)

diff --git a/Changelog b/Changelog
index 2b1c73ec20..0b342bc153 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,15 @@ Entries are sorted chronologically from oldest to youngest 
within each release,
 releases are sorted from youngest to oldest.
 
 version 4.3.3:
+ avformat/matroskadec: Reset state also on failure in matroska_reset_status()
+ avformat/wavdec: Check smv_block_size
+ avformat/rmdec: Check for multiple audio_stream_info
+ avcodec/apedec: Use 64bit to avoid overflow
+ avcodec/apedec: Fix undefined integer overflow in long_filter_ehigh_3830()
+ oavformat/avidec: Check offset in odml
+ avformat/mpegts: use actually read packet size in mpegts_resync special case
+ avfilter/scale_npp: fix non-aligned output frame dimensions
+ Update for 4.3.3
  swscale/alphablend: Fix slice handling
  avcodec/apedec: Fix integer overflow in filter_fast_3320()
  avcodec/mxpegdec: Check for AVDISCARD_ALL

___
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] Tag n2.8.18 : FFmpeg 2.8.18 release

2021-10-20 Thread git 
[ffmpeg] [branch: refs/tags/n2.8.18]
Tag:0283b13ede68db5fecc1bedc61b38e6e6f4d79f3
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=0283b13ede68db5fecc1bedc61b38e6e6f4d79f3

Tagger: Michael Niedermayer 
Date:   Thu Oct 21 00:44:22 2021 +0200

FFmpeg 2.8.18 release
___
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] Update for 2.8.18

2021-10-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Thu Oct 21 00:01:06 2021 +0200| [4679bab2feca54585aa2413d89c55ee0ad968635] | 
committer: Michael Niedermayer

Update for 2.8.18

Signed-off-by: Michael Niedermayer 

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

 RELEASE  | 2 +-
 doc/Doxyfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE b/RELEASE
index 6ece8e7d51..e8f6dcdb3a 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.8.17
+2.8.18
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 60dc3ff6cc..19a9a4407e 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME   = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 2.8.17
+PROJECT_NUMBER = 2.8.18
 
 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

___
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-web] branch master updated. 510c04b web/download: add FFmpeg 2.8.18

2021-10-20 Thread ffmpeg-git 
The branch, master has been updated
   via  510c04bb3d54abfa6fdda43ddcc319225efcfa68 (commit)
  from  9f0ae26ede4521ae9f3c683b56bd01cae358f483 (commit)


- Log -
commit 510c04bb3d54abfa6fdda43ddcc319225efcfa68
Author: Michael Niedermayer 
AuthorDate: Thu Oct 21 00:56:12 2021 +0200
Commit: Michael Niedermayer 
CommitDate: Thu Oct 21 00:56:53 2021 +0200

web/download: add FFmpeg 2.8.18

diff --git a/src/download b/src/download
index 097fde4..e3575b7 100644
--- a/src/download
+++ b/src/download
@@ -526,10 +526,10 @@ libpostproc54.  1.100
  

 
-  FFmpeg 2.8.17 "Feynman"
+  FFmpeg 2.8.18 "Feynman"
 
   
-2.8.17 was released on 2020-07-07. It is the latest stable FFmpeg release
+2.8.18 was released on 2021-10-21. It is the latest stable FFmpeg release
 from the 2.8 release branch, which was cut from master on 2015-09-05.
 Amongst lots of other changes, it includes all changes from
 ffmpeg-mt, libav master of 2015-08-28, libav 11 as of 2015-08-28.
@@ -549,19 +549,19 @@ libpostproc53.  3.100
 
   
 
-  Download 
xz tarball
-  PGP 
signature
+  Download 
xz tarball
+  PGP 
signature
  
 
-  Download bzip2 tarball
-  PGP 
signature
+  Download bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP 
signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n2.8.17;>Changelog
+  https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n2.8.18;>Changelog
   https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/2.8:/RELEASE_NOTES;>Release
 Notes
  


---

Summary of changes:
 src/download | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 

___
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] avformat/mpegts: add support for stream_type 0xd4, which is AVS3

2021-10-20 Thread Limin Wang 
ffmpeg | branch: master | Limin Wang  | Tue Aug 24 
18:39:13 2021 +0800| [5779bd5b2a9281b443a41aebad1be0b1def965ef] | committer: 
Limin Wang

avformat/mpegts: add support for stream_type 0xd4, which is AVS3

GB/T 17975.1
Information technology-Generic coding of moving pictures and associated audio
information-Part 1:Systems

Signed-off-by: Limin Wang 

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

 libavformat/mpegts.c| 1 +
 libavformat/mpegts.h| 1 +
 libavformat/mpegtsenc.c | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 44d9298b12..d8cbaa8ced 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -807,6 +807,7 @@ static const StreamType ISO_types[] = {
 { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS   },
 { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC  },
 { 0xd2, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS2   },
+{ 0xd4, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS3   },
 { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1},
 { 0 },
 };
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 910d65af8c..a48f14e768 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -130,6 +130,7 @@
 #define STREAM_TYPE_VIDEO_HEVC  0x24
 #define STREAM_TYPE_VIDEO_CAVS  0x42
 #define STREAM_TYPE_VIDEO_AVS2  0xd2
+#define STREAM_TYPE_VIDEO_AVS3  0xd4
 #define STREAM_TYPE_VIDEO_VC1   0xea
 #define STREAM_TYPE_VIDEO_DIRAC 0xd1
 
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index f3b7914175..26fb1f1841 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -369,6 +369,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream 
*st)
 case AV_CODEC_ID_AVS2:
 stream_type = STREAM_TYPE_VIDEO_AVS2;
 break;
+case AV_CODEC_ID_AVS3:
+stream_type = STREAM_TYPE_VIDEO_AVS3;
+break;
 case AV_CODEC_ID_DIRAC:
 stream_type = STREAM_TYPE_VIDEO_DIRAC;
 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] avformat/mpegtsenc: add AVSV format_identifier for AVS standard

2021-10-20 Thread Limin Wang 
ffmpeg | branch: master | Limin Wang  | Tue Aug 24 
20:22:25 2021 +0800| [44fe572371f9f00786069b3d4698611e9a34d7ee] | committer: 
Limin Wang

avformat/mpegtsenc: add AVSV format_identifier for AVS standard

Listing of Registered Identifiers:
https://smpte-ra.org/registered-mpeg-ts-ids

Signed-off-by: Limin Wang 

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

 libavformat/mpegtsenc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 26fb1f1841..184bb52f75 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -789,6 +789,9 @@ static int mpegts_write_pmt(AVFormatContext *s, 
MpegTSService *service)
 put_registration_descriptor(, MKTAG('V', 'C', '-', '1'));
 } else if (stream_type == STREAM_TYPE_VIDEO_HEVC && 
s->strict_std_compliance <= FF_COMPLIANCE_NORMAL) {
 put_registration_descriptor(, MKTAG('H', 'E', 'V', 'C'));
+} else if (stream_type == STREAM_TYPE_VIDEO_CAVS || stream_type == 
STREAM_TYPE_VIDEO_AVS2 ||
+   stream_type == STREAM_TYPE_VIDEO_AVS3) {
+put_registration_descriptor(, MKTAG('A', 'V', 'S', 'V'));
 }
 break;
 case AVMEDIA_TYPE_DATA:

___
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] avfilter/vf_showinfo: small adjustments for the HDR10+ dump

2021-10-20 Thread Limin Wang 
ffmpeg | branch: master | Limin Wang  | Wed Oct 13 
19:20:29 2021 +0800| [b22b8e5489bcd4c19ca6beecf1ec055f39cb5c59] | committer: 
Limin Wang

avfilter/vf_showinfo: small adjustments for the HDR10+ dump

summary for the adjustments:
1, remove the extra "," in the ,}
...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,}
to
...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013}

2, add "," between the } and new field
} fraction_bright_pixels
to
}, fraction_bright_pixels

3, remove the extra space between "} }"
...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,} }
to
...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,}}

Signed-off-by: Limin Wang 

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

 libavfilter/vf_showinfo.c | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index c8c7b986b5..ff438e70c6 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -221,7 +221,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, 
AVFrameSideData *sd)
 av_log(ctx, AV_LOG_INFO, "num_windows: %d, ", hdr_plus->num_windows);
 for (int w = 1; w < hdr_plus->num_windows; w++) {
 AVHDRPlusColorTransformParams *params = _plus->params[w];
-av_log(ctx, AV_LOG_INFO, "window %d { ", w);
+av_log(ctx, AV_LOG_INFO, w > 1 ? ", window %d { " : "window %d { ", w);
 av_log(ctx, AV_LOG_INFO, "window_upper_left_corner: (%5.4f,%5.4f),",
av_q2d(params->window_upper_left_corner_x),
av_q2d(params->window_upper_left_corner_y));
@@ -242,7 +242,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, 
AVFrameSideData *sd)
params->semimajor_axis_external_ellipse);
 av_log(ctx, AV_LOG_INFO, "semiminor_axis_external_ellipse: %d, ",
params->semiminor_axis_external_ellipse);
-av_log(ctx, AV_LOG_INFO, "overlap_process_option: %d}, ",
+av_log(ctx, AV_LOG_INFO, "overlap_process_option: %d}",
params->overlap_process_option);
 }
 av_log(ctx, AV_LOG_INFO, "targeted_system_display_maximum_luminance: 
%9.4f, ",
@@ -252,7 +252,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, 
AVFrameSideData *sd)
 for (int i = 0; i < 
hdr_plus->num_rows_targeted_system_display_actual_peak_luminance; i++) {
 av_log(ctx, AV_LOG_INFO, "(");
 for (int j = 0; j < 
hdr_plus->num_cols_targeted_system_display_actual_peak_luminance; j++) {
-av_log(ctx, AV_LOG_INFO, "%5.4f,",
+av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f",

av_q2d(hdr_plus->targeted_system_display_actual_peak_luminance[i][j]));
 }
 av_log(ctx, AV_LOG_INFO, ")");
@@ -264,9 +264,9 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, 
AVFrameSideData *sd)
 AVHDRPlusColorTransformParams *params = _plus->params[w];
 av_log(ctx, AV_LOG_INFO, "window %d {maxscl: {", w);
 for (int i = 0; i < 3; i++) {
-av_log(ctx, AV_LOG_INFO, "%5.4f,",av_q2d(params->maxscl[i]));
+av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : 
"%5.4f",av_q2d(params->maxscl[i]));
 }
-av_log(ctx, AV_LOG_INFO, "} average_maxrgb: %5.4f, ",
+av_log(ctx, AV_LOG_INFO, "}, average_maxrgb: %5.4f, ",
av_q2d(params->average_maxrgb));
 av_log(ctx, AV_LOG_INFO, "distribution_maxrgb: {");
 for (int i = 0; i < params->num_distribution_maxrgb_percentiles; i++) {
@@ -274,35 +274,35 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, 
AVFrameSideData *sd)
params->distribution_maxrgb[i].percentage,
av_q2d(params->distribution_maxrgb[i].percentile));
 }
-av_log(ctx, AV_LOG_INFO, "} fraction_bright_pixels: %5.4f, ",
+av_log(ctx, AV_LOG_INFO, "}, fraction_bright_pixels: %5.4f",
av_q2d(params->fraction_bright_pixels));
 if (params->tone_mapping_flag) {
-av_log(ctx, AV_LOG_INFO, "knee_point: (%5.4f,%5.4f), ", 
av_q2d(params->knee_point_x), av_q2d(params->knee_point_y));
+av_log(ctx, AV_LOG_INFO, ", knee_point: (%5.4f,%5.4f), ", 
av_q2d(params->knee_point_x), av_q2d(params->knee_point_y));
 av_log(ctx, AV_LOG_INFO, "bezier_curve_anchors: {");
 for (int i = 0; i < params->num_bezier_curve_anchors; i++) {
-av_log(ctx, AV_LOG_INFO, "%5.4f,",
+av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f",
av_q2d(params->bezier_curve_anchors[i]));
 }
-av_log(ctx, AV_LOG_INFO, "} ");
+av_log(ctx, AV_LOG_INFO, "}");
 }
 if (params->color_saturation_mapping_flag) {
-av_log(ctx, AV_LOG_INFO, "color_saturation_weight: %5.4f",
+av_log(ctx,

[FFmpeg-cvslog] avfilter/af_replaygain: use fabsf() instead of fabs()

2021-10-20 Thread Limin Wang 
ffmpeg | branch: master | Limin Wang  | Wed Oct 13 
20:23:06 2021 +0800| [32531333824a76524987c481daba43a43ef0] | committer: 
Limin Wang

avfilter/af_replaygain: use fabsf() instead of fabs()

Signed-off-by: Limin Wang 

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

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

diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c
index 4bf2763bcf..ee0312da82 100644
--- a/libavfilter/af_replaygain.c
+++ b/libavfilter/af_replaygain.c
@@ -428,7 +428,7 @@ static void butter_filter_stereo_samples(ReplayGainContext 
*s,
 // (slowing us down).
 
 for (j = -4; j < 0; ++j)
-if (fabs(hist_a[i + j]) > 1e-10 || fabs(hist_b[i + j]) > 1e-10)
+if (fabsf(hist_a[i + j]) > 1e-10f || fabsf(hist_b[i + j]) > 1e-10f)
 break;
 
 if (!j) {
@@ -477,7 +477,7 @@ static void yule_filter_stereo_samples(ReplayGainContext 
*s, const float *src,
 // (slowing us down).
 
 for (j = -20; j < 0; ++j)
-if (fabs(hist_a[i + j]) > 1e-10 || fabs(hist_b[i + j]) > 1e-10)
+if (fabsf(hist_a[i + j]) > 1e-10f || fabsf(hist_b[i + j]) > 1e-10f)
 break;
 
 if (!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] avcodec/hevc_sei: remove the duplicate check

2021-10-20 Thread Limin Wang 
ffmpeg | branch: master | Limin Wang  | Wed Oct 13 
19:06:40 2021 +0800| [0feb7c86019794ac31dec2869dae839f0ad4f0ef] | committer: 
Limin Wang

avcodec/hevc_sei: remove the duplicate check

Signed-off-by: Limin Wang 

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

 libavcodec/hevc_sei.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 29d0346287..7fd822652e 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -181,9 +181,6 @@ static int 
decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB
 {
 int ret;
 
-if (size < 3)
-   return AVERROR_INVALIDDATA;
-
 ret = ff_parse_a53_cc(>buf_ref, gb->buffer + get_bits_count(gb) / 8, 
size);
 
 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] avcodec/atsc_a53: use AVERROR_INVALIDDATA

2021-10-20 Thread Limin Wang 
ffmpeg | branch: master | Limin Wang  | Wed Oct 13 
19:37:10 2021 +0800| [cd38fbf4f7992dec59da6f76344e6e6c1826efea] | committer: 
Limin Wang

avcodec/atsc_a53: use AVERROR_INVALIDDATA

Signed-off-by: Limin Wang 

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

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

diff --git a/libavcodec/atsc_a53.c b/libavcodec/atsc_a53.c
index 2d89ef50b9..29ec71bc5f 100644
--- a/libavcodec/atsc_a53.c
+++ b/libavcodec/atsc_a53.c
@@ -73,7 +73,7 @@ int ff_parse_a53_cc(AVBufferRef **pbuf, const uint8_t *data, 
int size)
 int ret, cc_count;
 
 if (size < 3)
-return AVERROR(EINVAL);
+return AVERROR_INVALIDDATA;
 
 ret = init_get_bits8(, data, size);
 if (ret < 0)
@@ -95,12 +95,12 @@ int ff_parse_a53_cc(AVBufferRef **pbuf, const uint8_t 
*data, int size)
 
 /* 3 bytes per CC plus one byte marker_bits at the end */
 if (cc_count * 3 >= (get_bits_left() >> 3))
-return AVERROR(EINVAL);
+return AVERROR_INVALIDDATA;
 
 new_size = (old_size + cc_count * 3);
 
 if (new_size > INT_MAX)
-return AVERROR(EINVAL);
+return AVERROR_INVALIDDATA;
 
 /* Allow merging of the cc data from two fields. */
 ret = av_buffer_realloc(pbuf, new_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] avfilter/vf_v360: make reset_rot option not lose its value

2021-10-20 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Wed Oct 20 14:40:30 
2021 +0200| [960efa94ff817d3c0761ce7414ddd632cfe7ed74] | committer: Paul B Mahol

avfilter/vf_v360: make reset_rot option not lose its value

Unless -1 value is provided then rotation is reset single time.

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

 libavfilter/vf_v360.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c
index ed25e1f07d..c252a2057a 100644
--- a/libavfilter/vf_v360.c
+++ b/libavfilter/vf_v360.c
@@ -164,7 +164,7 @@ static const AVOption v360_options[] = {
 {"iv_fov", "input vertical field of view",  OFFSET(iv_fov), 
AV_OPT_TYPE_FLOAT,  {.dbl=0.f},   0.f,   360.f,TFLAGS, 
"iv_fov"},
 {"id_fov", "input diagonal field of view",  OFFSET(id_fov), 
AV_OPT_TYPE_FLOAT,  {.dbl=0.f},   0.f,   360.f,TFLAGS, 
"id_fov"},
 {"alpha_mask", "build mask in alpha plane",  OFFSET(alpha), 
AV_OPT_TYPE_BOOL,   {.i64=0},   0,   1, FLAGS, 
"alpha"},
-{ "reset_rot", "reset rotation", OFFSET(reset_rot), 
AV_OPT_TYPE_BOOL,   {.i64=0},   0,   1,TFLAGS, 
"reset_rot"},
+{ "reset_rot", "reset rotation", OFFSET(reset_rot), 
AV_OPT_TYPE_BOOL,   {.i64=0},  -1,   1,TFLAGS, 
"reset_rot"},
 { NULL }
 };
 
@@ -4962,7 +4962,8 @@ static int process_command(AVFilterContext *ctx, const 
char *cmd, const char *ar
 int ret;
 
 s->yaw = s->pitch = s->roll = 0.f;
-s->reset_rot = 0;
+if (s->reset_rot < 0)
+s->reset_rot = 0;
 
 ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
 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".