[FFmpeg-cvslog] lavc:libsvtav1: Update SVT-AV1 new repo

2021-07-10 Thread Jun Zhao
ffmpeg | branch: master | Jun Zhao  | Sun Jul  4 
00:45:53 2021 +0800| [7bd7377ddbad959e7f77681e8cc990561406f04f] | committer: 
Jun Zhao

lavc:libsvtav1: Update SVT-AV1 new repo

SVT-AV1 moved the repo from github to gitlab.

Signed-off-by: Jun Zhao 

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

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

diff --git a/doc/general_contents.texi b/doc/general_contents.texi
index 354899ad17..f3f4feab70 100644
--- a/doc/general_contents.texi
+++ b/doc/general_contents.texi
@@ -263,7 +263,7 @@ to @file{./configure}.
 
 FFmpeg can make use of the Scalable Video Technology for AV1 library for AV1 
encoding.
 
-Go to @url{https://github.com/OpenVisualCloud/SVT-AV1/} and follow the 
instructions
+Go to @url{https://gitlab.com/AOMediaCodec/SVT-AV1/} and follow the 
instructions
 for installing the library. Then pass @code{--enable-libsvtav1} to configure to
 enable it.
 

___
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/udp: fix check for pthread_cond_wait return value

2021-07-10 Thread Zhao Zhili
ffmpeg | branch: master | Zhao Zhili  | Mon Jun 21 
22:32:49 2021 +0800| [30ca9980ffb885bfdf433302e5338021eef578fe] | committer: 
Jun Zhao

avformat/udp: fix check for pthread_cond_wait return value

POSIX errno is positive. We have strict_pthread_cond_wait to handle
error code during development.

Signed-off-by: zhilizhao 
Reviewed-by: Jun Zhao 

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

 libavformat/udp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 9b9d3de197..bbe5aecc46 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -550,9 +550,7 @@ static void *circular_buffer_task_tx( void *_URLContext)
 while (len<4) {
 if (s->close_req)
 goto end;
-if (pthread_cond_wait(&s->cond, &s->mutex) < 0) {
-goto end;
-}
+pthread_cond_wait(&s->cond, &s->mutex);
 len = av_fifo_size(s->fifo);
 }
 

___
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: add option recast_media

2021-07-10 Thread Gyan Doshi
ffmpeg | branch: master | Gyan Doshi  | Fri Jul  2 15:48:21 
2021 +0530| [79ebdbb9b9da0a86b277e3f85981196c781af398] | committer: Gyan Doshi

ffmpeg: add option recast_media

Allows forcing decoders of different media type.
Needed to decode media data muxed as data streams.

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

 doc/ffmpeg.texi  | 5 +
 fftools/ffmpeg_opt.c | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 7827291755..b27b9fe2c4 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -449,6 +449,11 @@ output file already exists.
 Set number of times input stream shall be looped. Loop 0 means no loop,
 loop -1 means infinite loop.
 
+@item -recast_media (@emph{global})
+Allow forcing a decoder of a different media type than the one
+detected or designated by the demuxer. Useful for decoding media
+data muxed as data streams.
+
 @item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
 @itemx -codec[:@var{stream_specifier}] @var{codec} 
(@emph{input/output,per-stream})
 Select an encoder (when used before an output file) or a decoder (when used
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index a63bed54cf..cb7d6ceefc 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -186,6 +186,7 @@ static int input_sync;
 static int input_stream_potentially_available = 0;
 static int ignore_unknown_streams = 0;
 static int copy_unknown_streams = 0;
+static int recast_media = 0;
 static int find_stream_info = 1;
 
 static void uninit_options(OptionsContext *o)
@@ -759,7 +760,7 @@ static const AVCodec *find_codec_or_die(const char *name, 
enum AVMediaType type,
 av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
 exit_program(1);
 }
-if (codec->type != type) {
+if (codec->type != type && !recast_media) {
 av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, 
name);
 exit_program(1);
 }
@@ -774,6 +775,8 @@ static const AVCodec *choose_decoder(OptionsContext *o, 
AVFormatContext *s, AVSt
 if (codec_name) {
 const AVCodec *codec = find_codec_or_die(codec_name, 
st->codecpar->codec_type, 0);
 st->codecpar->codec_id = codec->id;
+if (recast_media && st->codecpar->codec_type != codec->type)
+st->codecpar->codec_type = codec->type;
 return codec;
 } else
 return avcodec_find_decoder(st->codecpar->codec_id);
@@ -3429,6 +3432,8 @@ const OptionDef options[] = {
 "Ignore unknown stream types" },
 { "copy_unknown",   OPT_BOOL | OPT_EXPERT,   { 
 ©_unknown_streams },
 "Copy unknown stream types" },
+{ "recast_media",   OPT_BOOL | OPT_EXPERT,   { 
 &recast_media },
+"allow recasting stream type in order to force a decoder of different 
media type" },
 { "c",  HAS_ARG | OPT_STRING | OPT_SPEC |
 OPT_INPUT | OPT_OUTPUT,  { .off
   = OFFSET(codec_names) },
 "codec name", "codec" },

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