diff options
| -rw-r--r-- | src/Makefile.sources | 12 | ||||
| -rw-r--r-- | src/i965_avc_const_def.c (renamed from src/gen9_avc_const_def.c) | 2 | ||||
| -rw-r--r-- | src/i965_avc_const_def.h (renamed from src/gen9_avc_const_def.h) | 6 | ||||
| -rw-r--r-- | src/i965_avc_encoder.c (renamed from src/gen9_avc_encoder.c) | 6 | ||||
| -rw-r--r-- | src/i965_avc_encoder.h (renamed from src/gen9_avc_encoder.h) | 6 | ||||
| -rw-r--r-- | src/i965_avc_encoder_common.h | 2 | ||||
| -rw-r--r-- | src/i965_avc_encoder_kernels.c (renamed from src/gen9_avc_encoder_kernels.c) | 2 | ||||
| -rw-r--r-- | src/i965_avc_encoder_kernels.h (renamed from src/gen9_avc_encoder_kernels.h) | 6 |
8 files changed, 21 insertions, 21 deletions
diff --git a/src/Makefile.sources b/src/Makefile.sources index 6eab78cc..00e799c3 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -58,10 +58,10 @@ source_c = \ gen9_vp9_encoder.c \ intel_common_vpp_internal.c \ i965_encoder_const_def.c \ - gen9_avc_const_def.c \ - gen9_avc_encoder_kernels.c \ + i965_avc_const_def.c \ + i965_avc_encoder_kernels.c \ i965_avc_encoder_common.c \ - gen9_avc_encoder.c \ + i965_avc_encoder.c \ gen9_hevc_enc_kernels_binary.c \ gen9_hevc_encoder.c \ gen9_hevc_enc_utils.c \ @@ -123,9 +123,9 @@ source_h = \ intel_common_vpp_internal.h \ i965_encoder_common.h \ i965_encoder_api.h \ - gen9_avc_const_def.h \ - gen9_avc_encoder_kernels.h \ - gen9_avc_encoder.h \ + i965_avc_const_def.h \ + i965_avc_encoder_kernels.h \ + i965_avc_encoder.h \ i965_avc_encoder_common.h \ gen9_hevc_enc_const_def.h \ gen9_hevc_enc_kernels.h \ diff --git a/src/gen9_avc_const_def.c b/src/i965_avc_const_def.c index 4811f769..88f60a13 100644 --- a/src/gen9_avc_const_def.c +++ b/src/i965_avc_const_def.c @@ -28,7 +28,7 @@ */ -#include "gen9_avc_const_def.h" +#include "i965_avc_const_def.h" /* Gen9 */ /* diff --git a/src/gen9_avc_const_def.h b/src/i965_avc_const_def.h index 873b5309..13c8c2e1 100644 --- a/src/gen9_avc_const_def.h +++ b/src/i965_avc_const_def.h @@ -27,8 +27,8 @@ * */ -#ifndef GEN9_AVC_const_DEF_H -#define GEN9_AVC_const_DEF_H +#ifndef I965_AVC_const_DEF_H +#define I965_AVC_const_DEF_H #include <stdio.h> #include <stdlib.h> @@ -147,4 +147,4 @@ extern const unsigned int gen8_avc_mbenc_curbe_normal_p_frame_init_data[GEN8_AVC extern const unsigned int gen8_avc_mbenc_curbe_normal_b_frame_init_data[GEN8_AVC_MBENC_CURBE_SIZE]; extern const unsigned int gen8_avc_me_curbe_init_data[GEN8_AVC_ME_CURBE_SIZE]; extern const unsigned short gen8_avc_ref_cost[3][64]; -#endif //GEN9_AVC_const_DEF_H +#endif //I965_AVC_const_DEF_H diff --git a/src/gen9_avc_encoder.c b/src/i965_avc_encoder.c index 59581105..3da68318 100644 --- a/src/gen9_avc_encoder.c +++ b/src/i965_avc_encoder.c @@ -48,9 +48,9 @@ #include "i965_gpe_utils.h" #include "i965_encoder_common.h" #include "i965_avc_encoder_common.h" -#include "gen9_avc_encoder_kernels.h" -#include "gen9_avc_encoder.h" -#include "gen9_avc_const_def.h" +#include "i965_avc_encoder_kernels.h" +#include "i965_avc_encoder.h" +#include "i965_avc_const_def.h" #define MAX_URB_SIZE 4096 /* In register */ #define NUM_KERNELS_PER_GPE_CONTEXT 1 diff --git a/src/gen9_avc_encoder.h b/src/i965_avc_encoder.h index 00e6f460..d08db913 100644 --- a/src/gen9_avc_encoder.h +++ b/src/i965_avc_encoder.h @@ -26,8 +26,8 @@ * */ -#ifndef GEN9_AVC_ENCODER_H -#define GEN9_AVC_ENCODER_H +#ifndef I965_AVC_ENCODER_H +#define I965_AVC_ENCODER_H #include "i965_encoder_common.h" /* @@ -4932,4 +4932,4 @@ typedef enum _gen8_avc_binding_table_offset_me { GEN8_AVC_ME_NUM_SURFACES_CM = 27 } gen8_avc_binding_table_offset_me; -#endif /* GEN9_AVC_ENCODER_H */ +#endif /* I965_AVC_ENCODER_H */ diff --git a/src/i965_avc_encoder_common.h b/src/i965_avc_encoder_common.h index 1377f442..e768a603 100644 --- a/src/i965_avc_encoder_common.h +++ b/src/i965_avc_encoder_common.h @@ -35,7 +35,7 @@ #include <stdint.h> #include <assert.h> #include "intel_driver.h" -#include "gen9_avc_encoder.h" +#include "i965_avc_encoder.h" // SubMbPartMask defined in CURBE for AVC ENC #define INTEL_AVC_DISABLE_4X4_SUB_MB_PARTITION 0x40 diff --git a/src/gen9_avc_encoder_kernels.c b/src/i965_avc_encoder_kernels.c index 7a284e19..79e3b219 100644 --- a/src/gen9_avc_encoder_kernels.c +++ b/src/i965_avc_encoder_kernels.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "gen9_avc_encoder_kernels.h" +#include "i965_avc_encoder_kernels.h" const unsigned int skl_avc_encoder_kernels[] = { 0x0000001b, 0x00000088, 0x000010c8, 0x00008948, 0x00012588, 0x000135c8, 0x0001ae48, 0x00024a88, diff --git a/src/gen9_avc_encoder_kernels.h b/src/i965_avc_encoder_kernels.h index 75c216c7..f7be54e0 100644 --- a/src/gen9_avc_encoder_kernels.h +++ b/src/i965_avc_encoder_kernels.h @@ -27,8 +27,8 @@ * */ -#ifndef _GEN9_AVC_ENCODER_KERNELS_H -#define _GEN9_AVC_ENCODER_KERNELS_H +#ifndef _I965_AVC_ENCODER_KERNELS_H +#define _I965_AVC_ENCODER_KERNELS_H #define AVC_ENC_SKL_SZ 96346 extern const unsigned int skl_avc_encoder_kernels[AVC_ENC_SKL_SZ]; @@ -41,4 +41,4 @@ extern const unsigned int kbl_avc_encoder_kernels[AVC_ENC_KBL_SZ]; #define AVC_ENC_BDW_SZ 95532 extern const unsigned int bdw_avc_encoder_kernels[AVC_ENC_BDW_SZ]; -#endif//_GEN9_AVC_ENCODER_KERNELS_H +#endif//_I965_AVC_ENCODER_KERNELS_H |