mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-22 14:26:52 +00:00
59eb12faff
* qatar/master: (30 commits) AVOptions: make default_val a union, as proposed in AVOption2. arm/h264pred: add missing argument type. h264dsp_mmx: place bracket outside #if/#endif block. lavf/utils: fix ff_interleave_compare_dts corner case. fate: add 10-bit H264 tests. h264: do not print "too many references" warning for intra-only. Enable decoding of high bit depth h264. Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. Add support for higher QP values in h264. Add the notion of pixel size in h264 related functions. Make the h264 loop filter bit depth aware. Template dsputil_template.c with respect to pixel size, etc. Template h264idct_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Move some functions in dsputil.c into a new file dsputil_template.c. Move the functions in h264idct into a new file h264idct_template.c. Move the functions in h264pred.c into a new file h264pred_template.c. Preparatory patch for high bit depth h264 decoding support. Add pixel formats for 9- and 10-bit yuv420p. Choose h264 chroma dc dequant function dynamically. ... Conflicts: doc/APIchanges ffmpeg.c ffplay.c libavcodec/alpha/dsputil_alpha.c libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/arm/dsputil_init_neon.c libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/h264pred_init_arm.c libavcodec/bfin/dsputil_bfin.c libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264dsp.c libavcodec/h264idct.c libavcodec/h264pred.c libavcodec/mlib/dsputil_mlib.c libavcodec/options.c libavcodec/ppc/dsputil_altivec.c libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/h264_altivec.c libavcodec/ps2/dsputil_mmi.c libavcodec/sh4/dsputil_align.c libavcodec/sh4/dsputil_sh4.c libavcodec/sparc/dsputil_vis.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/options.c libavformat/utils.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_template.c tests/ref/seek/lavf_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
81 lines
3.4 KiB
C
81 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
|
|
*
|
|
* 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 <stdint.h>
|
|
|
|
#include "libavcodec/h264pred.h"
|
|
|
|
void ff_pred16x16_vert_neon(uint8_t *src, int stride);
|
|
void ff_pred16x16_hor_neon(uint8_t *src, int stride);
|
|
void ff_pred16x16_plane_neon(uint8_t *src, int stride);
|
|
void ff_pred16x16_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred16x16_128_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred16x16_left_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred16x16_top_dc_neon(uint8_t *src, int stride);
|
|
|
|
void ff_pred8x8_vert_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_hor_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_plane_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_128_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_left_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_top_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_l0t_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_0lt_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride);
|
|
void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride);
|
|
|
|
static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth)
|
|
{
|
|
const int high_depth = bit_depth > 8;
|
|
|
|
if (high_depth)
|
|
return;
|
|
|
|
h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
|
|
h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
|
|
if (codec_id != CODEC_ID_VP8)
|
|
h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
|
|
h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon;
|
|
if (codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) {
|
|
h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon;
|
|
h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
|
|
h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
|
|
h->pred8x8[ALZHEIMER_DC_L0T_PRED8x8] = ff_pred8x8_l0t_dc_neon;
|
|
h->pred8x8[ALZHEIMER_DC_0LT_PRED8x8] = ff_pred8x8_0lt_dc_neon;
|
|
h->pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon;
|
|
h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon;
|
|
}
|
|
|
|
h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon;
|
|
h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vert_neon;
|
|
h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_hor_neon;
|
|
h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon;
|
|
h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
|
|
h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
|
|
if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8)
|
|
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
|
|
}
|
|
|
|
void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth)
|
|
{
|
|
if (HAVE_NEON) ff_h264_pred_init_neon(h, codec_id, bit_depth);
|
|
}
|