From ade7c1a2326e2bb9be5e60a48b9968eb1d16bfaf Mon Sep 17 00:00:00 2001
From: wm4 <nfxjfg@googlemail.com>
Date: Fri, 24 Feb 2017 10:17:34 +0100
Subject: [PATCH] avcodec/videotoolbox: allow not setting the
kCVPixelBufferPixelFormatTypeKey
If AVVideotoolboxContext.cv_pix_fmt_type is set to 0, don't set the
kCVPixelBufferPixelFormatTypeKey value on the VT decoder.
This makes VT output its native format, which can be much faster on
some hardware iterations (if the native format does not match with
the requested format, it will be converted, which is slow).
The default is still forcing nv12.
---
doc/APIchanges | 4 ++++
libavcodec/version.h | 2 +-
libavcodec/videotoolbox.c | 3 ++-
libavcodec/videotoolbox.h | 3 ++-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index cd5f926b15b..6922ea5268f 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,10 @@ libavutil: 2015-08-28
API changes, most recent first:
+2017-03-02 - xxxxxxx - lavc 57.81.104 - videotoolbox.h
+ AVVideotoolboxContext.cv_pix_fmt_type can now be set to 0 to output the
+ native decoder format. (The default value is not changed.)
+
2017-03-02 - xxxxxxx - lavu 55.47.101, lavc 57.81.102, lavf 57.66.103
Remove requirement to use AVOption or accessors to access certain fields
in AVFrame, AVCodecContext, and AVFormatContext that were previously
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3b4c2531466..5d8b22cb29a 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 81
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MICRO 103
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index 1288aa50873..2ebe60fb5c0 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -472,7 +472,8 @@ static CFDictionaryRef videotoolbox_buffer_attributes_create(int width,
&kCFTypeDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks);
- CFDictionarySetValue(buffer_attributes, kCVPixelBufferPixelFormatTypeKey, cv_pix_fmt);
+ if (pix_fmt)
+ CFDictionarySetValue(buffer_attributes, kCVPixelBufferPixelFormatTypeKey, cv_pix_fmt);
CFDictionarySetValue(buffer_attributes, kCVPixelBufferIOSurfacePropertiesKey, io_surface_properties);
CFDictionarySetValue(buffer_attributes, kCVPixelBufferWidthKey, w);
CFDictionarySetValue(buffer_attributes, kCVPixelBufferHeightKey, h);
diff --git a/libavcodec/videotoolbox.h b/libavcodec/videotoolbox.h
index a48638e2b22..af2db0d5809 100644
--- a/libavcodec/videotoolbox.h
+++ b/libavcodec/videotoolbox.h
@@ -58,7 +58,8 @@ typedef struct AVVideotoolboxContext {
/**
* CVPixelBuffer Format Type that Videotoolbox will use for decoded frames.
- * set by the caller.
+ * set by the caller. If this is set to 0, then no specific format is
+ * requested from the decoder, and its native format is output.
*/
OSType cv_pix_fmt_type;
--
GitLab