virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/videotoolboxenc: use common routine for pixfmt conversion

Browse Source
This commit is contained in:
rcombs
2021-12-16 17:19:33 -06:00
parent 131dbb9a7a
commit 028a6ed1a1
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/videotoolboxenc.c
View File

@@ -29,6 +29,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/hwcontext_videotoolbox.h"
#include "internal.h" #include "internal.h"
#include <pthread.h> #include <pthread.h>
#include "atsc_a53.h" #include "atsc_a53.h"
@@ -797,25 +798,9 @@ static int get_cv_pixel_format(AVCodecContext* avctx,
range != AVCOL_RANGE_JPEG; range != AVCOL_RANGE_JPEG;
//MPEG range is used when no range is set //MPEG range is used when no range is set
if (fmt == AV_PIX_FMT_NV12) { *av_pixel_format = av_map_videotoolbox_format_from_pixfmt2(fmt, range == AVCOL_RANGE_JPEG);
*av_pixel_format = range == AVCOL_RANGE_JPEG ?
kCVPixelFormatType_420YpCbCr8BiPlanarFullRange :
kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
} else if (fmt == AV_PIX_FMT_YUV420P) {
*av_pixel_format = range == AVCOL_RANGE_JPEG ?
kCVPixelFormatType_420YpCbCr8PlanarFullRange :
kCVPixelFormatType_420YpCbCr8Planar;
} else if (fmt == AV_PIX_FMT_BGRA) {
*av_pixel_format = kCVPixelFormatType_32BGRA;
} else if (fmt == AV_PIX_FMT_P010LE) {
*av_pixel_format = range == AVCOL_RANGE_JPEG ?
kCVPixelFormatType_420YpCbCr10BiPlanarFullRange :
kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
} else {
return AVERROR(EINVAL);
}
return 0; return *av_pixel_format ? 0 : AVERROR(EINVAL);
} }
static void add_color_attr(AVCodecContext *avctx, CFMutableDictionaryRef dict) { static void add_color_attr(AVCodecContext *avctx, CFMutableDictionaryRef dict) {