[FFmpeg-cvslog] avformat/wvenc: Make init function out of write_header
ffmpeg | branch: master | Andreas Rheinhardt |
Sat Dec 18 11:57:56 2021 +0100| [16b1df7541f81512b7869525c8ca596e24a49eae] |
committer: Andreas Rheinhardt
avformat/wvenc: Make init function out of write_header
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16b1df7541f81512b7869525c8ca596e24a49eae
---
libavformat/wvenc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/wvenc.c b/libavformat/wvenc.c
index 9a42f71440..0dca2f7996 100644
--- a/libavformat/wvenc.c
+++ b/libavformat/wvenc.c
@@ -30,7 +30,7 @@ typedef struct WvMuxContext {
int64_t samples;
} WvMuxContext;
-static av_cold int wv_write_header(AVFormatContext *ctx)
+static av_cold int wv_init(AVFormatContext *ctx)
{
if (ctx->nb_streams > 1 ||
ctx->streams[0]->codecpar->codec_id != AV_CODEC_ID_WAVPACK) {
@@ -84,7 +84,7 @@ const AVOutputFormat ff_wv_muxer = {
.priv_data_size= sizeof(WvMuxContext),
.audio_codec = AV_CODEC_ID_WAVPACK,
.video_codec = AV_CODEC_ID_NONE,
-.write_header = wv_write_header,
+.init = wv_init,
.write_packet = wv_write_packet,
.write_trailer = wv_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
___
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/crcenc: Make init function out of write_header
ffmpeg | branch: master | Andreas Rheinhardt |
Sat Dec 18 11:56:19 2021 +0100| [ba27e248cf5a817e13e4f22f08f6dd8a23da536c] |
committer: Andreas Rheinhardt
avformat/crcenc: Make init function out of write_header
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba27e248cf5a817e13e4f22f08f6dd8a23da536c
---
libavformat/crcenc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c
index c58fbd6c88..9f40dd4ec0 100644
--- a/libavformat/crcenc.c
+++ b/libavformat/crcenc.c
@@ -28,7 +28,7 @@ typedef struct CRCState {
uint32_t crcval;
} CRCState;
-static int crc_write_header(struct AVFormatContext *s)
+static int crc_init(struct AVFormatContext *s)
{
CRCState *crc = s->priv_data;
@@ -60,7 +60,7 @@ const AVOutputFormat ff_crc_muxer = {
.priv_data_size= sizeof(CRCState),
.audio_codec = AV_CODEC_ID_PCM_S16LE,
.video_codec = AV_CODEC_ID_RAWVIDEO,
-.write_header = crc_write_header,
+.init = crc_init,
.write_packet = crc_write_packet,
.write_trailer = crc_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] MAINTAINERS: Add Haihao Xiang for qsv
ffmpeg | branch: master | Zhong Li | Tue Jun 8 22:11:34 2021 +0800| [c47896536ce7fe480242c61ba5ca404648db6c00] | committer: Zhong Li MAINTAINERS: Add Haihao Xiang for qsv Signed-off-by: Zhong Li > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c47896536ce7fe480242c61ba5ca404648db6c00 --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index dcac46003e..39ce91b755 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -226,7 +226,7 @@ Codecs: ptx.c Ivo van Poorten qcelp*Reynaldo H. Verdejo Pinochet qdm2.c, qdm2data.hRoberto Togni - qsv* Mark Thompson, Zhong Li + qsv* Mark Thompson, Zhong Li, Haihao Xiang qtrle.c Mike Melanson ra144.c, ra144.h, ra288.c, ra288.hRoberto Togni resample2.c Michael Niedermayer ___ 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] build: add .metal to vpath to fix build error
ffmpeg | branch: master | Zhao Zhili | Mon Dec 20 17:09:08 2021 +0800| [3c56b9c597565affdb97316fec11afb4cb5f1f00] | committer: Aman Karmani build: add .metal to vpath to fix build error Signed-off-by: Aman Karmani > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c56b9c597565affdb97316fec11afb4cb5f1f00 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5b20658b52..5479554683 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ vpath %.v$(SRC_PATH) vpath %.texi $(SRC_PATH) vpath %.cu $(SRC_PATH) vpath %.ptx $(SRC_PATH) +vpath %.metal $(SRC_PATH) vpath %/fate_config.sh.template $(SRC_PATH) TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch ___ 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] build: simplify rules for metal
ffmpeg | branch: master | Zhao Zhili | Mon Dec 20 17:09:09 2021 +0800| [35420ab7fd76bdcf43a2f671c39a2555a5fba488] | committer: Aman Karmani build: simplify rules for metal Signed-off-by: Aman Karmani > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35420ab7fd76bdcf43a2f671c39a2555a5fba488 --- ffbuild/common.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index e79b509425..c13148f476 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -113,13 +113,13 @@ $(BIN2CEXE): ffbuild/bin2c_host.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) %.metal.air: %.metal - $(METALCC) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ + $(METALCC) $< -o $@ %.metallib: %.metal.air - $(METALLIB) --split-module-without-linking $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ + $(METALLIB) --split-module-without-linking $< -o $@ %.metallib.c: %.metallib $(BIN2CEXE) - $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) + $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) %.ptx: %.cu $(SRC_PATH)/compat/cuda/cuda_runtime.h $(COMPILE_NVCC) ___ 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] avutil/display: fix inverted doc
ffmpeg | branch: master | Zhao Zhili | Sun Dec 12 17:26:03 2021 +0800| [278068dc60d8737341d73e58f508d01ff883876c] | committer: Andreas Rheinhardt avutil/display: fix inverted doc Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=278068dc60d8737341d73e58f508d01ff883876c --- doc/APIchanges | 5 + libavutil/display.h | 2 +- libavutil/version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 17aa664ca3..93fc45ced4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,11 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-12-20 - xx - lavu 57.11.101 - display.h + Modified the documentation of av_display_rotation_set() + to match its longstanding actual behaviour of treating + the angle as directed clockwise. + 2021-12-xx - xx - lavf 59.10.100 - avformat.h Add AVFormatContext io_close2 which returns an int diff --git a/libavutil/display.h b/libavutil/display.h index 515adad795..d87bf68425 100644 --- a/libavutil/display.h +++ b/libavutil/display.h @@ -88,7 +88,7 @@ double av_display_rotation_get(const int32_t matrix[9]); /** - * Initialize a transformation matrix describing a pure counterclockwise + * Initialize a transformation matrix describing a pure clockwise * rotation by the specified angle (in degrees). * * @param matrix an allocated transformation matrix (will be fully overwritten diff --git a/libavutil/version.h b/libavutil/version.h index 0e7b36865a..678401fcf5 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 57 #define LIBAVUTIL_VERSION_MINOR 11 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_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] MAINTAINERS: Add Haihao Xiang for vaapi
ffmpeg | branch: master | U. Artie Eoff | Mon Dec 13 20:08:06 2021 -0800| [cde2efb5dac2358c919229015d18629ca739b602] | committer: Philip Langdale MAINTAINERS: Add Haihao Xiang for vaapi Current listed maintainers for vaapi plugin are not reponsive and/or currently active in the ffmpeg community. Thus, vaapi plugin patches (and qsv plugin) have generally gone ignored or lost in the ether for too long. Remove Gwenole Beauchesne from vaapi maintainer who has not been active since 2016. Current alternative maintainer for vaapi is Mark Thompson whom has not been active since March/April 2021. Therefore, add Haihao Xiang to vaapi maintainer who's primary role is FFmpeg development with a focus on the vaapi and qsv plugins. Haihao has over a decade of media experience and many years of FFmpeg development experience, amongst other media frameworks. The additional patch for adding Haihao as qsv plugin maintainer has been submitted previously: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20210608141134.27448-1-zhongli_...@126.com/ This will help FFmpeg to continue to be the leading multimedia framework by allowing these plugins to be actively improved, enhanced, and maintained for existing and future HW platforms. Signed-off-by: U. Artie Eoff > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde2efb5dac2358c919229015d18629ca739b602 --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 39ce91b755..50ee5efecc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -274,8 +274,8 @@ Hardware acceleration: dxva2*Hendrik Leppkes, Laurent Aimar, Steve Lhomme d3d11va* Steve Lhomme mediacodec* Matthieu Bouron, Aman Gupta - vaapi*Gwenole Beauchesne - vaapi_encode* Mark Thompson + vaapi*Haihao Xiang + vaapi_encode* Mark Thompson, Haihao Xiang vdpau*Philip Langdale, Carl Eugen Hoyos videotoolbox* Rick Kern, Aman Gupta ___ 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] checkasm: Use the correct AVTXContext in av_tx tests
ffmpeg | branch: master | Henrik Gramner | Mon Dec 20
23:52:44 2021 +0100| [15cfb4eee316a1d6a0764f4460409f0258fd94cb] | committer:
Henrik Gramner
checkasm: Use the correct AVTXContext in av_tx tests
Keep a reference to the correct associated context of the reference
function and use that context when calling the reference function.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15cfb4eee316a1d6a0764f4460409f0258fd94cb
---
tests/checkasm/av_tx.c | 35 +++
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/tests/checkasm/av_tx.c b/tests/checkasm/av_tx.c
index 178fb61972..9d3823e8ed 100644
--- a/tests/checkasm/av_tx.c
+++ b/tests/checkasm/av_tx.c
@@ -22,6 +22,8 @@
#include "checkasm.h"
+#include
+
#define EPS 0.5
#define SCALE_NOOP(x) (x)
@@ -41,6 +43,16 @@ static const int check_lens[] = {
2, 4, 8, 16, 32, 64, 1024, 16384,
};
+static AVTXContext *tx_refs[6 /*AVTXType*/][FF_ARRAY_ELEMS(check_lens)];
+static int init = 0;
+
+static void free_tx_refs(void)
+{
+for (int i = 0; i < FF_ARRAY_ELEMS(tx_refs); i++)
+for (int j = 0; j < FF_ARRAY_ELEMS(*tx_refs); j++)
+av_tx_uninit(&tx_refs[i][j]);
+}
+
#define CHECK_TEMPLATE(PREFIX, TYPE, DATA_TYPE, SCALE, LENGTHS,
CHECK_EXPRESSION) \
do {
\
int err;
\
@@ -59,24 +71,26 @@ static const int check_lens[] = {
}
\
\
if (check_func(fn, PREFIX "_%i", len)) {
\
+AVTXContext *tx_ref = tx_refs[TYPE][i];
\
+if (!tx_ref)
\
+tx_ref = tx;
\
num_checks++;
\
last_check = len;
\
-call_ref(tx, out_ref, in, sizeof(DATA_TYPE));
\
-call_new(tx, out_new, in, sizeof(DATA_TYPE));
\
+call_ref(tx_ref, out_ref, in, sizeof(DATA_TYPE));
\
+call_new(tx, out_new, in, sizeof(DATA_TYPE));
\
if (CHECK_EXPRESSION) {
\
fail();
\
+av_tx_uninit(&tx);
\
break;
\
}
\
bench_new(tx, out_new, in, sizeof(DATA_TYPE));
\
+av_tx_uninit(&tx_refs[TYPE][i]);
\
+tx_refs[TYPE][i] = tx;
\
+} else {
\
+av_tx_uninit(&tx);
\
}
\
-
\
-av_tx_uninit(&tx);
\
-fn = NULL;
\
}
\
\
-av_tx_uninit(&tx);
\
-fn = NULL;
\
-
\
if (num_checks == 1)
\
report(PREFIX "_%i", last_check);
\
else if (num_checks)
\
@@ -105,4 +119,9 @@ void checkasm_check_av_tx(void)
av_free(in);
av_free(out_ref);
av_free(out_new);
+
+if (!init) {
+init = 1;
+atexit(free_tx_refs);
+}
}
___
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/mvdec: explicitly set duration
ffmpeg | branch: master | John-Paul Stewart |
Sat Dec 18 15:46:28 2021 -0500| [50bfd5e96e98e86df08cc7ffdf726f6ed6851ee7] |
committer: Peter Ross
avformat/mvdec: explicitly set duration
Resolves a warning that duration is being innaccurately estimated based
on bitrate.
Signed-off-by: John-Paul Stewart
Reviewed-by: Peter Ross
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50bfd5e96e98e86df08cc7ffdf726f6ed6851ee7
---
libavformat/mvdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index a5c5b205a6..1a5012e507 100644
--- a/libavformat/mvdec.c
+++ b/libavformat/mvdec.c
@@ -319,7 +319,7 @@ static int mv_read_header(AVFormatContext *avctx)
avio_skip(pb, 4);
vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
vst->avg_frame_rate = fps;
-vst->nb_frames = avio_rb32(pb);
+vst->duration = vst->nb_frames = avio_rb32(pb);
v = avio_rb32(pb);
switch (v) {
case 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] avformat/mvdec: read frame rate from data stream
ffmpeg | branch: master | John-Paul Stewart |
Sat Dec 18 15:46:27 2021 -0500| [3c9ffbd009243b3e83ba20956ff6401918376073] |
committer: Peter Ross
avformat/mvdec: read frame rate from data stream
Prior to this patch, for version 2 of the file format the frame rate was
hard-coded at 15 fps. This uses the 64-bit floating-point value from
the data stream, similar to what is already done for version 3 of the
file format (around line 206).
Signed-off-by: John-Paul Stewart
Reviewed-by: Peter Ross
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c9ffbd009243b3e83ba20956ff6401918376073
---
libavformat/mvdec.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index 5d184f20a4..a5c5b205a6 100644
--- a/libavformat/mvdec.c
+++ b/libavformat/mvdec.c
@@ -26,6 +26,7 @@
#include "libavutil/channel_layout.h"
#include "libavutil/eval.h"
+#include "libavutil/intfloat.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/rational.h"
@@ -300,8 +301,9 @@ static int mv_read_header(AVFormatContext *avctx)
uint64_t timestamp;
int v;
uint32_t bytes_per_sample;
+AVRational fps;
-avio_skip(pb, 22);
+avio_skip(pb, 10);
/* allocate audio track first to prevent unnecessary seeking
* (audio packet always precede video packet for a given frame) */
@@ -312,9 +314,11 @@ static int mv_read_header(AVFormatContext *avctx)
vst = avformat_new_stream(avctx, NULL);
if (!vst)
return AVERROR(ENOMEM);
-avpriv_set_pts_info(vst, 64, 1, 15);
+fps = av_d2q(av_int2double(avio_rb64(pb)), INT_MAX);
+avpriv_set_pts_info(vst, 64, fps.den, fps.num);
+avio_skip(pb, 4);
vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
-vst->avg_frame_rate= av_inv_q(vst->time_base);
+vst->avg_frame_rate = fps;
vst->nb_frames = avio_rb32(pb);
v = avio_rb32(pb);
switch (v) {
___
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/libx264: Don't unnecessarily add in-band extradata
ffmpeg | branch: master | Andreas Rheinhardt | Mon Dec 20 18:08:36 2021 +0100| [155dcfe2e20b5a934310dd7561383b2c978c382d] | committer: Andreas Rheinhardt avcodec/libx264: Don't unnecessarily add in-band extradata The check here is meant to check for whether avcintra-class option (default value -1) has been set; yet it checks for the x264_param_t value where 0 is the default value (treated as "no avcintra-mode" by x264). This meant that in-band extradata has been added unnecessarily when using global headers; furthermore, the first output packet had two x264 SEIs. Reviewed-by: Limin Wang Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=155dcfe2e20b5a934310dd7561383b2c978c382d --- libavcodec/libx264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5f62c7b1d8..2b680abf21 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -944,7 +944,7 @@ static av_cold int X264_init(AVCodecContext *avctx) #if X264_BUILD >= 142 /* Separate headers not supported in AVC-Intra mode */ -if (x4->params.i_avcintra_class >= 0) +if (x4->avcintra_class >= 0) x4->params.b_repeat_headers = 1; #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".
