mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-11 01:25:25 +00:00
b6cc1c77fd
* qatar/release/0.7: (84 commits) id3v2: fix skipping extended header in id3v2.4 Update RELEASE file for 0.7.5 lcl: use AVERROR_INVALIDDATA instead of AVERROR_UNKNOWN kgv1dec: Increase offsets array size so it is large enough. kgv1: use avctx->get/release_buffer(). kvmc: fix invalid reads nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). mjpegbdec: Fix overflow in SOS. shorten: Use separate pointers for the allocated memory for decoded samples. shorten: check for realloc failure (cherry picked from commit9e5e2c2d01
) atrac3: Fix crash in tonal component decoding. ws_snd1: Fix wrong samples count and crash. ws_snd: add some checks to prevent buffer overread or overwrite. (cherry picked from commit417364ce1f
) ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16. dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2 h264: stricter reference limit enforcement. jvdec: unbreak video decoding xxan: don't read before start of buffer in av_memcpy_backptr(). dsicinvideo: validate buffer offset before copying pixels. huffyuv: add padding to classic (v1) huffman tables. ... Conflicts: RELEASE libavcodec/atrac3.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/kgv1dec.c libavcodec/shorten.c libavcodec/svq3.c libavcodec/ws-snd1.c libavcodec/xxan.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
228 lines
9.9 KiB
C
228 lines
9.9 KiB
C
/*
|
|
* Copyright (C) 2001-2003 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include <inttypes.h>
|
|
#include "config.h"
|
|
#include "libswscale/swscale.h"
|
|
#include "libswscale/swscale_internal.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "libavutil/x86_cpu.h"
|
|
#include "libavutil/cpu.h"
|
|
#include "libavutil/pixdesc.h"
|
|
|
|
DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL;
|
|
DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, w02)= 0x0002000200020002LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, bm00001111)=0x00000000FFFFFFFFLL;
|
|
DECLARE_ASM_CONST(8, uint64_t, bm00000111)=0x0000000000FFFFFFLL;
|
|
DECLARE_ASM_CONST(8, uint64_t, bm11111000)=0xFFFFFFFFFF000000LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, bm01010101)=0x00FF00FF00FF00FFLL;
|
|
|
|
const DECLARE_ALIGNED(8, uint64_t, ff_dither4)[2] = {
|
|
0x0103010301030103LL,
|
|
0x0200020002000200LL,};
|
|
|
|
const DECLARE_ALIGNED(8, uint64_t, ff_dither8)[2] = {
|
|
0x0602060206020602LL,
|
|
0x0004000400040004LL,};
|
|
|
|
DECLARE_ASM_CONST(8, uint64_t, b16Mask)= 0x001F001F001F001FLL;
|
|
DECLARE_ASM_CONST(8, uint64_t, g16Mask)= 0x07E007E007E007E0LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, r16Mask)= 0xF800F800F800F800LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, b15Mask)= 0x001F001F001F001FLL;
|
|
DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL;
|
|
DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL;
|
|
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_M24A) = 0x00FF0000FF0000FFLL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_M24B) = 0xFF0000FF0000FF00LL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_M24C) = 0x0000FF0000FF0000LL;
|
|
|
|
#ifdef FAST_BGR2YV12
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff) = 0x000000210041000DULL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff) = 0x0000FFEEFFDC0038ULL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff) = 0x00000038FFD2FFF8ULL;
|
|
#else
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YCoeff) = 0x000020E540830C8BULL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UCoeff) = 0x0000ED0FDAC23831ULL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2VCoeff) = 0x00003831D0E6F6EAULL;
|
|
#endif /* FAST_BGR2YV12 */
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2YOffset) = 0x1010101010101010ULL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_bgr2UVOffset) = 0x8080808080808080ULL;
|
|
DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
|
|
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY1Coeff) = 0x0C88000040870C88ULL;
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toY2Coeff) = 0x20DE4087000020DEULL;
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY1Coeff) = 0x20DE0000408720DEULL;
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_rgb24toY2Coeff) = 0x0C88408700000C88ULL;
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toYOffset) = 0x0008010000080100ULL;
|
|
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUV)[2][4] = {
|
|
{0x38380000DAC83838ULL, 0xECFFDAC80000ECFFULL, 0xF6E40000D0E3F6E4ULL, 0x3838D0E300003838ULL},
|
|
{0xECFF0000DAC8ECFFULL, 0x3838DAC800003838ULL, 0x38380000D0E33838ULL, 0xF6E4D0E30000F6E4ULL},
|
|
};
|
|
|
|
DECLARE_ASM_CONST(8, uint64_t, ff_bgr24toUVOffset)= 0x0040010000400100ULL;
|
|
|
|
//MMX versions
|
|
#if HAVE_MMX
|
|
#undef RENAME
|
|
#define COMPILE_TEMPLATE_MMX2 0
|
|
#define RENAME(a) a ## _MMX
|
|
#include "swscale_template.c"
|
|
#endif
|
|
|
|
//MMX2 versions
|
|
#if HAVE_MMX2
|
|
#undef RENAME
|
|
#undef COMPILE_TEMPLATE_MMX2
|
|
#define COMPILE_TEMPLATE_MMX2 1
|
|
#define RENAME(a) a ## _MMX2
|
|
#include "swscale_template.c"
|
|
#endif
|
|
|
|
void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex,
|
|
int lastInLumBuf, int lastInChrBuf)
|
|
{
|
|
const int dstH= c->dstH;
|
|
const int flags= c->flags;
|
|
int16_t **lumPixBuf= c->lumPixBuf;
|
|
int16_t **chrUPixBuf= c->chrUPixBuf;
|
|
int16_t **alpPixBuf= c->alpPixBuf;
|
|
const int vLumBufSize= c->vLumBufSize;
|
|
const int vChrBufSize= c->vChrBufSize;
|
|
int16_t *vLumFilterPos= c->vLumFilterPos;
|
|
int16_t *vChrFilterPos= c->vChrFilterPos;
|
|
int16_t *vLumFilter= c->vLumFilter;
|
|
int16_t *vChrFilter= c->vChrFilter;
|
|
int32_t *lumMmxFilter= c->lumMmxFilter;
|
|
int32_t *chrMmxFilter= c->chrMmxFilter;
|
|
int32_t av_unused *alpMmxFilter= c->alpMmxFilter;
|
|
const int vLumFilterSize= c->vLumFilterSize;
|
|
const int vChrFilterSize= c->vChrFilterSize;
|
|
const int chrDstY= dstY>>c->chrDstVSubSample;
|
|
const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input
|
|
const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input
|
|
|
|
c->blueDither= ff_dither8[dstY&1];
|
|
if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555)
|
|
c->greenDither= ff_dither8[dstY&1];
|
|
else
|
|
c->greenDither= ff_dither4[dstY&1];
|
|
c->redDither= ff_dither8[(dstY+1)&1];
|
|
if (dstY < dstH - 2) {
|
|
const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
|
|
const int16_t **chrUSrcPtr= (const int16_t **) chrUPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
|
|
const int16_t **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL;
|
|
int i;
|
|
|
|
if (firstLumSrcY < 0 || firstLumSrcY + vLumFilterSize > c->srcH) {
|
|
const int16_t **tmpY = (const int16_t **) lumPixBuf + 2 * vLumBufSize;
|
|
int neg = -firstLumSrcY, i, end = FFMIN(c->srcH - firstLumSrcY, vLumFilterSize);
|
|
for (i = 0; i < neg; i++)
|
|
tmpY[i] = lumSrcPtr[neg];
|
|
for ( ; i < end; i++)
|
|
tmpY[i] = lumSrcPtr[i];
|
|
for ( ; i < vLumFilterSize; i++)
|
|
tmpY[i] = tmpY[i-1];
|
|
lumSrcPtr = tmpY;
|
|
|
|
if (alpSrcPtr) {
|
|
const int16_t **tmpA = (const int16_t **) alpPixBuf + 2 * vLumBufSize;
|
|
for (i = 0; i < neg; i++)
|
|
tmpA[i] = alpSrcPtr[neg];
|
|
for ( ; i < end; i++)
|
|
tmpA[i] = alpSrcPtr[i];
|
|
for ( ; i < vLumFilterSize; i++)
|
|
tmpA[i] = tmpA[i - 1];
|
|
alpSrcPtr = tmpA;
|
|
}
|
|
}
|
|
if (firstChrSrcY < 0 || firstChrSrcY + vChrFilterSize > c->chrSrcH) {
|
|
const int16_t **tmpU = (const int16_t **) chrUPixBuf + 2 * vChrBufSize;
|
|
int neg = -firstChrSrcY, i, end = FFMIN(c->chrSrcH - firstChrSrcY, vChrFilterSize);
|
|
for (i = 0; i < neg; i++) {
|
|
tmpU[i] = chrUSrcPtr[neg];
|
|
}
|
|
for ( ; i < end; i++) {
|
|
tmpU[i] = chrUSrcPtr[i];
|
|
}
|
|
for ( ; i < vChrFilterSize; i++) {
|
|
tmpU[i] = tmpU[i - 1];
|
|
}
|
|
chrUSrcPtr = tmpU;
|
|
}
|
|
|
|
if (flags & SWS_ACCURATE_RND) {
|
|
int s= APCK_SIZE / 8;
|
|
for (i=0; i<vLumFilterSize; i+=2) {
|
|
*(const void**)&lumMmxFilter[s*i ]= lumSrcPtr[i ];
|
|
*(const void**)&lumMmxFilter[s*i+APCK_PTR2/4 ]= lumSrcPtr[i+(vLumFilterSize>1)];
|
|
lumMmxFilter[s*i+APCK_COEF/4 ]=
|
|
lumMmxFilter[s*i+APCK_COEF/4+1]= vLumFilter[dstY*vLumFilterSize + i ]
|
|
+ (vLumFilterSize>1 ? vLumFilter[dstY*vLumFilterSize + i + 1]<<16 : 0);
|
|
if (CONFIG_SWSCALE_ALPHA && alpPixBuf) {
|
|
*(const void**)&alpMmxFilter[s*i ]= alpSrcPtr[i ];
|
|
*(const void**)&alpMmxFilter[s*i+APCK_PTR2/4 ]= alpSrcPtr[i+(vLumFilterSize>1)];
|
|
alpMmxFilter[s*i+APCK_COEF/4 ]=
|
|
alpMmxFilter[s*i+APCK_COEF/4+1]= lumMmxFilter[s*i+APCK_COEF/4 ];
|
|
}
|
|
}
|
|
for (i=0; i<vChrFilterSize; i+=2) {
|
|
*(const void**)&chrMmxFilter[s*i ]= chrUSrcPtr[i ];
|
|
*(const void**)&chrMmxFilter[s*i+APCK_PTR2/4 ]= chrUSrcPtr[i+(vChrFilterSize>1)];
|
|
chrMmxFilter[s*i+APCK_COEF/4 ]=
|
|
chrMmxFilter[s*i+APCK_COEF/4+1]= vChrFilter[chrDstY*vChrFilterSize + i ]
|
|
+ (vChrFilterSize>1 ? vChrFilter[chrDstY*vChrFilterSize + i + 1]<<16 : 0);
|
|
}
|
|
} else {
|
|
for (i=0; i<vLumFilterSize; i++) {
|
|
*(const void**)&lumMmxFilter[4*i+0]= lumSrcPtr[i];
|
|
lumMmxFilter[4*i+2]=
|
|
lumMmxFilter[4*i+3]=
|
|
((uint16_t)vLumFilter[dstY*vLumFilterSize + i])*0x10001;
|
|
if (CONFIG_SWSCALE_ALPHA && alpPixBuf) {
|
|
*(const void**)&alpMmxFilter[4*i+0]= alpSrcPtr[i];
|
|
alpMmxFilter[4*i+2]=
|
|
alpMmxFilter[4*i+3]= lumMmxFilter[4*i+2];
|
|
}
|
|
}
|
|
for (i=0; i<vChrFilterSize; i++) {
|
|
*(const void**)&chrMmxFilter[4*i+0]= chrUSrcPtr[i];
|
|
chrMmxFilter[4*i+2]=
|
|
chrMmxFilter[4*i+3]=
|
|
((uint16_t)vChrFilter[chrDstY*vChrFilterSize + i])*0x10001;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void ff_sws_init_swScale_mmx(SwsContext *c)
|
|
{
|
|
int cpu_flags = av_get_cpu_flags();
|
|
|
|
if (cpu_flags & AV_CPU_FLAG_MMX)
|
|
sws_init_swScale_MMX(c);
|
|
#if HAVE_MMX2
|
|
if (cpu_flags & AV_CPU_FLAG_MMX2)
|
|
sws_init_swScale_MMX2(c);
|
|
#endif
|
|
}
|