| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1455623832.14709.3.camel@mtksdaap41>
Date: Tue, 16 Feb 2016 19:57:12 +0800
From: pochun lin <pochun.lin@...iatek.com>
To: Hans Verkuil <hverkuil@...all.nl>
CC: Tiffany Lin (林慧珊)
<tiffany.lin@...iatek.com>, Hans Verkuil <hans.verkuil@...co.com>,
"daniel.thompson@...aro.org" <daniel.thompson@...aro.org>,
Rob Herring <robh+dt@...nel.org>,
Mauro Carvalho Chehab <mchehab@....samsung.com>,
Matthias Brugger <matthias.bgg@...il.com>,
Daniel Kurtz <djkurtz@...omium.org>,
Pawel Osciak <posciak@...omium.org>,
Eddie Huang (黃智傑)
<eddie.huang@...iatek.com>,
Yingjoe Chen (陳英洲)
<Yingjoe.Chen@...iatek.com>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-media@...r.kernel.org" <linux-media@...r.kernel.org>,
"linux-mediatek@...ts.infradead.org"
<linux-mediatek@...ts.infradead.org>,
Daniel Hsiao (蕭伯剛)
<daniel.hsiao@...iatek.com>
Subject: Re: [PATCH v4 7/8] [media] vcodec: mediatek: Add Mediatek H264
Video Encoder Driver
Hi Hans,
On Mon, 2016-02-15 at 19:33 +0800, Hans Verkuil wrote:
> On 02/04/2016 12:35 PM, Tiffany Lin wrote:
> > Add h264 encoder driver for MT8173
> >
> > Signed-off-by: Daniel Hsiao <daniel.hsiao@...iatek.com>
> > Signed-off-by: Tiffany Lin <tiffany.lin@...iatek.com>
> > ---
> > drivers/media/platform/mtk-vcodec/Makefile | 3 +-
> > .../media/platform/mtk-vcodec/h264_enc/Makefile | 6 +
> > .../platform/mtk-vcodec/h264_enc/venc_h264_if.c | 540 ++++++++++++++++++++
> > .../platform/mtk-vcodec/h264_enc/venc_h264_if.h | 165 ++++++
> > .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.c | 309 +++++++++++
> > .../platform/mtk-vcodec/h264_enc/venc_h264_vpu.h | 30 ++
> > drivers/media/platform/mtk-vcodec/venc_drv_if.c | 3 +
> > 7 files changed, 1055 insertions(+), 1 deletion(-)
> > create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/Makefile
> > create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h
> > create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c
> > create mode 100644 drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.h
> >
> > diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mtk-vcodec/Makefile
> > index f4ef502..f47dfc7 100644
> > --- a/drivers/media/platform/mtk-vcodec/Makefile
> > +++ b/drivers/media/platform/mtk-vcodec/Makefile
> > @@ -5,6 +5,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk_vcodec_intr.o \
> > mtk_vcodec_enc_pm.o \
> > venc_drv_if.o
> >
> > -obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/
> > +
> > +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += vp8_enc/ h264_enc/
> >
> > ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
> > diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/Makefile b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
> > new file mode 100644
> > index 0000000..765b45f
> > --- /dev/null
> > +++ b/drivers/media/platform/mtk-vcodec/h264_enc/Makefile
> > @@ -0,0 +1,6 @@
> > +obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += venc_h264_if.o venc_h264_vpu.o
> > +
> > +ccflags-y += \
> > + -I$(srctree)/drivers/media/platform/mtk-vcodec/ \
> > + -I$(srctree)/drivers/media/platform/mtk-vcodec/h264_enc \
> > + -I$(srctree)/drivers/media/platform/mtk-vpu
> > diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
> > new file mode 100644
> > index 0000000..c35fb26
> > --- /dev/null
> > +++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.c
> > @@ -0,0 +1,540 @@
> > +/*
> > + * Copyright (c) 2015 MediaTek Inc.
> > + * Author: Jungchang Tsao <jungchang.tsao@...iatek.com>
> > + * Daniel Hsiao <daniel.hsiao@...iatek.com>
> > + * PoChun Lin <pochun.lin@...iatek.com>
> > + *
> > + * This program is free software; you can redistribute it and/or
> > + * modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program 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 General Public License for more details.
> > + */
> > +
> > +#include <linux/interrupt.h>
> > +#include <linux/kernel.h>
> > +#include <linux/slab.h>
> > +
> > +#include "mtk_vcodec_drv.h"
> > +#include "mtk_vcodec_util.h"
> > +#include "mtk_vcodec_intr.h"
> > +#include "mtk_vcodec_enc.h"
> > +#include "mtk_vcodec_pm.h"
> > +#include "mtk_vpu.h"
> > +
> > +#include "venc_h264_if.h"
> > +#include "venc_h264_vpu.h"
> > +
> > +#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
> > +
> > +enum venc_h264_irq_status {
> > + H264_IRQ_STATUS_ENC_SPS_INT = (1 << 0),
> > + H264_IRQ_STATUS_ENC_PPS_INT = (1 << 1),
> > + H264_IRQ_STATUS_ENC_FRM_INT = (1 << 2),
> > +};
> > +
> > +static inline void h264_write_reg(struct venc_h264_inst *inst, u32 addr,
> > + u32 val)
> > +{
> > + writel(val, inst->hw_base + addr);
> > +}
> > +
> > +static inline u32 h264_read_reg(struct venc_h264_inst *inst, u32 addr)
> > +{
> > + return readl(inst->hw_base + addr);
> > +}
> > +
> > +static void h264_enc_free_work_buf(struct venc_h264_inst *inst)
> > +{
> > + int i;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + /* Except the SKIP_FRAME buffers,
> > + * other buffers need to be freed by AP.
> > + */
> > + for (i = 0; i < VENC_H264_VPU_WORK_BUF_MAX; i++) {
> > + if (i != VENC_H264_VPU_WORK_BUF_SKIP_FRAME)
> > + if (inst->work_bufs[i].va != NULL)
> > + mtk_vcodec_mem_free(inst->ctx,
> > + &inst->work_bufs[i]);
> > + }
> > +
> > + if (inst->pps_buf.va != NULL)
> > + mtk_vcodec_mem_free(inst->ctx, &inst->pps_buf);
> > +
> > + mtk_vcodec_debug_leave(inst);
> > +}
> > +
> > +static int h264_enc_alloc_work_buf(struct venc_h264_inst *inst, void *param)
> > +{
> > + int i;
> > + int ret = 0;
> > + struct venc_h264_vpu_buf *wb = inst->vpu_inst.drv->work_bufs;
> > + struct venc_enc_prm *enc_param = param;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + for (i = 0; i < VENC_H264_VPU_WORK_BUF_MAX; i++) {
> > + /*
> > + * This 'wb' structure is set by VPU side and shared to AP for
> > + * buffer allocation and IO virtual addr mapping. For most of
> > + * the buffers, AP will allocate the buffer according to 'size'
> > + * field and store the IO virtual addr in 'iova' field. There
> > + * are two exceptions:
> > + * (1) RC_CODE buffer, it's pre-allocated in the VPU side, and
> > + * save the VPU addr in the 'vpua' field. The AP will translate
> > + * the VPU addr to the corresponding IO virtual addr and store
> > + * in 'iova' field for reg setting in VPU side.
> > + * (2) SKIP_FRAME buffer, it's pre-allocated in the VPU side,
> > + * and save the VPU addr in the 'vpua' field. The AP will
> > + * translate the VPU addr to the corresponding AP side virtual
> > + * address and do some memcpy access to move to bitstream buffer
> > + * assigned by v4l2 layer.
> > + */
> > + if (i == VENC_H264_VPU_WORK_BUF_RC_CODE) {
> > + void *tmp_va;
> > +
> > + tmp_va = vpu_mapping_dm_addr(inst->dev, wb[i].vpua);
> > + inst->work_bufs[i].size = wb[i].size;
> > + if (mtk_vcodec_mem_alloc(inst->ctx,
> > + &inst->work_bufs[i])) {
> > + mtk_vcodec_err(inst,
> > + "cannot allocate buf %d", i);
> > + ret = -ENOMEM;
> > + goto err_alloc;
> > + }
> > + memcpy(inst->work_bufs[i].va, tmp_va, wb[i].size);
> > + wb[i].iova = inst->work_bufs[i].dma_addr;
> > + } else if (i == VENC_H264_VPU_WORK_BUF_SKIP_FRAME) {
> > + inst->work_bufs[i].size = wb[i].size;
> > + inst->work_bufs[i].va = vpu_mapping_dm_addr(
> > + inst->dev, wb[i].vpua);
> > + inst->work_bufs[i].dma_addr = 0;
> > + wb[i].iova = inst->work_bufs[i].dma_addr;
> > + } else if (i == VENC_H264_VPU_WORK_BUF_SRC_LUMA ||
> > + i == VENC_H264_VPU_WORK_BUF_SRC_CHROMA ||
> > + i == VENC_H264_VPU_WORK_BUF_SRC_CHROMA_CB ||
> > + i == VENC_H264_VPU_WORK_BUF_SRC_CHROMA_CR) {
> > + inst->work_bufs[i].size = wb[i].size;
> > + inst->work_bufs[i].dma_addr = 0;
> > + inst->work_bufs[i].va = NULL;
> > + wb[i].iova = inst->work_bufs[i].dma_addr;
> > + } else {
> > + inst->work_bufs[i].size = wb[i].size;
> > + if (mtk_vcodec_mem_alloc(inst->ctx,
> > + &inst->work_bufs[i])) {
> > + mtk_vcodec_err(inst,
> > + "cannot allocate buf %d", i);
> > + ret = -ENOMEM;
> > + goto err_alloc;
> > + }
> > + wb[i].iova = inst->work_bufs[i].dma_addr;
> > + }
> > + mtk_vcodec_debug(inst, "buf[%d] va=0x%p iova=0x%p size=0x%lx",
> > + i, inst->work_bufs[i].va,
> > + (void *)inst->work_bufs[i].dma_addr,
> > + inst->work_bufs[i].size);
> > + }
> > +
> > + if (enc_param->input_fourcc == VENC_YUV_FORMAT_NV12 ||
> > + enc_param->input_fourcc == VENC_YUV_FORMAT_NV21) {
> > + enc_param->sizeimage[0] =
> > + inst->work_bufs[VENC_H264_VPU_WORK_BUF_SRC_LUMA].size;
> > + enc_param->sizeimage[1] =
> > + inst->work_bufs[VENC_H264_VPU_WORK_BUF_SRC_CHROMA].size;
> > + enc_param->sizeimage[2] = 0;
> > + } else {
> > + enc_param->sizeimage[0] =
> > + inst->work_bufs[VENC_H264_VPU_WORK_BUF_SRC_LUMA].size;
> > + enc_param->sizeimage[1] =
> > + inst->work_bufs[VENC_H264_VPU_WORK_BUF_SRC_CHROMA_CB].size;
> > + enc_param->sizeimage[2] =
> > + inst->work_bufs[VENC_H264_VPU_WORK_BUF_SRC_CHROMA_CR].size;
> > + }
> > +
> > + /* the pps_buf is used by AP side only */
> > + inst->pps_buf.size = 128;
> > + if (mtk_vcodec_mem_alloc(inst->ctx,
> > + &inst->pps_buf)) {
> > + mtk_vcodec_err(inst, "cannot allocate pps_buf");
> > + ret = -ENOMEM;
> > + goto err_alloc;
> > + }
> > + mtk_vcodec_debug_leave(inst);
> > +
> > + return ret;
> > +
> > +err_alloc:
> > + h264_enc_free_work_buf(inst);
> > +
> > + return ret;
> > +}
> > +
> > +static unsigned int h264_enc_wait_venc_done(struct venc_h264_inst *inst)
> > +{
> > + unsigned int irq_status = 0;
> > + struct mtk_vcodec_ctx *ctx = (struct mtk_vcodec_ctx *)inst->ctx;
> > +
> > + mtk_vcodec_wait_for_done_ctx(ctx, MTK_INST_IRQ_RECEIVED,
> > + WAIT_INTR_TIMEOUT, true);
> > + irq_status = ctx->irq_status;
> > + mtk_vcodec_debug(inst, "irq_status %x <-", irq_status);
> > +
> > + return irq_status;
> > +}
> > +
> > +static int h264_encode_sps(struct venc_h264_inst *inst,
> > + struct mtk_vcodec_mem *bs_buf,
> > + unsigned int *bs_size)
> > +{
> > + int ret = 0;
> > + unsigned int irq_status;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + ret = h264_enc_vpu_encode(inst, H264_BS_MODE_SPS, NULL,
> > + bs_buf, bs_size);
> > + if (ret)
> > + return ret;
> > +
> > + irq_status = h264_enc_wait_venc_done(inst);
> > + if (irq_status != H264_IRQ_STATUS_ENC_SPS_INT) {
> > + mtk_vcodec_err(inst, "expect irq status %d",
> > + H264_IRQ_STATUS_ENC_SPS_INT);
> > + return -EINVAL;
> > + }
> > +
> > + *bs_size = h264_read_reg(inst, VENC_PIC_BITSTREAM_BYTE_CNT);
> > + mtk_vcodec_debug(inst, "bs size %d <-", *bs_size);
> > +
> > + return ret;
> > +}
> > +
> > +static int h264_encode_pps(struct venc_h264_inst *inst,
> > + struct mtk_vcodec_mem *bs_buf,
> > + unsigned int *bs_size)
> > +{
> > + int ret = 0;
> > + unsigned int irq_status;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + ret = h264_enc_vpu_encode(inst, H264_BS_MODE_PPS, NULL,
> > + bs_buf, bs_size);
> > + if (ret)
> > + return ret;
> > +
> > + irq_status = h264_enc_wait_venc_done(inst);
> > + if (irq_status != H264_IRQ_STATUS_ENC_PPS_INT) {
> > + mtk_vcodec_err(inst, "expect irq status %d",
> > + H264_IRQ_STATUS_ENC_PPS_INT);
> > + return -EINVAL;
> > + }
> > +
> > + *bs_size = h264_read_reg(inst, VENC_PIC_BITSTREAM_BYTE_CNT);
> > + mtk_vcodec_debug(inst, "bs size %d <-", *bs_size);
> > +
> > + return ret;
> > +}
> > +
> > +static int h264_encode_frame(struct venc_h264_inst *inst,
> > + struct venc_frm_buf *frm_buf,
> > + struct mtk_vcodec_mem *bs_buf,
> > + unsigned int *bs_size)
> > +{
> > + int ret = 0;
> > + unsigned int irq_status;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + ret = h264_enc_vpu_encode(inst, H264_BS_MODE_FRAME, frm_buf,
> > + bs_buf, bs_size);
> > + if (ret)
> > + return ret;
> > +
> > + /*
> > + * skip frame case: The skip frame buffer is composed by vpu side only,
> > + * it does not trigger the hw, so skip the wait interrupt operation.
> > + */
> > + if (!inst->vpu_inst.wait_int) {
> > + ++inst->frm_cnt;
> > + return ret;
> > + }
> > +
> > + irq_status = h264_enc_wait_venc_done(inst);
> > + if (irq_status != H264_IRQ_STATUS_ENC_FRM_INT) {
> > + mtk_vcodec_err(inst, "irq_status=%d failed", irq_status);
> > + return -EINVAL;
> > + }
> > +
> > + *bs_size = h264_read_reg(inst,
> > + VENC_PIC_BITSTREAM_BYTE_CNT);
> > + ++inst->frm_cnt;
> > + mtk_vcodec_debug(inst, "frm %d bs size %d key_frm %d <-",
> > + inst->frm_cnt,
> > + *bs_size, inst->is_key_frm);
> > +
> > + return ret;
> > +}
> > +
> > +static void h264_encode_filler(struct venc_h264_inst *inst, void *buf,
> > + int size)
> > +{
> > + unsigned char *p = buf;
> > +
> > + *p++ = 0x0;
> > + *p++ = 0x0;
> > + *p++ = 0x0;
> > + *p++ = 0x1;
> > + *p++ = 0xc;
> > + size -= 5;
> > + while (size) {
> > + *p++ = 0xff;
> > + size -= 1;
> > + }
> > +}
> > +
> > +static int h264_enc_init(struct mtk_vcodec_ctx *ctx, unsigned long *handle)
> > +{
> > + int ret = 0;
> > + struct venc_h264_inst *inst;
> > +
> > + inst = kzalloc(sizeof(*inst), GFP_KERNEL);
> > + if (!inst)
> > + return -ENOMEM;
> > +
> > + inst->ctx = ctx;
> > + inst->dev = mtk_vcodec_get_plat_dev(ctx);
> > + inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx, VENC_SYS);
> > +
> > + mtk_vcodec_debug_enter(inst);
> > + ret = h264_enc_vpu_init(inst);
> > + if (ret)
> > + kfree(inst);
> > + else
> > + (*handle) = (unsigned long)inst;
> > +
> > + mtk_vcodec_debug_leave(inst);
> > +
> > + return ret;
> > +}
> > +
> > +static int h264_enc_encode(unsigned long handle,
> > + enum venc_start_opt opt,
> > + struct venc_frm_buf *frm_buf,
> > + struct mtk_vcodec_mem *bs_buf,
> > + struct venc_done_result *result)
> > +{
> > + int ret = 0;
> > + struct venc_h264_inst *inst = (struct venc_h264_inst *)handle;
> > + struct mtk_vcodec_ctx *ctx = inst->ctx;
> > +
> > + mtk_vcodec_debug(inst, "opt %d ->", opt);
> > +
> > + enable_irq(ctx->dev->enc_irq);
> > +
> > + switch (opt) {
> > + case VENC_START_OPT_ENCODE_SEQUENCE_HEADER: {
> > + unsigned int bs_size_sps;
> > + unsigned int bs_size_pps;
> > +
> > + memset(bs_buf->va, 0x38, 20);
> > + ret = h264_encode_sps(inst, bs_buf, &bs_size_sps);
> > + if (ret)
> > + goto encode_err;
> > +
> > + memset(inst->pps_buf.va, 0x49, 20);
> > + ret = h264_encode_pps(inst, &inst->pps_buf, &bs_size_pps);
> > + if (ret)
> > + goto encode_err;
> > +
> > + memcpy(bs_buf->va + bs_size_sps,
> > + inst->pps_buf.va,
> > + bs_size_pps);
> > + result->bs_size = bs_size_sps + bs_size_pps;
> > + result->is_key_frm = false;
> > + }
> > + break;
>
> Wrong indentation for break, put it before the '}'.
>
I will change this in next version. Thanks.
> > +
> > + case VENC_START_OPT_ENCODE_FRAME:
> > + if (inst->prepend_hdr) {
>
> Invert the condition to make it more readable:
>
> if (!inst->prepend_hdr) {
> ret = h264_encode_frame(inst, frm_buf, bs_buf,
> &result->bs_size);
> if (ret)
> goto encode_err;
> result->is_key_frm = inst->is_key_frm;
> break;
> }
>
> Now you can shift the remainder one tab to the left and join lines that
> are now broken up (probably because they exceed 80 chars).
>
I will change this in next version. Thanks.
> > + int hdr_sz;
> > + int hdr_sz_ext;
> > + int bs_alignment = 128;
> > + int filler_sz = 0;
> > + struct mtk_vcodec_mem tmp_bs_buf;
> > + unsigned int bs_size_sps;
> > + unsigned int bs_size_pps;
> > + unsigned int bs_size_frm;
> > +
> > + mtk_vcodec_debug(inst,
> > + "h264_encode_frame prepend SPS/PPS");
> > + ret = h264_encode_sps(inst, bs_buf, &bs_size_sps);
> > + if (ret)
> > + goto encode_err;
> > +
> > + ret = h264_encode_pps(inst, &inst->pps_buf,
> > + &bs_size_pps);
> > + if (ret)
> > + goto encode_err;
> > +
> > + memcpy(bs_buf->va + bs_size_sps,
> > + inst->pps_buf.va,
> > + bs_size_pps);
> > +
> > + hdr_sz = bs_size_sps + bs_size_pps;
> > + hdr_sz_ext = (hdr_sz & (bs_alignment - 1));
> > + if (hdr_sz_ext) {
> > + filler_sz = bs_alignment - hdr_sz_ext;
> > + if (hdr_sz_ext + 5 > bs_alignment)
> > + filler_sz += bs_alignment;
> > + h264_encode_filler(
> > + inst, bs_buf->va + hdr_sz,
> > + filler_sz);
> > + }
> > +
> > + tmp_bs_buf.va = bs_buf->va + hdr_sz +
> > + filler_sz;
> > + tmp_bs_buf.dma_addr = bs_buf->dma_addr + hdr_sz +
> > + filler_sz;
> > + tmp_bs_buf.size = bs_buf->size -
> > + (hdr_sz + filler_sz);
> > +
> > + ret = h264_encode_frame(inst, frm_buf, &tmp_bs_buf,
> > + &bs_size_frm);
> > + if (ret)
> > + goto encode_err;
> > +
> > + result->bs_size = hdr_sz + filler_sz + bs_size_frm;
> > + mtk_vcodec_debug(inst,
> > + "hdr %d filler %d frame %d bs %d",
> > + hdr_sz, filler_sz, bs_size_frm,
> > + result->bs_size);
> > +
> > + inst->prepend_hdr = 0;
> > + } else {
> > + ret = h264_encode_frame(inst, frm_buf, bs_buf,
> > + &result->bs_size);
> > + if (ret)
> > + goto encode_err;
> > + }
> > + result->is_key_frm = inst->is_key_frm;
> > + break;
> > +
> > + default:
> > + mtk_vcodec_err(inst, "venc_start_opt %d not supported", opt);
> > + ret = -EINVAL;
> > + break;
> > + }
> > +
> > +encode_err:
> > + if (ret)
> > + result->msg = VENC_MESSAGE_ERR;
> > + else
> > + result->msg = VENC_MESSAGE_OK;
> > +
> > + disable_irq(ctx->dev->enc_irq);
> > + mtk_vcodec_debug(inst, "opt %d <-", opt);
> > +
> > + return ret;
> > +}
> > +
> > +static int h264_enc_set_param(unsigned long handle,
> > + enum venc_set_param_type type, void *in)
> > +{
> > + int ret = 0;
> > + struct venc_h264_inst *inst = (struct venc_h264_inst *)handle;
> > + struct venc_enc_prm *enc_prm;
> > +
> > + mtk_vcodec_debug(inst, "->type=%d", type);
> > +
> > + switch (type) {
> > + case VENC_SET_PARAM_ENC:
> > + enc_prm = in;
> > + ret = h264_enc_vpu_set_param(inst, type, enc_prm);
> > + if (ret)
> > + break;
> > + if (inst->work_buf_allocated == 1) {
> > + h264_enc_free_work_buf(inst);
> > + inst->work_buf_allocated = 0;
> > + }
> > + if (inst->work_buf_allocated == 0) {
> > + ret = h264_enc_alloc_work_buf(inst, enc_prm);
> > + if (ret)
> > + break;
> > + inst->work_buf_allocated = 1;
> > + }
> > + break;
> > +
> > + case VENC_SET_PARAM_FORCE_INTRA:
> > + ret = h264_enc_vpu_set_param(inst, type, 0);
> > + break;
> > +
> > + case VENC_SET_PARAM_ADJUST_BITRATE:
> > + enc_prm = in;
> > + ret = h264_enc_vpu_set_param(inst, type, &enc_prm->bitrate);
> > + break;
> > +
> > + case VENC_SET_PARAM_ADJUST_FRAMERATE:
> > + enc_prm = in;
> > + ret = h264_enc_vpu_set_param(inst, type, &enc_prm->frm_rate);
> > + break;
> > +
> > + case VENC_SET_PARAM_I_FRAME_INTERVAL:
> > + ret = h264_enc_vpu_set_param(inst, type, in);
> > + break;
> > +
> > + case VENC_SET_PARAM_SKIP_FRAME:
> > + ret = h264_enc_vpu_set_param(inst, type, 0);
> > + break;
> > +
> > + case VENC_SET_PARAM_PREPEND_HEADER:
> > + inst->prepend_hdr = 1;
> > + mtk_vcodec_debug(inst, "set prepend header mode");
> > + break;
> > +
> > + default:
> > + mtk_vcodec_err(inst, "type %d not supported", type);
> > + ret = -EINVAL;
> > + break;
> > + }
> > +
> > + mtk_vcodec_debug_leave(inst);
> > +
> > + return ret;
> > +}
> > +
> > +static int h264_enc_deinit(unsigned long handle)
> > +{
> > + int ret = 0;
> > + struct venc_h264_inst *inst = (struct venc_h264_inst *)handle;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + ret = h264_enc_vpu_deinit(inst);
> > +
> > + if (inst->work_buf_allocated)
> > + h264_enc_free_work_buf(inst);
> > +
> > + mtk_vcodec_debug_leave(inst);
> > + kfree(inst);
> > +
> > + return ret;
> > +}
> > +
> > +static struct venc_common_if venc_h264_if = {
> > + h264_enc_init,
> > + h264_enc_encode,
> > + h264_enc_set_param,
> > + h264_enc_deinit,
> > +};
> > +
> > +struct venc_common_if *get_h264_enc_comm_if(void)
> > +{
> > + return &venc_h264_if;
> > +}
> > diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h
> > new file mode 100644
> > index 0000000..9ac317a
> > --- /dev/null
> > +++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_if.h
> > @@ -0,0 +1,165 @@
> > +/*
> > + * Copyright (c) 2015 MediaTek Inc.
> > + * Author: Jungchang Tsao <jungchang.tsao@...iatek.com>
> > + * Daniel Hsiao <daniel.hsiao@...iatek.com>
> > + * PoChun Lin <pochun.lin@...iatek.com>
> > + *
> > + * This program is free software; you can redistribute it and/or
> > + * modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program 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 General Public License for more details.
> > + */
> > +
> > +#ifndef _VENC_H264_IF_H_
> > +#define _VENC_H264_IF_H_
> > +
> > +#include "venc_drv_base.h"
> > +
> > +/**
> > + * enum venc_h264_vpu_work_buf - h264 encoder buffer index
> > + */
> > +enum venc_h264_vpu_work_buf {
> > + VENC_H264_VPU_WORK_BUF_RC_INFO,
> > + VENC_H264_VPU_WORK_BUF_RC_CODE,
> > + VENC_H264_VPU_WORK_BUF_REC_LUMA,
> > + VENC_H264_VPU_WORK_BUF_REC_CHROMA,
> > + VENC_H264_VPU_WORK_BUF_REF_LUMA,
> > + VENC_H264_VPU_WORK_BUF_REF_CHROMA,
> > + VENC_H264_VPU_WORK_BUF_MV_INFO_1,
> > + VENC_H264_VPU_WORK_BUF_MV_INFO_2,
> > + VENC_H264_VPU_WORK_BUF_SKIP_FRAME,
> > + VENC_H264_VPU_WORK_BUF_SRC_LUMA,
> > + VENC_H264_VPU_WORK_BUF_SRC_CHROMA,
> > + VENC_H264_VPU_WORK_BUF_SRC_CHROMA_CB,
> > + VENC_H264_VPU_WORK_BUF_SRC_CHROMA_CR,
> > + VENC_H264_VPU_WORK_BUF_MAX,
> > +};
> > +
> > +/**
> > + * enum venc_h264_bs_mode - for bs_mode argument in h264_enc_vpu_encode
> > + */
> > +enum venc_h264_bs_mode {
> > + H264_BS_MODE_SPS,
> > + H264_BS_MODE_PPS,
> > + H264_BS_MODE_FRAME,
> > +};
> > +
> > +/*
> > + * struct venc_h264_vpu_config - Structure for h264 encoder configuration
> > + * @input_fourcc: input fourcc
> > + * @bitrate: target bitrate (in bps)
> > + * @pic_w: picture width
> > + * @pic_h: picture height
> > + * @buf_w: buffer width
> > + * @buf_h: buffer height
> > + * @intra_period: intra frame period
> > + * @framerate: frame rate
> > + * @profile: as specified in standard
> > + * @level: as specified in standard
> > + * @wfd: WFD mode 1:on, 0:off
> > + */
> > +struct venc_h264_vpu_config {
> > + u32 input_fourcc;
> > + u32 bitrate;
> > + u32 pic_w;
> > + u32 pic_h;
> > + u32 buf_w;
> > + u32 buf_h;
> > + u32 intra_period;
> > + u32 framerate;
> > + u32 profile;
> > + u32 level;
> > + u32 wfd;
> > +};
> > +
> > +/*
> > + * struct venc_h264_vpu_buf - Structure for buffer information
> > + * @align: buffer alignment (in bytes)
> > + * @iova: IO virtual address
> > + * @vpua: VPU side memory addr which is used by RC_CODE
> > + * @size: buffer size (in bytes)
> > + */
> > +struct venc_h264_vpu_buf {
> > + u32 align;
> > + u32 iova;
> > + u32 vpua;
> > + u32 size;
> > +};
> > +
> > +/*
> > + * struct venc_h264_vpu_drv - Structure for VPU driver control and info share
> > + * This structure is allocated in VPU side and shared to AP side.
> > + * @config: h264 encoder configuration
> > + * @work_bufs: working buffer information in VPU side
> > + * The work_bufs here is for storing the 'size' info shared to AP side.
> > + * The similar item in struct venc_h264_inst is for memory allocation
> > + * in AP side. The AP driver will copy the 'size' from here to the one in
> > + * struct mtk_vcodec_mem, then invoke mtk_vcodec_mem_alloc to allocate
> > + * the buffer. After that, bypass the 'dma_addr' to the 'iova' field here for
> > + * register setting in VPU side.
> > + */
> > +struct venc_h264_vpu_drv {
> > + struct venc_h264_vpu_config config;
> > + struct venc_h264_vpu_buf work_bufs[VENC_H264_VPU_WORK_BUF_MAX];
> > +};
> > +
> > +/*
> > + * struct venc_h264_vpu_inst - h264 encoder VPU driver instance
> > + * @wq_hd: wait queue used for vpu cmd trigger then wait vpu interrupt done
> > + * @signaled: flag used for checking vpu interrupt done
> > + * @failure: flag to show vpu cmd succeeds or not
> > + * @state: enum venc_ipi_msg_enc_state
> > + * @bs_size: bitstream size for skip frame case usage
> > + * @wait_int: flag to wait interrupt done (0: for skip frame case, 1: normal
> > + * case)
> > + * @id: VPU instance id
> > + * @drv: driver structure allocated by VPU side and shared to AP side for
> > + * control and info share
> > + */
> > +struct venc_h264_vpu_inst {
> > + wait_queue_head_t wq_hd;
> > + int signaled;
> > + int failure;
> > + int state;
> > + int bs_size;
> > + int wait_int;
> > + unsigned int id;
> > + struct venc_h264_vpu_drv *drv;
> > +};
> > +
> > +/*
> > + * struct venc_h264_inst - h264 encoder AP driver instance
> > + * @hw_base: h264 encoder hardware register base
> > + * @work_bufs: working buffer
> > + * @pps_buf: buffer to store the pps bitstream
> > + * @work_buf_allocated: working buffer allocated flag
> > + * @frm_cnt: encoded frame count
> > + * @prepend_hdr: when the v4l2 layer send VENC_SET_PARAM_PREPEND_HEADER cmd
> > + * through h264_enc_set_param interface, it will set this flag and prepend the
> > + * sps/pps in h264_enc_encode function.
> > + * @is_key_frm: key frame flag
> > + * @vpu_inst: VPU instance to exchange information between AP and VPU
> > + * @ctx: context for v4l2 layer integration
> > + * @dev: device for v4l2 layer integration
> > + */
> > +struct venc_h264_inst {
> > + void __iomem *hw_base;
> > + struct mtk_vcodec_mem work_bufs[VENC_H264_VPU_WORK_BUF_MAX];
> > + struct mtk_vcodec_mem pps_buf;
> > + bool work_buf_allocated;
> > + unsigned int frm_cnt;
> > + unsigned int prepend_hdr;
> > + unsigned int is_key_frm;
> > + struct venc_h264_vpu_inst vpu_inst;
> > + void *ctx;
> > + struct platform_device *dev;
> > +};
> > +
> > +struct venc_common_if *get_h264_enc_comm_if(void);
> > +
> > +#endif
> > diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c
> > new file mode 100644
> > index 0000000..450be45
> > --- /dev/null
> > +++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.c
> > @@ -0,0 +1,309 @@
> > +/*
> > + * Copyright (c) 2015 MediaTek Inc.
> > + * Author: Jungchang Tsao <jungchang.tsao@...iatek.com>
> > + * Daniel Hsiao <daniel.hsiao@...iatek.com>
> > + * PoChun Lin <pochun.lin@...iatek.com>
> > + *
> > + * This program is free software; you can redistribute it and/or
> > + * modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program 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 General Public License for more details.
> > + */
> > +
> > +#include "mtk_vpu.h"
> > +
> > +#include "venc_h264_if.h"
> > +#include "venc_h264_vpu.h"
> > +#include "venc_ipi_msg.h"
> > +
> > +static unsigned int h264_get_profile(unsigned int profile)
> > +{
> > + /* (Baseline=66, Main=77, High=100) */
> > + switch (profile) {
> > + case V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE:
> > + return 66;
> > + case V4L2_MPEG_VIDEO_H264_PROFILE_MAIN:
> > + return 77;
> > + case V4L2_MPEG_VIDEO_H264_PROFILE_HIGH:
> > + return 100;
> > + default:
> > + return 100;
> > + }
> > +}
> > +
> > +static unsigned int h264_get_level(unsigned int level)
> > +{
> > + /* (UpTo4.1(HighProfile)) */
> > + switch (level) {
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_1_0:
> > + return 10;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_1_1:
> > + return 11;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_1_2:
> > + return 12;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_1_3:
> > + return 13;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_2_0:
> > + return 20;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_2_1:
> > + return 21;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_2_2:
> > + return 22;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_3_0:
> > + return 30;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_3_1:
> > + return 31;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_3_2:
> > + return 32;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
> > + return 40;
> > + case V4L2_MPEG_VIDEO_H264_LEVEL_4_1:
> > + return 41;
> > + default:
> > + return 31;
> > + }
> > +}
> > +
> > +static void handle_h264_enc_init_msg(struct venc_h264_inst *inst, void *data)
> > +{
> > + struct venc_vpu_ipi_msg_init *msg = data;
> > +
> > + inst->vpu_inst.id = msg->inst_id;
> > + inst->vpu_inst.drv = (struct venc_h264_vpu_drv *)vpu_mapping_dm_addr(
> > + inst->dev, msg->inst_id);
> > +}
> > +
> > +static void handle_h264_enc_encode_msg(struct venc_h264_inst *inst, void *data)
> > +{
> > + struct venc_vpu_ipi_msg_enc *msg = data;
> > +
> > + inst->vpu_inst.state = msg->state;
> > + inst->vpu_inst.bs_size = msg->bs_size;
> > + inst->is_key_frm = msg->key_frame;
> > +}
> > +
> > +static void h264_enc_vpu_ipi_handler(void *data, unsigned int len, void *priv)
> > +{
> > + struct venc_vpu_ipi_msg_common *msg = data;
> > + struct venc_h264_inst *inst = (struct venc_h264_inst *)msg->venc_inst;
> > +
> > + mtk_vcodec_debug(inst, "msg_id %x inst %p status %d",
> > + msg->msg_id, inst, msg->status);
> > +
> > + switch (msg->msg_id) {
> > + case VPU_IPIMSG_H264_ENC_INIT_DONE:
> > + handle_h264_enc_init_msg(inst, data);
> > + break;
> > + case VPU_IPIMSG_H264_ENC_SET_PARAM_DONE:
> > + break;
> > + case VPU_IPIMSG_H264_ENC_ENCODE_DONE:
> > + handle_h264_enc_encode_msg(inst, data);
> > + break;
> > + case VPU_IPIMSG_H264_ENC_DEINIT_DONE:
> > + break;
> > + default:
> > + mtk_vcodec_err(inst, "unknown msg id %x", msg->msg_id);
> > + break;
> > + }
> > +
> > + inst->vpu_inst.signaled = 1;
> > + inst->vpu_inst.failure = (msg->status != VENC_IPI_MSG_STATUS_OK);
> > +
> > + mtk_vcodec_debug_leave(inst);
> > +}
> > +
> > +static int h264_enc_vpu_send_msg(struct venc_h264_inst *inst, void *msg,
> > + int len)
> > +{
> > + int status;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > + status = vpu_ipi_send(inst->dev, IPI_VENC_H264, msg, len);
> > + if (status) {
> > + mtk_vcodec_err(inst, "vpu_ipi_send msg %x len %d fail %d",
> > + *(unsigned int *)msg, len, status);
> > + return -EINVAL;
> > + }
> > + mtk_vcodec_debug_leave(inst);
> > +
> > + return 0;
> > +}
> > +
> > +int h264_enc_vpu_init(struct venc_h264_inst *inst)
> > +{
> > + int status;
> > + struct venc_ap_ipi_msg_init out;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + init_waitqueue_head(&inst->vpu_inst.wq_hd);
> > + inst->vpu_inst.signaled = 0;
> > + inst->vpu_inst.failure = 0;
> > +
> > + status = vpu_ipi_register(inst->dev, IPI_VENC_H264,
> > + h264_enc_vpu_ipi_handler,
> > + "h264_enc", NULL);
> > + if (status) {
> > + mtk_vcodec_err(inst, "vpu_ipi_register fail %d", status);
> > + return -EINVAL;
> > + }
> > +
> > + out.msg_id = AP_IPIMSG_H264_ENC_INIT;
> > + out.venc_inst = (unsigned long)inst;
> > + if (h264_enc_vpu_send_msg(inst, &out, sizeof(out)) ||
> > + inst->vpu_inst.failure) {
> > + mtk_vcodec_err(inst, "AP_IPIMSG_H264_ENC_INIT failed");
> > + return -EINVAL;
> > + }
> > +
> > + mtk_vcodec_debug_leave(inst);
> > +
> > + return 0;
> > +}
> > +
> > +int h264_enc_vpu_set_param(struct venc_h264_inst *inst, unsigned int id,
> > + void *param)
> > +{
> > + struct venc_ap_ipi_msg_set_param out;
> > +
> > + mtk_vcodec_debug(inst, "id %d ->", id);
> > +
> > + out.msg_id = AP_IPIMSG_H264_ENC_SET_PARAM;
> > + out.inst_id = inst->vpu_inst.id;
> > + out.param_id = id;
> > + switch (id) {
> > + case VENC_SET_PARAM_ENC: {
> > + struct venc_enc_prm *enc_param = (struct venc_enc_prm *)param;
> > +
> > + inst->vpu_inst.drv->config.input_fourcc =
> > + enc_param->input_fourcc;
> > + inst->vpu_inst.drv->config.bitrate = enc_param->bitrate;
> > + inst->vpu_inst.drv->config.pic_w = enc_param->width;
> > + inst->vpu_inst.drv->config.pic_h = enc_param->height;
> > + inst->vpu_inst.drv->config.buf_w = enc_param->buf_width;
> > + inst->vpu_inst.drv->config.buf_h = enc_param->buf_height;
> > + inst->vpu_inst.drv->config.intra_period =
> > + enc_param->intra_period;
> > + inst->vpu_inst.drv->config.framerate = enc_param->frm_rate;
> > + inst->vpu_inst.drv->config.profile =
> > + h264_get_profile(enc_param->h264_profile);
> > + inst->vpu_inst.drv->config.level =
> > + h264_get_level(enc_param->h264_level);
> > + inst->vpu_inst.drv->config.wfd = 0;
> > + out.data_item = 0;
> > + break;
> > + }
> > + case VENC_SET_PARAM_FORCE_INTRA:
> > + out.data_item = 0;
> > + break;
> > + case VENC_SET_PARAM_ADJUST_BITRATE:
> > + out.data_item = 1;
> > + out.data[0] = *(unsigned int *)param;
> > + break;
> > + case VENC_SET_PARAM_ADJUST_FRAMERATE:
> > + out.data_item = 1;
> > + out.data[0] = *(unsigned int *)param;
> > + break;
> > + case VENC_SET_PARAM_I_FRAME_INTERVAL:
> > + out.data_item = 1;
> > + out.data[0] = *(unsigned int *)param;
> > + break;
> > + case VENC_SET_PARAM_SKIP_FRAME:
> > + out.data_item = 0;
> > + break;
> > + }
> > + if (h264_enc_vpu_send_msg(inst, &out, sizeof(out)) ||
> > + inst->vpu_inst.failure) {
> > + mtk_vcodec_err(inst,
> > + "AP_IPIMSG_H264_ENC_SET_PARAM %d fail", id);
> > + return -EINVAL;
> > + }
> > +
> > + mtk_vcodec_debug(inst, "id %d <-", id);
> > +
> > + return 0;
> > +}
> > +
> > +int h264_enc_vpu_encode(struct venc_h264_inst *inst, unsigned int bs_mode,
> > + struct venc_frm_buf *frm_buf,
> > + struct mtk_vcodec_mem *bs_buf,
> > + unsigned int *bs_size)
> > +{
> > + struct venc_ap_ipi_msg_enc out;
> > +
> > + mtk_vcodec_debug(inst, "bs_mode %d ->", bs_mode);
> > +
> > + out.msg_id = AP_IPIMSG_H264_ENC_ENCODE;
> > + out.inst_id = inst->vpu_inst.id;
> > + out.bs_mode = bs_mode;
> > + if (frm_buf) {
> > + if ((frm_buf->fb_addr.dma_addr % 16 == 0) &&
> > + (frm_buf->fb_addr1.dma_addr % 16 == 0) &&
> > + (frm_buf->fb_addr2.dma_addr % 16 == 0)) {
> > + out.input_addr[0] = frm_buf->fb_addr.dma_addr;
> > + out.input_addr[1] = frm_buf->fb_addr1.dma_addr;
> > + out.input_addr[2] = frm_buf->fb_addr2.dma_addr;
> > + } else {
> > + mtk_vcodec_err(inst, "dma_addr not align to 16");
> > + return -EINVAL;
> > + }
> > + } else {
> > + out.input_addr[0] = 0;
> > + out.input_addr[1] = 0;
> > + out.input_addr[2] = 0;
> > + }
> > + if (bs_buf) {
> > + out.bs_addr = bs_buf->dma_addr;
> > + out.bs_size = bs_buf->size;
> > + } else {
> > + out.bs_addr = 0;
> > + out.bs_size = 0;
> > + }
> > + if (h264_enc_vpu_send_msg(inst, &out, sizeof(out)) ||
> > + inst->vpu_inst.failure) {
> > + mtk_vcodec_err(inst, "AP_IPIMSG_H264_ENC_ENCODE %d fail",
> > + bs_mode);
> > + return -EINVAL;
> > + }
> > +
> > + mtk_vcodec_debug(inst, "state %d size %d key_frm %d",
> > + inst->vpu_inst.state, inst->vpu_inst.bs_size,
> > + inst->is_key_frm);
> > +
> > + inst->vpu_inst.wait_int = 1;
> > + if (inst->vpu_inst.state == VEN_IPI_MSG_ENC_STATE_SKIP) {
> > + *bs_size = inst->vpu_inst.bs_size;
> > + memcpy(bs_buf->va,
> > + inst->work_bufs[VENC_H264_VPU_WORK_BUF_SKIP_FRAME].va,
> > + *bs_size);
> > + inst->vpu_inst.wait_int = 0;
> > + }
> > +
> > + mtk_vcodec_debug(inst, "bs_mode %d <-", bs_mode);
> > +
> > + return 0;
> > +}
> > +
> > +int h264_enc_vpu_deinit(struct venc_h264_inst *inst)
> > +{
> > + struct venc_ap_ipi_msg_deinit out;
> > +
> > + mtk_vcodec_debug_enter(inst);
> > +
> > + out.msg_id = AP_IPIMSG_H264_ENC_DEINIT;
> > + out.inst_id = inst->vpu_inst.id;
> > + if (h264_enc_vpu_send_msg(inst, &out, sizeof(out)) ||
> > + inst->vpu_inst.failure) {
> > + mtk_vcodec_err(inst, "AP_IPIMSG_H264_ENC_DEINIT fail");
> > + return -EINVAL;
> > + }
> > +
> > + mtk_vcodec_debug_leave(inst);
> > +
> > + return 0;
> > +}
> > diff --git a/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.h b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.h
> > new file mode 100644
> > index 0000000..deccc6f
> > --- /dev/null
> > +++ b/drivers/media/platform/mtk-vcodec/h264_enc/venc_h264_vpu.h
> > @@ -0,0 +1,30 @@
> > +/*
> > + * Copyright (c) 2015 MediaTek Inc.
> > + * Author: Jungchang Tsao <jungchang.tsao@...iatek.com>
> > + * Daniel Hsiao <daniel.hsiao@...iatek.com>
> > + * PoChun Lin <pochun.lin@...iatek.com>
> > + *
> > + * This program is free software; you can redistribute it and/or
> > + * modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program 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 General Public License for more details.
> > + */
> > +
> > +#ifndef _VENC_H264_VPU_H_
> > +#define _VENC_H264_VPU_H_
> > +
> > +int h264_enc_vpu_init(struct venc_h264_inst *inst);
> > +int h264_enc_vpu_set_param(struct venc_h264_inst *inst, unsigned int id,
> > + void *param);
> > +int h264_enc_vpu_encode(struct venc_h264_inst *inst, unsigned int bs_mode,
> > + struct venc_frm_buf *frm_buf,
> > + struct mtk_vcodec_mem *bs_buf,
> > + unsigned int *bs_size);
> > +int h264_enc_vpu_deinit(struct venc_h264_inst *inst);
> > +
> > +#endif
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
> > index d293f2c..28ef4a7 100644
> > --- a/drivers/media/platform/mtk-vcodec/venc_drv_if.c
> > +++ b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
> > @@ -25,6 +25,7 @@
> >
> > #include "venc_drv_base.h"
> > #include "vp8_enc/venc_vp8_if.h"
> > +#include "h264_enc/venc_h264_if.h"
> >
> > int venc_if_create(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
> > {
> > @@ -38,6 +39,8 @@ int venc_if_create(struct mtk_vcodec_ctx *ctx, unsigned int fourcc)
> > ctx->enc_if = get_vp8_enc_comm_if();
> > break;
> > case V4L2_PIX_FMT_H264:
> > + ctx->enc_if = get_h264_enc_comm_if();
> > + break;
> > default:
> > return -EINVAL;
> > }
> >
>
> Regards,
>
> Hans
Best Regards
PoChun
Powered by blists - more mailing lists