MPCVideoDec: улучшена поддержка FFV1 RGB высокой разрядности.

Обновлен custom_code/ffmpeg.txt.
Aleksoid1978 · Jul 8, 2024 · b89eafa · b89eafa
1 parent 4d24827
commit b89eafa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/custom_code/ffmpeg.txt b/docs/custom_code/ffmpeg.txt
@@ -19,6 +19,8 @@
 * libavcodec/dxva2.c
 * libavcodec/dxva2_hevc.c
 * libavcodec/dxva2_internal.h
+* libavcodec/ffv1.h
+* libavcodec/ffv1dec.c
 * libavcodec/h264_refs.c
 * libavcodec/h264_slice.c
 * libavcodec/h264dec.c

diff --git a/src/filters/transform/MPCVideoDec/ffmpegContext.cpp b/src/filters/transform/MPCVideoDec/ffmpegContext.cpp
@@ -305,7 +305,12 @@ void FillAVCodecProps(struct AVCodecContext* pAVCtx, BITMAPINFOHEADER* pBMI)
 						}
 					}
 					else if (f->colorspace == 1) {
-						pAVCtx->pix_fmt = AV_PIX_FMT_RGBA; // and other RGB formats, but it is not important here
+						if (pAVCtx->bits_per_raw_sample <= 8) {
+							pAVCtx->pix_fmt = AV_PIX_FMT_RGBA;
+						}
+						else {
+							pAVCtx->pix_fmt = AV_PIX_FMT_RGB48;
+						}
 					}
 				}
 			}