From 153f31b1af5efb8799bce15508531af84dd6269d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 2 May 2013 16:46:51 +0200 Subject: [PATCH 1/2] cavs: Remove cavsdata.h header, unused since 88386feefd --- libavcodec/cavsdata.h | 67 ------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 libavcodec/cavsdata.h diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h deleted file mode 100644 index b6117e3436..0000000000 --- a/libavcodec/cavsdata.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Chinese AVS video (AVS1-P2, JiZhun profile) decoder. - * Copyright (c) 2006 Stefan Gehrer - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_CAVSDATA_H -#define AVCODEC_CAVSDATA_H - -#include "cavs.h" - -const uint8_t ff_cavs_partition_flags[30] = { - 0, //I_8X8 - 0, //P_SKIP - 0, //P_16X16 - SPLITH, //P_16X8 - SPLITV, //P_8X16 - SPLITH|SPLITV, //P_8X8 - SPLITH|SPLITV, //B_SKIP - SPLITH|SPLITV, //B_DIRECT - 0, //B_FWD_16X16 - 0, //B_BWD_16X16 - 0, //B_SYM_16X16 - FWD0|FWD1 |SPLITH, - FWD0|FWD1 |SPLITV, - BWD0|BWD1 |SPLITH, - BWD0|BWD1 |SPLITV, - FWD0|BWD1 |SPLITH, - FWD0|BWD1 |SPLITV, - BWD0|FWD1 |SPLITH, - BWD0|FWD1 |SPLITV, - FWD0|FWD1 |SYM1|SPLITH, - FWD0|FWD1 |SYM1 |SPLITV, - BWD0|FWD1 |SYM1|SPLITH, - BWD0|FWD1 |SYM1 |SPLITV, - FWD0|FWD1|SYM0 |SPLITH, - FWD0|FWD1|SYM0 |SPLITV, - FWD0|BWD1|SYM0 |SPLITH, - FWD0|BWD1|SYM0 |SPLITV, - FWD0|FWD1|SYM0|SYM1|SPLITH, - FWD0|FWD1|SYM0|SYM1 |SPLITV, - SPLITH|SPLITV, //B_8X8 = 29 -}; - -/** mark block as "no prediction from this direction" - e.g. forward motion vector in BWD partition */ -const cavs_vector ff_cavs_dir_mv = {0,0,1,REF_DIR}; - -/** mark block as using intra prediction */ -const cavs_vector ff_cavs_intra_mv = {0,0,1,REF_INTRA}; - -#endif /* AVCODEC_CAVSDATA_H */ From 6b753015ca6f93d16a05e1a97da1fa42e4da60ec Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 2 May 2013 16:55:59 +0200 Subject: [PATCH 2/2] aac: Remove aacpsy.h header, unused since 78e65cd7726 --- libavcodec/aacpsy.h | 50 --------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 libavcodec/aacpsy.h diff --git a/libavcodec/aacpsy.h b/libavcodec/aacpsy.h deleted file mode 100644 index 5d1e14220c..0000000000 --- a/libavcodec/aacpsy.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * AAC encoder psychoacoustic model - * Copyright (C) 2008 Konstantin Shishkov - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_AACPSY_H -#define AVCODEC_AACPSY_H - -#include "avcodec.h" -#include "aac.h" -//#include "lowpass.h" - -enum AACPsyModelType{ - AAC_PSY_TEST, ///< a sample model to exercise encoder - AAC_PSY_3GPP, ///< model following recommendations from 3GPP TS 26.403 - - AAC_NB_PSY_MODELS ///< total number of psychoacoustic models, since it's not a part of the ABI new models can be added freely -}; - -/** - * context used by psychoacoustic model - */ -typedef struct AACPsyContext { - AVCodecContext *avctx; ///< encoder context -}AACPsyContext; - -/** - * Cleanup model context at the end. - * - * @param ctx model context - */ -void ff_aac_psy_end(AACPsyContext *ctx); - -#endif /* AVCODEC_AACPSY_H */