Browse Source

lavc/qsv: make function qsv_map_fourcc() can be called externally

Signed-off-by: Zhong Li <zhong.li@intel.com>
tags/n4.3
Zhong Li 6 years ago
parent
commit
f3dfd34f27
2 changed files with 4 additions and 2 deletions
  1. +2
    -2
      libavcodec/qsv.c
  2. +2
    -0
      libavcodec/qsv_internal.h

+ 2
- 2
libavcodec/qsv.c View File

@@ -207,7 +207,7 @@ int ff_qsv_print_warning(void *log_ctx, mfxStatus err,
return ret; return ret;
} }


static enum AVPixelFormat qsv_map_fourcc(uint32_t fourcc)
enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc)
{ {
switch (fourcc) { switch (fourcc) {
case MFX_FOURCC_NV12: return AV_PIX_FMT_NV12; case MFX_FOURCC_NV12: return AV_PIX_FMT_NV12;
@@ -518,7 +518,7 @@ static mfxStatus qsv_frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
frames_hwctx = frames_ctx->hwctx; frames_hwctx = frames_ctx->hwctx;


frames_ctx->format = AV_PIX_FMT_QSV; frames_ctx->format = AV_PIX_FMT_QSV;
frames_ctx->sw_format = qsv_map_fourcc(i->FourCC);
frames_ctx->sw_format = ff_qsv_map_fourcc(i->FourCC);
frames_ctx->width = i->Width; frames_ctx->width = i->Width;
frames_ctx->height = i->Height; frames_ctx->height = i->Height;
frames_ctx->initial_pool_size = req->NumFrameSuggested; frames_ctx->initial_pool_size = req->NumFrameSuggested;


+ 2
- 0
libavcodec/qsv_internal.h View File

@@ -92,6 +92,8 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id);
int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile); int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile);
int ff_qsv_level_to_mfx(enum AVCodecID codec_id, int level); int ff_qsv_level_to_mfx(enum AVCodecID codec_id, int level);


enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc);

int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc); int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc);
enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type); enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type);




Loading…
Cancel
Save