Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f4ee9ee authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: move H.264 helper function into separate file 



Currently there is only the coda_h264_padding function, but
we will have to add more H.264 specific helpers later.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 58b7677d

drivers/media/platform/coda/Makefile

+1 −1
Original line number Diff line number Diff line 
coda-objs := coda-common.o

coda-objs := coda-common.o coda-h264.o



obj-$(CONFIG_VIDEO_CODA) += coda.o

drivers/media/platform/coda/coda-common.c

+0 −22
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ struct coda_fmt { 
	u32 fourcc;

};



static const u8 coda_filler_nal[14] = { 0x00, 0x00, 0x00, 0x01, 0x0c, 0xff,

			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80 };

static const u8 coda_filler_size[8] = { 0, 7, 14, 13, 12, 11, 10, 9 };



void coda_write(struct coda_dev *dev, u32 data, u32 reg)

{

	v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
@@ -1627,24 +1623,6 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, struct coda_q_data *q_d 
	return 0;

}



static int coda_h264_padding(int size, char *p)

{

	int nal_size;

	int diff;



	diff = size - (size & ~0x7);

	if (diff == 0)

		return 0;



	nal_size = coda_filler_size[diff];

	memcpy(p, coda_filler_nal, nal_size);



	/* Add rbsp stop bit and trailing at the end */

	*(p + nal_size - 1) = 0x80;



	return nal_size;

}



static phys_addr_t coda_iram_alloc(struct coda_iram_info *iram, size_t size)

{

	phys_addr_t ret;

drivers/media/platform/coda/coda-h264.c

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Coda multi-standard codec IP - H.264 helper functions

 *

 * Copyright (C) 2012 Vista Silicon S.L.

 *    Javier Martin, <javier.martin@vista-silicon.com>

 *    Xavier Duret

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <linux/kernel.h>



static const u8 coda_filler_nal[14] = { 0x00, 0x00, 0x00, 0x01, 0x0c, 0xff,

			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80 };

static const u8 coda_filler_size[8] = { 0, 7, 14, 13, 12, 11, 10, 9 };



int coda_h264_padding(int size, char *p)

{

	int nal_size;

	int diff;



	diff = size - (size & ~0x7);

	if (diff == 0)

		return 0;



	nal_size = coda_filler_size[diff];

	memcpy(p, coda_filler_nal, nal_size);



	/* Add rbsp stop bit and trailing at the end */

	*(p + nal_size - 1) = 0x80;



	return nal_size;

}

drivers/media/platform/coda/coda.h

+2 −0
Original line number Diff line number Diff line
@@ -227,3 +227,5 @@ struct coda_ctx { 
	int				display_idx;

	struct dentry			*debugfs_entry;

};



int coda_h264_padding(int size, char *p);