shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

CHROMIUM: [media] rockchip-vpu: rename rk3288-vpu sources to rockchip-vpu

Browse Source 
Change-Id: I66ba2cde8984e56ffa3a27515e4e6380af8544d8
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
This commit is contained in:
Jeffy Chen
2016-06-01 16:43:23 +08:00
committed by Huang, Tao
parent f0092d3a09
commit 28641dc3b5
12 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/rockchip-vpu/Makefile
View File

@@ -1,10 +1,10 @@
obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu.o
rockchip-vpu-y += rk3288_vpu.o \
rk3288_vpu_dec.o \
rk3288_vpu_enc.o \
rk3288_vpu_hw.o \
rockchip-vpu-y += rockchip_vpu.o \
rockchip_vpu_dec.o \
rockchip_vpu_enc.o \
rockchip_vpu_hw.o \
rk3288_vpu_hw_h264d.o \
rk3288_vpu_hw_vp8d.o \
rk3288_vpu_hw_vp8e.o

4
drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_h264d.c
View File

@@ -18,12 +18,12 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#include <linux/types.h>
#include <linux/sort.h>
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_hw.h"
#include "rk3288_vpu_regs.h"
/* Max. number of DPB pictures supported by hardware. */

4
drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8d.c
View File

@@ -17,9 +17,9 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_hw.h"
#include "rk3288_vpu_regs.h"
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#define DEC_8190_ALIGN_MASK 0x07U

4
drivers/media/platform/rockchip-vpu/rk3288_vpu_hw_vp8e.c
View File

@@ -18,13 +18,13 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#include <linux/types.h>
#include <linux/sort.h>
#include "rk3288_vpu_regs.h"
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_hw.h"
/* Various parameters specific to VP8 encoder. */
#define VP8_CABAC_CTX_OFFSET 192

12
drivers/media/platform/rockchip-vpu/rk3288_vpu.c → drivers/media/platform/rockchip-vpu/rockchip_vpu.c
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Google, Inc.
* Tomasz Figa <tfiga@chromium.org>
@@ -18,7 +18,7 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#include <linux/module.h>
#include <linux/platform_device.h>
@@ -31,9 +31,9 @@
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-contig.h>
#include "rk3288_vpu_dec.h"
#include "rk3288_vpu_enc.h"
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_dec.h"
#include "rockchip_vpu_enc.h"
#include "rockchip_vpu_hw.h"
int debug;
module_param(debug, int, S_IRUGO | S_IWUSR);
@@ -821,4 +821,4 @@ module_platform_driver(rk3288_vpu_driver);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Alpha Lin <Alpha.Lin@Rock-Chips.com>");
MODULE_AUTHOR("Tomasz Figa <tfiga@chromium.org>");
MODULE_DESCRIPTION("Rockchip RK3288 VPU codec driver");
MODULE_DESCRIPTION("Rockchip VPU codec driver");

10
drivers/media/platform/rockchip-vpu/rk3288_vpu_common.h → drivers/media/platform/rockchip-vpu/rockchip_vpu_common.h
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Google, Inc.
* Tomasz Figa <tfiga@chromium.org>
@@ -18,8 +18,8 @@
* GNU General Public License for more details.
*/
#ifndef RK3288_VPU_COMMON_H_
#define RK3288_VPU_COMMON_H_
#ifndef ROCKCHIP_VPU_COMMON_H_
#define ROCKCHIP_VPU_COMMON_H_
/* Enable debugging by default for now. */
#define DEBUG
@@ -34,7 +34,7 @@
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-contig.h>
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_hw.h"
#define RK3288_VPU_NAME "rk3288-vpu"
#define RK3288_VPU_DEC_NAME "rk3288-vpu-dec"
@@ -518,4 +518,4 @@ static inline u32 vdpu_read(struct rk3288_vpu_dev *vpu, u32 reg)
return val;
}
#endif /* RK3288_VPU_COMMON_H_ */
#endif /* ROCKCHIP_VPU_COMMON_H_ */

8
drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.c → drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.c
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Rockchip Electronics Co., Ltd.
* Hertz Wong <hertz.wong@rock-chips.com>
@@ -21,7 +21,7 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#include <linux/module.h>
#include <linux/version.h>
@@ -32,8 +32,8 @@
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-sg.h>
#include "rk3288_vpu_dec.h"
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_dec.h"
#include "rockchip_vpu_hw.h"
#define DEF_SRC_FMT_DEC V4L2_PIX_FMT_H264_SLICE
#define DEF_DST_FMT_DEC V4L2_PIX_FMT_NV12

