* qatar/master: (35 commits) flvdec: Do not call parse_keyframes_index with a NULL stream libspeexdec: include system headers before local headers libspeexdec: return meaningful error codes libspeexdec: cosmetics: reindent libspeexdec: decode one frame at a time. swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables() Move timefilter code from lavf to lavd. mov: add support for hdvd and pgapmetadata atoms mov: rename function _stik, some indentation cosmetics mov: rename function _int8 to remove ambiguity, some indentation cosmetics mov: parse the gnre atom mp3on4: check for allocation failures in decode_init_mp3on4() mp3on4: create a separate flush function for MP3onMP4. mp3on4: ensure that the frame channel count does not exceed the codec channel count. mp3on4: set channel layout mp3on4: fix the output channel order mp3on4: allocate temp buffer with av_malloc() instead of on the stack. mp3on4: copy MPADSPContext from first context to all contexts. fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm ... Conflicts: libavcodec/arm/h264dsp_init_arm.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_ps.c libavcodec/h264dsp_template.c libavcodec/h264idct_template.c libavcodec/h264pred.c libavcodec/h264pred_template.c libavcodec/x86/h264dsp_mmx.c libavdevice/Makefile libavdevice/jack_audio.c libavformat/Makefile libavformat/flvdec.c libavformat/flvenc.c libavutil/pixfmt.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			118 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			118 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
 | 
						|
 * Copyright (c) 2003-2010 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
 | 
						|
 */
 | 
						|
 | 
						|
/**
 | 
						|
 * @file
 | 
						|
 * H.264 / AVC / MPEG4 part10 DSP functions.
 | 
						|
 * @author Michael Niedermayer <michaelni@gmx.at>
 | 
						|
 */
 | 
						|
 | 
						|
#include <stdint.h>
 | 
						|
#include "avcodec.h"
 | 
						|
#include "h264dsp.h"
 | 
						|
 | 
						|
#define BIT_DEPTH 8
 | 
						|
#include "h264dsp_template.c"
 | 
						|
#undef BIT_DEPTH
 | 
						|
 | 
						|
#define BIT_DEPTH 9
 | 
						|
#include "h264dsp_template.c"
 | 
						|
#undef BIT_DEPTH
 | 
						|
 | 
						|
#define BIT_DEPTH 10
 | 
						|
#include "h264dsp_template.c"
 | 
						|
#undef BIT_DEPTH
 | 
						|
 | 
						|
