From 950c4747e3c519372382e6b5a7e84bfd22e12d5c Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Tue, 12 May 2009 12:30:33 +0000 Subject: Remove bytestream.h and and a related comment from cook.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20917 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libcook/bytestream.h | 71 ---------------------------------------- apps/codecs/libcook/cook.h | 3 +- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 apps/codecs/libcook/bytestream.h (limited to 'apps/codecs/libcook') diff --git a/apps/codecs/libcook/bytestream.h b/apps/codecs/libcook/bytestream.h deleted file mode 100644 index b56f6ce743..0000000000 --- a/apps/codecs/libcook/bytestream.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Bytestream functions - * copyright (c) 2006 Baptiste Coudurier - * - * This file is part of FFmpeg. - * - * 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. - * - * 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_BYTESTREAM_H -#define AVCODEC_BYTESTREAM_H - -#include -#include "libavutil/common.h" -#include "libavutil/intreadwrite.h" - -#define DEF_T(type, name, bytes, read, write) \ -static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\ - (*b) += bytes;\ - return read(*b - bytes);\ -}\ -static av_always_inline void bytestream_put_ ##name(uint8_t **b, const type value){\ - write(*b, value);\ - (*b) += bytes;\ -} - -#define DEF(name, bytes, read, write) \ - DEF_T(unsigned int, name, bytes, read, write) -#define DEF64(name, bytes, read, write) \ - DEF_T(uint64_t, name, bytes, read, write) - -DEF64(le64, 8, AV_RL64, AV_WL64) -DEF (le32, 4, AV_RL32, AV_WL32) -DEF (le24, 3, AV_RL24, AV_WL24) -DEF (le16, 2, AV_RL16, AV_WL16) -DEF64(be64, 8, AV_RB64, AV_WB64) -DEF (be32, 4, AV_RB32, AV_WB32) -DEF (be24, 3, AV_RB24, AV_WB24) -DEF (be16, 2, AV_RB16, AV_WB16) -DEF (byte, 1, AV_RB8 , AV_WB8 ) - -#undef DEF -#undef DEF64 -#undef DEF_T - -static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, uint8_t *dst, unsigned int size) -{ - memcpy(dst, *b, size); - (*b) += size; - return size; -} - -static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *src, unsigned int size) -{ - memcpy(*b, src, size); - (*b) += size; -} - -#endif /* AVCODEC_BYTESTREAM_H */ diff --git a/apps/codecs/libcook/cook.h b/apps/codecs/libcook/cook.h index ee60ba01c9..8fcc6f86cd 100644 --- a/apps/codecs/libcook/cook.h +++ b/apps/codecs/libcook/cook.h @@ -24,7 +24,6 @@ #include #include "bitstream.h" -#include "bytestream.h" #include "rm2wav.h" #include "cookdata_fixpoint.h" @@ -88,7 +87,7 @@ typedef struct cook { /* data buffers */ uint8_t* decoded_bytes_buffer; - REAL_T mono_mdct_output[2048] __attribute__ ((aligned(16))); //DECLARE_ALIGNED_16(float,mono_mdct_output[2048]); + REAL_T mono_mdct_output[2048] __attribute__ ((aligned(16))); REAL_T mono_previous_buffer1[1024]; REAL_T mono_previous_buffer2[1024]; REAL_T decode_buffer_1[1024]; -- cgit v1.2.3