8
drivers/media/platform/rockchip-vpu/rk3288_vpu_dec.h → drivers/media/platform/rockchip-vpu/rockchip_vpu_dec.h
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Rockchip Electronics Co., Ltd.
* Hertz Wong <hertz.wong@rock-chips.com>
@@ -21,8 +21,8 @@
* GNU General Public License for more details.
*/
#ifndef RK3288_VPU_DEC_H_
#define RK3288_VPU_DEC_H_
#ifndef ROCKCHIP_VPU_DEC_H_
#define ROCKCHIP_VPU_DEC_H_
struct vb2_ops *get_dec_queue_ops(void);
const struct v4l2_ioctl_ops *get_dec_v4l2_ioctl_ops(void);
@@ -30,4 +30,4 @@ struct rk3288_vpu_fmt *get_dec_def_fmt(bool src);
int rk3288_vpu_dec_init(struct rk3288_vpu_ctx *ctx);
void rk3288_vpu_dec_exit(struct rk3288_vpu_ctx *ctx);
#endif /* RK3288_VPU_DEC_H_ */
#endif /* ROCKCHIP_VPU_DEC_H_ */

8
drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.c → drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.c
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Rockchip Electronics Co., Ltd.
* Alpha Lin <Alpha.Lin@rock-chips.com>
@@ -22,7 +22,7 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#include <linux/clk.h>
#include <linux/interrupt.h>
@@ -38,8 +38,8 @@
#include <media/videobuf2-core.h>
#include <media/videobuf2-dma-sg.h>
#include "rk3288_vpu_enc.h"
#include "rk3288_vpu_hw.h"
#include "rockchip_vpu_enc.h"
#include "rockchip_vpu_hw.h"
#define DEF_SRC_FMT_ENC V4L2_PIX_FMT_NV12
#define DEF_DST_FMT_ENC V4L2_PIX_FMT_VP8

8
drivers/media/platform/rockchip-vpu/rk3288_vpu_enc.h → drivers/media/platform/rockchip-vpu/rockchip_vpu_enc.h
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (c) 2014 Rockchip Electronics Co., Ltd.
* Alpha Lin <Alpha.Lin@rock-chips.com>
@@ -22,8 +22,8 @@
* GNU General Public License for more details.
*/
#ifndef RK3288_VPU_ENC_H_
#define RK3288_VPU_ENC_H_
#ifndef ROCKCHIP_VPU_ENC_H_
#define ROCKCHIP_VPU_ENC_H_
struct vb2_ops *get_enc_queue_ops(void);
const struct v4l2_ioctl_ops *get_enc_v4l2_ioctl_ops(void);
@@ -33,4 +33,4 @@ void rk3288_vpu_enc_exit(struct rk3288_vpu_ctx *ctx);
int rk3288_vpu_enc_init_dummy_ctx(struct rk3288_vpu_dev *dev);
void rk3288_vpu_enc_free_dummy_ctx(struct rk3288_vpu_dev *dev);
#endif /* RK3288_VPU_ENC_H_ */
#endif /* ROCKCHIP_VPU_ENC_H_ */

4
drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.c → drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.c
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Google, Inc.
* Tomasz Figa <tfiga@chromium.org>
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
#include "rk3288_vpu_common.h"
#include "rockchip_vpu_common.h"
#include <linux/clk.h>
#include <linux/delay.h>

8
drivers/media/platform/rockchip-vpu/rk3288_vpu_hw.h → drivers/media/platform/rockchip-vpu/rockchip_vpu_hw.h
View File

@@ -1,5 +1,5 @@
/*
* Rockchip RK3288 VPU codec driver
* Rockchip VPU codec driver
*
* Copyright (C) 2014 Google, Inc.
* Tomasz Figa <tfiga@chromium.org>
@@ -14,8 +14,8 @@
* GNU General Public License for more details.
*/
#ifndef RK3288_VPU_HW_H_
#define RK3288_VPU_HW_H_
#ifndef ROCKCHIP_VPU_HW_H_
#define ROCKCHIP_VPU_HW_H_
#include <media/videobuf2-core.h>
@@ -176,4 +176,4 @@ const struct rk3288_vp8e_reg_params *rk3288_vpu_vp8e_get_dummy_params(void);
void rk3288_vpu_vp8e_assemble_bitstream(struct rk3288_vpu_ctx *ctx,
struct rk3288_vpu_buf *dst_buf);
#endif /* RK3288_VPU_HW_H_ */
#endif /* ROCKCHIP_VPU_HW_H_ */