[FFmpeg-cvslog] lavc/videotoolboxenc: Get the encoder supported properties
Jun Zhao
git at videolan.org
Fri Sep 15 16:34:12 EEST 2023
ffmpeg | branch: master | Jun Zhao <mypopydev at gmail.com> | Mon Sep 4 10:48:01 2023 +0800| [5c635b7d8c7c4a7fe0c93b5b3cefff3c72bff237] | committer: Jun Zhao
lavc/videotoolboxenc: Get the encoder supported properties
Get the encoder supported properties list, it will be used for
feature support checks.
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c635b7d8c7c4a7fe0c93b5b3cefff3c72bff237
---
libavcodec/videotoolboxenc.c | 72 ++++++++++++++++++++++++++++++--------------
1 file changed, 49 insertions(+), 23 deletions(-)
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 2e96990741..1d1595329a 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -232,6 +232,7 @@ typedef struct VTEncContext {
AVClass *class;
enum AVCodecID codec_id;
VTCompressionSessionRef session;
+ CFDictionaryRef supported_props;
CFStringRef ycbcr_matrix;
CFStringRef color_primaries;
CFStringRef transfer_function;
@@ -321,6 +322,34 @@ static void clear_frame_queue(VTEncContext *vtctx)
set_async_error(vtctx, 0);
}
+static void vtenc_reset(VTEncContext *vtctx)
+{
+ if (vtctx->session) {
+ CFRelease(vtctx->session);
+ vtctx->session = NULL;
+ }
+
+ if (vtctx->supported_props) {
+ CFRelease(vtctx->supported_props);
+ vtctx->supported_props = NULL;
+ }
+
+ if (vtctx->color_primaries) {
+ CFRelease(vtctx->color_primaries);
+ vtctx->color_primaries = NULL;
+ }
+
+ if (vtctx->transfer_function) {
+ CFRelease(vtctx->transfer_function);
+ vtctx->transfer_function = NULL;
+ }
+
+ if (vtctx->ycbcr_matrix) {
+ CFRelease(vtctx->ycbcr_matrix);
+ vtctx->ycbcr_matrix = NULL;
+ }
+}
+
static int vtenc_q_pop(VTEncContext *vtctx, bool wait, CMSampleBufferRef *buf, ExtraSEI **sei)
{
BufNode *info;
@@ -1110,6 +1139,22 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
return AVERROR_EXTERNAL;
}
+#if defined (MAC_OS_X_VERSION_10_13) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13)
+ if (__builtin_available(macOS 10.13, *)) {
+ status = VTCopySupportedPropertyDictionaryForEncoder(avctx->width,
+ avctx->height,
+ codec_type,
+ enc_info,
+ NULL,
+ &vtctx->supported_props);
+
+ if (status != noErr) {
+ av_log(avctx, AV_LOG_ERROR,"Error retrieving the supported property dictionary err=%"PRId64"\n", (int64_t)status);
+ return AVERROR_EXTERNAL;
+ }
+ }
+#endif
+
// Dump the init encoder
{
CFStringRef encoderID = NULL;
@@ -1662,7 +1707,6 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
// It can happen when user set avctx->profile directly.
if (vtctx->profile == AV_PROFILE_UNKNOWN)
vtctx->profile = avctx->profile;
- vtctx->session = NULL;
status = vtenc_configure_encoder(avctx);
if (status) return status;
@@ -2431,8 +2475,8 @@ static int create_cv_pixel_buffer(AVCodecContext *avctx,
vtstatus = VTCompressionSessionPrepareToEncodeFrames(vtctx->session);
if (vtstatus == kVTInvalidSessionErr) {
- CFRelease(vtctx->session);
- vtctx->session = NULL;
+ vtenc_reset(vtctx);
+
status = vtenc_configure_encoder(avctx);
if (status == 0)
pix_buf_pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
@@ -2688,10 +2732,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
pe_cleanup:
CVPixelBufferRelease(pix_buf);
- if(vtctx->session)
- CFRelease(vtctx->session);
-
- vtctx->session = NULL;
+ vtenc_reset(vtctx);
vtctx->frame_ct_out = 0;
av_assert0(status != 0 || (avctx->extradata && avctx->extradata_size > 0));
@@ -2714,23 +2755,8 @@ static av_cold int vtenc_close(AVCodecContext *avctx)
clear_frame_queue(vtctx);
pthread_cond_destroy(&vtctx->cv_sample_sent);
pthread_mutex_destroy(&vtctx->lock);
- CFRelease(vtctx->session);
- vtctx->session = NULL;
-
- if (vtctx->color_primaries) {
- CFRelease(vtctx->color_primaries);
- vtctx->color_primaries = NULL;
- }
- if (vtctx->transfer_function) {
- CFRelease(vtctx->transfer_function);
- vtctx->transfer_function = NULL;
- }
-
- if (vtctx->ycbcr_matrix) {
- CFRelease(vtctx->ycbcr_matrix);
- vtctx->ycbcr_matrix = NULL;
- }
+ vtenc_reset(vtctx);
return 0;
}
More information about the ffmpeg-cvslog
mailing list