void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
 | 
						|
{
 | 
						|
#undef FUNC
 | 
						|
#define FUNC(a, depth) a ## _ ## depth ## _c
 | 
						|
 | 
						|
#define H264_DSP(depth) \
 | 
						|
    c->h264_idct_add= FUNC(ff_h264_idct_add, depth);\
 | 
						|
    c->h264_idct8_add= FUNC(ff_h264_idct8_add, depth);\
 | 
						|
    c->h264_idct_dc_add= FUNC(ff_h264_idct_dc_add, depth);\
 | 
						|
    c->h264_idct8_dc_add= FUNC(ff_h264_idct8_dc_add, depth);\
 | 
						|
    c->h264_idct_add16     = FUNC(ff_h264_idct_add16, depth);\
 | 
						|
    c->h264_idct8_add4     = FUNC(ff_h264_idct8_add4, depth);\
 | 
						|
    if (chroma_format_idc == 1)\
 | 
						|
        c->h264_idct_add8  = FUNC(ff_h264_idct_add8, depth);\
 | 
						|
    else\
 | 
						|
        c->h264_idct_add8  = FUNC(ff_h264_idct_add8_422, depth);\
 | 
						|
    c->h264_idct_add16intra= FUNC(ff_h264_idct_add16intra, depth);\
 | 
						|
    c->h264_luma_dc_dequant_idct= FUNC(ff_h264_luma_dc_dequant_idct, depth);\
 | 
						|
    if (chroma_format_idc == 1)\
 | 
						|
        c->h264_chroma_dc_dequant_idct= FUNC(ff_h264_chroma_dc_dequant_idct, depth);\
 | 
						|
    else\
 | 
						|
        c->h264_chroma_dc_dequant_idct= FUNC(ff_h264_chroma422_dc_dequant_idct, depth);\
 | 
						|
\
 | 
						|
    c->weight_h264_pixels_tab[0]= FUNC(weight_h264_pixels16, depth);\
 | 
						|
    c->weight_h264_pixels_tab[1]= FUNC(weight_h264_pixels8, depth);\
 | 
						|
    c->weight_h264_pixels_tab[2]= FUNC(weight_h264_pixels4, depth);\
 | 
						|
    c->weight_h264_pixels_tab[3]= FUNC(weight_h264_pixels2, depth);\
 | 
						|
    c->biweight_h264_pixels_tab[0]= FUNC(biweight_h264_pixels16, depth);\
 | 
						|
    c->biweight_h264_pixels_tab[1]= FUNC(biweight_h264_pixels8, depth);\
 | 
						|
    c->biweight_h264_pixels_tab[2]= FUNC(biweight_h264_pixels4, depth);\
 | 
						|
    c->biweight_h264_pixels_tab[3]= FUNC(biweight_h264_pixels2, depth);\
 | 
						|
\
 | 
						|
    c->h264_v_loop_filter_luma= FUNC(h264_v_loop_filter_luma, depth);\
 | 
						|
    c->h264_h_loop_filter_luma= FUNC(h264_h_loop_filter_luma, depth);\
 | 
						|
    c->h264_h_loop_filter_luma_mbaff= FUNC(h264_h_loop_filter_luma_mbaff, depth);\
 | 
						|
    c->h264_v_loop_filter_luma_intra= FUNC(h264_v_loop_filter_luma_intra, depth);\
 | 
						|
    c->h264_h_loop_filter_luma_intra= FUNC(h264_h_loop_filter_luma_intra, depth);\
 | 
						|
    c->h264_h_loop_filter_luma_mbaff_intra= FUNC(h264_h_loop_filter_luma_mbaff_intra, depth);\
 | 
						|
    c->h264_v_loop_filter_chroma= FUNC(h264_v_loop_filter_chroma, depth);\
 | 
						|
    if (chroma_format_idc == 1)\
 | 
						|
        c->h264_h_loop_filter_chroma= FUNC(h264_h_loop_filter_chroma, depth);\
 | 
						|
    else\
 | 
						|
        c->h264_h_loop_filter_chroma= FUNC(h264_h_loop_filter_chroma422, depth);\
 | 
						|
    if (chroma_format_idc == 1)\
 | 
						|
        c->h264_h_loop_filter_chroma_mbaff= FUNC(h264_h_loop_filter_chroma_mbaff, depth);\
 | 
						|
    else\
 | 
						|
        c->h264_h_loop_filter_chroma_mbaff= FUNC(h264_h_loop_filter_chroma422_mbaff, depth);\
 | 
						|
    c->h264_v_loop_filter_chroma_intra= FUNC(h264_v_loop_filter_chroma_intra, depth);\
 | 
						|
    if (chroma_format_idc == 1)\
 | 
						|
        c->h264_h_loop_filter_chroma_intra= FUNC(h264_h_loop_filter_chroma_intra, depth);\
 | 
						|
    else\
 | 
						|
        c->h264_h_loop_filter_chroma_intra= FUNC(h264_h_loop_filter_chroma422_intra, depth);\
 | 
						|
    if (chroma_format_idc == 1)\
 | 
						|
        c->h264_h_loop_filter_chroma_mbaff_intra= FUNC(h264_h_loop_filter_chroma_mbaff_intra, depth);\
 | 
						|
    else\
 | 
						|
        c->h264_h_loop_filter_chroma_mbaff_intra= FUNC(h264_h_loop_filter_chroma422_mbaff_intra, depth);\
 | 
						|
    c->h264_loop_filter_strength= NULL;
 | 
						|
 | 
						|
    switch (bit_depth) {
 | 
						|
    case 9:
 | 
						|
        H264_DSP(9);
 | 
						|
        break;
 | 
						|
    case 10:
 | 
						|
        H264_DSP(10);
 | 
						|
        break;
 | 
						|
    default:
 | 
						|
        H264_DSP(8);
 | 
						|
        break;
 | 
						|
    }
 | 
						|
 | 
						|
    if (ARCH_ARM) ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc);
 | 
						|
    if (HAVE_ALTIVEC) ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc);
 | 
						|
    if (HAVE_MMX) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc);
 | 
						|
}
 |