[FFmpeg-cvslog] avcodec/error_resilience: Constify ThreadFrame*

2023-10-12 Thread Andreas Rheinhardt 
ffmpeg | branch: master | Andreas Rheinhardt  | 
Thu Sep 21 09:48:14 2023 +0200| [a7663c96044e51b48dd877f0ca4530bc36ba709a] | 
committer: Andreas Rheinhardt

avcodec/error_resilience: Constify ThreadFrame*

Forgotten in 0eb399ac3953da16f880a1e455bb009a45f76d49.
While just at it, also use a forward declaration.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Rheinhardt 

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

 libavcodec/error_resilience.h | 3 +--
 libavcodec/h264dec.h  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h
index b03f8ec896..1346639c3c 100644
--- a/libavcodec/error_resilience.h
+++ b/libavcodec/error_resilience.h
@@ -24,7 +24,6 @@
 
 #include "avcodec.h"
 #include "me_cmp.h"
-#include "threadframe.h"
 
 ///< current MB is the first after a resync marker
 #define VP_START   1
@@ -40,7 +39,7 @@
 
 typedef struct ERPicture {
 AVFrame *f;
-ThreadFrame *tf;
+const struct ThreadFrame *tf;
 
 // it is the caller's responsibility to allocate these buffers
 int16_t (*motion_val[2])[2];
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index b4ea0ed880..0009b539e7 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -43,6 +43,7 @@
 #include "h264qpel.h"
 #include "h274.h"
 #include "mpegutils.h"
+#include "threadframe.h"
 #include "videodsp.h"
 
 #define H264_MAX_PICTURE_COUNT 36

___
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/nvdec_hevc: fail to initialize on unsupported profiles

2023-10-12 Thread Timo Rothenpieler 
ffmpeg | branch: release/6.0 | Timo Rothenpieler  | Tue 
Oct 10 17:34:47 2023 +0200| [c5039e158d20e85d4d8a2dee3160533d627b839a] | 
committer: Timo Rothenpieler

avcodec/nvdec_hevc: fail to initialize on unsupported profiles

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

 libavcodec/nvdec_hevc.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/nvdec_hevc.c b/libavcodec/nvdec_hevc.c
index cd549d2ef6..1ab1c39d75 100644
--- a/libavcodec/nvdec_hevc.c
+++ b/libavcodec/nvdec_hevc.c
@@ -305,6 +305,15 @@ static int nvdec_hevc_frame_params(AVCodecContext *avctx,
 static int nvdec_hevc_decode_init(AVCodecContext *avctx) {
 NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
 ctx->supports_444 = 1;
+
+if (avctx->profile != FF_PROFILE_HEVC_MAIN &&
+avctx->profile != FF_PROFILE_HEVC_MAIN_10 &&
+avctx->profile != FF_PROFILE_HEVC_MAIN_STILL_PICTURE &&
+avctx->profile != FF_PROFILE_HEVC_REXT) {
+av_log(avctx, AV_LOG_ERROR, "Unsupported HEVC profile: %d\n", 
avctx->profile);
+return AVERROR(ENOTSUP);
+}
+
 return ff_nvdec_decode_init(avctx);
 }
 

___
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/nvdec_hevc: fail to initialize on unsupported profiles

2023-10-12 Thread Timo Rothenpieler 
ffmpeg | branch: master | Timo Rothenpieler  | Tue Oct 
10 17:34:47 2023 +0200| [68f9dfa5cc2e876207ca38affbbdaa0d6714d654] | committer: 
Timo Rothenpieler

avcodec/nvdec_hevc: fail to initialize on unsupported profiles

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

 libavcodec/nvdec_hevc.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/nvdec_hevc.c b/libavcodec/nvdec_hevc.c
index 91fb9f5384..b83d5edcf9 100644
--- a/libavcodec/nvdec_hevc.c
+++ b/libavcodec/nvdec_hevc.c
@@ -306,6 +306,15 @@ static int nvdec_hevc_frame_params(AVCodecContext *avctx,
 static int nvdec_hevc_decode_init(AVCodecContext *avctx) {
 NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
 ctx->supports_444 = 1;
+
+if (avctx->profile != AV_PROFILE_HEVC_MAIN &&
+avctx->profile != AV_PROFILE_HEVC_MAIN_10 &&
+avctx->profile != AV_PROFILE_HEVC_MAIN_STILL_PICTURE &&
+avctx->profile != AV_PROFILE_HEVC_REXT) {
+av_log(avctx, AV_LOG_ERROR, "Unsupported HEVC profile: %d\n", 
avctx->profile);
+return AVERROR(ENOTSUP);
+}
+
 return ff_nvdec_decode_init(avctx);
 }
 

___
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/libvmaf: update pix_fmts

2023-10-12 Thread Kyle Swanson 
ffmpeg | branch: master | Kyle Swanson  | Tue Oct 10 
12:55:53 2023 -0700| [2e33f5ced0c9ae2c2d9d6aa1a5535ae637d48ce7] | committer: 
Kyle Swanson

avfilter/libvmaf: update pix_fmts

Signed-off-by: Kyle Swanson 

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

 libavfilter/vf_libvmaf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
index 18196c6734..2b1fc8bb23 100644
--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -463,6 +463,8 @@ static av_cold int init(AVFilterContext *ctx)
 static const enum AVPixelFormat pix_fmts[] = {
 AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
 AV_PIX_FMT_YUV444P10LE, AV_PIX_FMT_YUV422P10LE, AV_PIX_FMT_YUV420P10LE,
+AV_PIX_FMT_YUV444P12LE, AV_PIX_FMT_YUV422P12LE, AV_PIX_FMT_YUV420P12LE,
+AV_PIX_FMT_YUV444P16LE, AV_PIX_FMT_YUV422P16LE, AV_PIX_FMT_YUV420P16LE,
 AV_PIX_FMT_NONE
 };
 

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