Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'

[ffmpeg] / libavcodec / qsv_internal.h

diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 3cd8f1872b2deb5f529a20060b698332d7f971aa..394c55888314ebd39ba87713267b5ad5078157d1 100644 (file)
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -1,20 +1,20 @@
 /*
  * Intel MediaSDK QSV encoder/decoder shared code
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -32,6 +32,8 @@
 
 #define ASYNC_DEPTH_DEFAULT 4       // internal parallelism
 
+#define QSV_MAX_ENC_PAYLOAD 2       // # of mfxEncodeCtrl payloads supported
+
 #define QSV_VERSION_ATLEAST(MAJOR, MINOR)   \
     (MFX_VERSION_MAJOR > (MAJOR) ||         \
      MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
@@ -52,6 +54,7 @@ typedef struct QSVMid {
 typedef struct QSVFrame {
     AVFrame *frame;
     mfxFrameSurface1 surface;
+    mfxEncodeCtrl enc_ctrl;
     mfxExtDecodedFrameInfo dec_info;
     mfxExtBuffer *ext_param;
 
@@ -75,7 +78,7 @@ typedef struct QSVFramesContext {
 } QSVFramesContext;
 
 /**
- * Convert a libmfx error code into a libav error code.
+ * Convert a libmfx error code into an ffmpeg error code.
  */
 int ff_qsv_map_error(mfxStatus mfx_err, const char **desc);