The branch, master has been updated
via 551e964e8ab1bc0712f279d64e86b4e65ec90200 (commit)
via d4031984db95aac88d3060f4b13e570de1533a3f (commit)
via 7049df14c83a89e2d32eb138feeb692170d24dc5 (commit)
via 0da15c93c8411f435b37ab7d504a650ee881cb0f (commit)
from f283750ba83d1bfb80d3c6f1d1c0639f161dd885 (commit)
- Log -----------------------------------------------------------------
commit 551e964e8ab1bc0712f279d64e86b4e65ec90200
Author: Zhao Zhili <[email protected]>
AuthorDate: Tue Nov 18 19:17:08 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Nov 20 00:56:12 2025 +0800
avcodec/videotoolboxenc: remove redundant "Error: " in error message
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 47367bb68e..63e93b9d10 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -667,7 +667,7 @@ static int copy_param_sets(
next_offset = offset + sizeof(start_code) + ps_size;
if (dst_size < next_offset) {
- av_log(avctx, AV_LOG_ERROR, "Error: buffer too small for parameter
sets.\n");
+ av_log(avctx, AV_LOG_ERROR, "Buffer too small for parameter
sets.\n");
return AVERROR_BUFFER_TOO_SMALL;
}
@@ -1205,7 +1205,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
session);
if (status || !vtctx->session) {
- av_log(avctx, AV_LOG_ERROR, "Error: cannot create compression session:
%d\n", status);
+ av_log(avctx, AV_LOG_ERROR, "Cannot create compression session: %d\n",
status);
#if !TARGET_OS_IPHONE
if (!vtctx->allow_sw) {
@@ -1241,7 +1241,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
return status;
if (avctx->flags & AV_CODEC_FLAG_QSCALE && !vtenc_qscale_enabled()) {
- av_log(avctx, AV_LOG_ERROR, "Error: -q:v qscale not available for
encoder. Use -b:v bitrate instead.\n");
+ av_log(avctx, AV_LOG_ERROR, "-q:v qscale not available for encoder.
Use -b:v bitrate instead.\n");
return AVERROR_EXTERNAL;
}
@@ -1269,7 +1269,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
compat_keys.kVTCompressionPropertyKey_ConstantBitRate,
bit_rate_num);
if (status == kVTPropertyNotSupportedErr) {
- av_log(avctx, AV_LOG_ERROR, "Error: -constant_bit_rate true is
not supported by the encoder.\n");
+ av_log(avctx, AV_LOG_ERROR, "-constant_bit_rate true is not
supported by the encoder.\n");
return AVERROR_EXTERNAL;
}
} else {
@@ -1625,7 +1625,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
status = VTCompressionSessionPrepareToEncodeFrames(vtctx->session);
if (status) {
- av_log(avctx, AV_LOG_ERROR, "Error: cannot prepare encoder: %d\n",
status);
+ av_log(avctx, AV_LOG_ERROR, "Cannot prepare encoder: %d\n", status);
return AVERROR_EXTERNAL;
}
@@ -1644,7 +1644,7 @@ static int vtenc_configure_encoder(AVCodecContext *avctx)
codec_type = get_cm_codec_type(avctx, vtctx->profile,
vtctx->alpha_quality);
if (!codec_type) {
- av_log(avctx, AV_LOG_ERROR, "Error: no mapping for AVCodecID %d\n",
avctx->codec_id);
+ av_log(avctx, AV_LOG_ERROR, "No mapping for AVCodecID %d\n",
avctx->codec_id);
return AVERROR(EINVAL);
}
@@ -2513,7 +2513,7 @@ static int vtenc_send_frame(AVCodecContext *avctx,
);
if (status) {
- av_log(avctx, AV_LOG_ERROR, "Error: cannot encode frame: %d\n",
status);
+ av_log(avctx, AV_LOG_ERROR, "Cannot encode frame: %d\n", status);
status = AVERROR_EXTERNAL;
// Not necessary, just in case new code put after here
goto out;
commit d4031984db95aac88d3060f4b13e570de1533a3f
Author: Zhao Zhili <[email protected]>
AuthorDate: Tue Nov 18 15:23:16 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Nov 20 00:56:12 2025 +0800
avcodec/videotoolboxenc: reorder and cleanup headers
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index ef32c81278..47367bb68e 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -18,29 +18,28 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <VideoToolbox/VideoToolbox.h>
-#include <CoreVideo/CoreVideo.h>
+#include <Availability.h>
#include <CoreMedia/CoreMedia.h>
+#include <CoreVideo/CoreVideo.h>
+#include <dlfcn.h>
+#include <pthread.h>
#include <TargetConditionals.h>
-#include <Availability.h>
-#include "avcodec.h"
-#include "libavutil/mem.h"
-#include "libavutil/opt.h"
+#include <VideoToolbox/VideoToolbox.h>
+
#include "libavutil/avassert.h"
-#include "libavutil/avstring.h"
#include "libavutil/imgutils.h"
-#include "libavcodec/avcodec.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/hwcontext_videotoolbox.h"
-#include "codec_internal.h"
-#include "internal.h"
-#include <pthread.h>
+
#include "atsc_a53.h"
+#include "codec_internal.h"
#include "encode.h"
#include "h264.h"
#include "h264_sei.h"
#include "hwconfig.h"
-#include <dlfcn.h>
+#include "internal.h"
#if !HAVE_KCMVIDEOCODECTYPE_HEVC
enum { kCMVideoCodecType_HEVC = 'hvc1' };
commit 7049df14c83a89e2d32eb138feeb692170d24dc5
Author: Zhao Zhili <[email protected]>
AuthorDate: Tue Nov 18 11:02:59 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Nov 20 00:56:05 2025 +0800
avcodec/videotoolboxenc: fix crash with negative linesize
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index c9c4014a6b..ef32c81278 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -28,6 +28,7 @@
#include "libavutil/opt.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
+#include "libavutil/imgutils.h"
#include "libavcodec/avcodec.h"
#include "libavutil/pixdesc.h"
#include "libavutil/hwcontext_videotoolbox.h"
@@ -2328,89 +2329,20 @@ static int vtenc_cm_to_avpacket(
return 0;
}
-/*
- * contiguous_buf_size is 0 if not contiguous, and the size of the buffer
- * containing all planes if so.
- */
-static int get_cv_pixel_info(
- AVCodecContext *avctx,
- const AVFrame *frame,
- int *color,
- int *plane_count,
- size_t *widths,
- size_t *heights,
- size_t *strides,
- size_t *contiguous_buf_size)
-{
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
- VTEncContext *vtctx = avctx->priv_data;
- int av_format = frame->format;
- int av_color_range = avctx->color_range;
- int i;
- int range_guessed;
- int status;
-
- if (!desc)
- return AVERROR(EINVAL);
-
- status = get_cv_pixel_format(avctx, av_format, av_color_range, color,
&range_guessed);
- if (status)
- return status;
-
- if (range_guessed) {
- if (!vtctx->warned_color_range) {
- vtctx->warned_color_range = true;
- av_log(avctx,
- AV_LOG_WARNING,
- "Color range not set for %s. Using MPEG range.\n",
- av_get_pix_fmt_name(av_format));
- }
- }
-
- *plane_count = av_pix_fmt_count_planes(avctx->pix_fmt);
-
- for (i = 0; i < desc->nb_components; i++) {
- int p = desc->comp[i].plane;
- bool hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA);
- bool isAlpha = hasAlpha && (p + 1 == *plane_count);
- bool isChroma = (p != 0) && !isAlpha;
- int shiftw = isChroma ? desc->log2_chroma_w : 0;
- int shifth = isChroma ? desc->log2_chroma_h : 0;
- widths[p] = (avctx->width + ((1 << shiftw) >> 1)) >> shiftw;
- heights[p] = (avctx->height + ((1 << shifth) >> 1)) >> shifth;
- strides[p] = frame->linesize[p];
- }
-
- *contiguous_buf_size = 0;
- for (i = 0; i < *plane_count; i++) {
- if (i < *plane_count - 1 &&
- frame->data[i] + strides[i] * heights[i] != frame->data[i + 1]) {
- *contiguous_buf_size = 0;
- break;
- }
-
- *contiguous_buf_size += strides[i] * heights[i];
- }
-
- return 0;
-}
-
-//Not used on OSX - frame is never copied.
static int copy_avframe_to_pixel_buffer(AVCodecContext *avctx,
const AVFrame *frame,
- CVPixelBufferRef cv_img,
- const size_t *plane_strides,
- const size_t *plane_rows)
+ CVPixelBufferRef cv_img)
{
- int i, j;
- size_t plane_count;
int status;
- int rows;
- int src_stride;
- int dst_stride;
- uint8_t *src_addr;
- uint8_t *dst_addr;
- size_t copy_bytes;
+
+ int num_planes = av_pix_fmt_count_planes(frame->format);
+ size_t num_cv_plane = CVPixelBufferIsPlanar(cv_img) ?
+ CVPixelBufferGetPlaneCount(cv_img) : 1;
+ if (num_planes != num_cv_plane) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Different number of planes in AVFrame and CVPixelBuffer.\n");
+ return AVERROR_BUG;
+ }
status = CVPixelBufferLockBaseAddress(cv_img, 0);
if (status) {
@@ -2418,62 +2350,14 @@ static int copy_avframe_to_pixel_buffer(AVCodecContext
*avctx,
return AVERROR_EXTERNAL;
}
- if (CVPixelBufferIsPlanar(cv_img)) {
- plane_count = CVPixelBufferGetPlaneCount(cv_img);
- for (i = 0; frame->data[i]; i++) {
- if (i == plane_count) {
- CVPixelBufferUnlockBaseAddress(cv_img, 0);
- av_log(avctx,
- AV_LOG_ERROR,
- "Error: different number of planes in AVFrame and
CVPixelBuffer.\n"
- );
-
- return AVERROR_EXTERNAL;
- }
-
- dst_addr = (uint8_t*)CVPixelBufferGetBaseAddressOfPlane(cv_img, i);
- src_addr = (uint8_t*)frame->data[i];
- dst_stride = CVPixelBufferGetBytesPerRowOfPlane(cv_img, i);
- src_stride = plane_strides[i];
- rows = plane_rows[i];
-
- if (dst_stride == src_stride) {
- memcpy(dst_addr, src_addr, src_stride * rows);
- } else {
- copy_bytes = dst_stride < src_stride ? dst_stride : src_stride;
-
- for (j = 0; j < rows; j++) {
- memcpy(dst_addr + j * dst_stride, src_addr + j *
src_stride, copy_bytes);
- }
- }
- }
- } else {
- if (frame->data[1]) {
- CVPixelBufferUnlockBaseAddress(cv_img, 0);
- av_log(avctx,
- AV_LOG_ERROR,
- "Error: different number of planes in AVFrame and non-planar
CVPixelBuffer.\n"
- );
-
- return AVERROR_EXTERNAL;
- }
-
- dst_addr = (uint8_t*)CVPixelBufferGetBaseAddress(cv_img);
- src_addr = (uint8_t*)frame->data[0];
- dst_stride = CVPixelBufferGetBytesPerRow(cv_img);
- src_stride = plane_strides[0];
- rows = plane_rows[0];
-
- if (dst_stride == src_stride) {
- memcpy(dst_addr, src_addr, src_stride * rows);
- } else {
- copy_bytes = dst_stride < src_stride ? dst_stride : src_stride;
-
- for (j = 0; j < rows; j++) {
- memcpy(dst_addr + j * dst_stride, src_addr + j * src_stride,
copy_bytes);
- }
- }
+ int dst_stride[4] = {0};
+ uint8_t *dst_addr[4] = {0};
+ for (int i = 0; i < num_planes; i++) {
+ dst_addr[i] = (uint8_t*)CVPixelBufferGetBaseAddressOfPlane(cv_img, i);
+ dst_stride[i] = CVPixelBufferGetBytesPerRowOfPlane(cv_img, i);
}
+ av_image_copy2(dst_addr, dst_stride, frame->data, frame->linesize,
+ frame->format, frame->width, frame->height);
status = CVPixelBufferUnlockBaseAddress(cv_img, 0);
if (status) {
@@ -2489,13 +2373,7 @@ static int create_cv_pixel_buffer(AVCodecContext
*avctx,
CVPixelBufferRef *cv_img,
BufNode *node)
{
- int plane_count;
- int color;
- size_t widths [AV_NUM_DATA_POINTERS];
- size_t heights[AV_NUM_DATA_POINTERS];
- size_t strides[AV_NUM_DATA_POINTERS];
int status;
- size_t contiguous_buf_size;
CVPixelBufferPoolRef pix_buf_pool;
VTEncContext* vtctx = avctx->priv_data;
@@ -2515,33 +2393,21 @@ static int create_cv_pixel_buffer(AVCodecContext
*avctx,
return 0;
}
- memset(widths, 0, sizeof(widths));
- memset(heights, 0, sizeof(heights));
- memset(strides, 0, sizeof(strides));
-
- status = get_cv_pixel_info(
- avctx,
- frame,
- &color,
- &plane_count,
- widths,
- heights,
- strides,
- &contiguous_buf_size
- );
-
+ int range_guessed;
+ status = get_cv_pixel_format(avctx, frame->format, avctx->color_range,
+ &(int) {0}, &range_guessed);
if (status) {
- av_log(
- avctx,
- AV_LOG_ERROR,
- "Error: Cannot convert format %d color_range %d: %d\n",
- frame->format,
- frame->color_range,
- status
- );
-
+ av_log(avctx, AV_LOG_ERROR, "Cannot convert format %d color_range %d:
%d\n",
+ frame->format, frame->color_range, status);
return status;
}
+ if (range_guessed) {
+ if (!vtctx->warned_color_range) {
+ vtctx->warned_color_range = true;
+ av_log(avctx, AV_LOG_WARNING, "Color range not set for %s. Using
MPEG range.\n",
+ av_get_pix_fmt_name(frame->format));
+ }
+ }
pix_buf_pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
if (!pix_buf_pool) {
@@ -2578,7 +2444,7 @@ static int create_cv_pixel_buffer(AVCodecContext *avctx,
return AVERROR_EXTERNAL;
}
- status = copy_avframe_to_pixel_buffer(avctx, frame, *cv_img, strides,
heights);
+ status = copy_avframe_to_pixel_buffer(avctx, frame, *cv_img);
if (status) {
CFRelease(*cv_img);
*cv_img = NULL;
commit 0da15c93c8411f435b37ab7d504a650ee881cb0f
Author: Zhao Zhili <[email protected]>
AuthorDate: Tue Nov 18 12:46:13 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Nov 20 00:55:32 2025 +0800
avcodec/videotoolboxenc: improve Lock/Unlock BaseAddress error handling
1. Fix continue after CVPixelBufferLockBaseAddress.
2. Remove redundant "Error: " in error message.
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 729072c0b9..c9c4014a6b 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -2414,12 +2414,8 @@ static int copy_avframe_to_pixel_buffer(AVCodecContext
*avctx,
status = CVPixelBufferLockBaseAddress(cv_img, 0);
if (status) {
- av_log(
- avctx,
- AV_LOG_ERROR,
- "Error: Could not lock base address of CVPixelBuffer: %d.\n",
- status
- );
+ av_log(avctx, AV_LOG_ERROR, "Could not lock base address of
CVPixelBuffer: %d.\n", status);
+ return AVERROR_EXTERNAL;
}
if (CVPixelBufferIsPlanar(cv_img)) {
@@ -2481,7 +2477,7 @@ static int copy_avframe_to_pixel_buffer(AVCodecContext
*avctx,
status = CVPixelBufferUnlockBaseAddress(cv_img, 0);
if (status) {
- av_log(avctx, AV_LOG_ERROR, "Error: Could not unlock CVPixelBuffer
base address: %d.\n", status);
+ av_log(avctx, AV_LOG_ERROR, "Could not unlock CVPixelBuffer base
address: %d.\n", status);
return AVERROR_EXTERNAL;
}
-----------------------------------------------------------------------
Summary of changes:
libavcodec/videotoolboxenc.c | 241 +++++++++----------------------------------
1 file changed, 51 insertions(+), 190 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
