← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavcodec/arm/mpegvideo_arm.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/arm/mpegvideo_arm.c
18
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
19
 */
20
20
 
 
21
#include "libavutil/internal.h"
21
22
#include "libavutil/arm/cpu.h"
22
23
#include "libavcodec/avcodec.h"
23
24
#include "libavcodec/mpegvideo.h"
25
26
#include "asm-offsets.h"
26
27
 
27
28
#if HAVE_NEON
28
 
CHK_OFFS(MpegEncContext, y_dc_scale,       Y_DC_SCALE);
29
 
CHK_OFFS(MpegEncContext, c_dc_scale,       C_DC_SCALE);
30
 
CHK_OFFS(MpegEncContext, ac_pred,          AC_PRED);
31
 
CHK_OFFS(MpegEncContext, block_last_index, BLOCK_LAST_INDEX);
32
 
CHK_OFFS(MpegEncContext, inter_scantable.raster_end, INTER_SCANTAB_RASTER_END);
33
 
CHK_OFFS(MpegEncContext, h263_aic,         H263_AIC);
 
29
AV_CHECK_OFFSET(MpegEncContext, y_dc_scale,       Y_DC_SCALE);
 
30
AV_CHECK_OFFSET(MpegEncContext, c_dc_scale,       C_DC_SCALE);
 
31
AV_CHECK_OFFSET(MpegEncContext, ac_pred,          AC_PRED);
 
32
AV_CHECK_OFFSET(MpegEncContext, block_last_index, BLOCK_LAST_INDEX);
 
33
AV_CHECK_OFFSET(MpegEncContext, inter_scantable.raster_end,
 
34
                INTER_SCANTAB_RASTER_END);
 
35
AV_CHECK_OFFSET(MpegEncContext, h263_aic,         H263_AIC);
34
36
#endif
35
37
 
36
38
void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block,
38
40
void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, int16_t *block,
39
41
                                       int n, int qscale);
40
42
 
41
 
av_cold void ff_MPV_common_init_arm(MpegEncContext *s)
 
43
av_cold void ff_mpv_common_init_arm(MpegEncContext *s)
42
44
{
43
45
    int cpu_flags = av_get_cpu_flags();
44
46
 
45
47
    if (have_armv5te(cpu_flags))
46
 
        ff_MPV_common_init_armv5te(s);
 
48
        ff_mpv_common_init_armv5te(s);
47
49
 
48
50
    if (have_neon(cpu_flags)) {
49
51
        s->dct_unquantize_h263_intra = ff_dct_unquantize_h263_intra_neon;