2010-05-18 17:58:33 +02:00
|
|
|
/*
|
2010-09-09 14:16:39 +02:00
|
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
2010-05-18 17:58:33 +02:00
|
|
|
*
|
2010-06-18 18:39:21 +02:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
2010-06-04 22:19:40 +02:00
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
2010-06-18 18:39:21 +02:00
|
|
|
* in the file PATENTS. All contributing project authors may
|
2010-06-04 22:19:40 +02:00
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2010-05-18 17:58:33 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/onyxc_int.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#if CONFIG_POSTPROC
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/postproc.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/onyxd.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "onyxd_int.h"
|
|
|
|
|
#include "vpx_mem/vpx_mem.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/alloccommon.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "vpx_scale/yv12extend.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/loopfilter.h"
|
|
|
|
|
#include "vp8/common/swapyv12buffer.h"
|
|
|
|
|
#include "vp8/common/g_common.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include <stdio.h>
|
2011-06-01 21:41:12 +02:00
|
|
|
#include <assert.h>
|
2010-08-11 17:02:31 +02:00
|
|
|
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/quant_common.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "vpx_scale/vpxscale.h"
|
2011-02-10 20:41:38 +01:00
|
|
|
#include "vp8/common/systemdependent.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#include "vpx_ports/vpx_timer.h"
|
2010-08-12 15:05:37 +02:00
|
|
|
#include "detokenize.h"
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if ARCH_ARM
|
|
|
|
|
#include "vpx_ports/arm.h"
|
|
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
extern void vp8_init_loop_filter(VP8_COMMON *cm);
|
|
|
|
|
extern void vp8cx_init_de_quantizer(VP8D_COMP *pbi);
|
2011-05-23 13:47:33 +02:00
|
|
|
static int get_free_fb (VP8_COMMON *cm);
|
|
|
|
|
static void ref_cnt_fb (int *buf, int *idx, int new_idx);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-02-14 23:18:18 +01:00
|
|
|
#if CONFIG_DEBUG
|
|
|
|
|
void vp8_recon_write_yuv_frame(char *name, YV12_BUFFER_CONFIG *s)
|
|
|
|
|
{
|
|
|
|
|
FILE *yuv_file = fopen((char *)name, "ab");
|
|
|
|
|
unsigned char *src = s->y_buffer;
|
|
|
|
|
int h = s->y_height;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
fwrite(src, s->y_width, 1, yuv_file);
|
|
|
|
|
src += s->y_stride;
|
|
|
|
|
}
|
|
|
|
|
while (--h);
|
|
|
|
|
|
|
|
|
|
src = s->u_buffer;
|
|
|
|
|
h = s->uv_height;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
fwrite(src, s->uv_width, 1, yuv_file);
|
|
|
|
|
src += s->uv_stride;
|
|
|
|
|
}
|
|
|
|
|
while (--h);
|
|
|
|
|
|
|
|
|
|
src = s->v_buffer;
|
|
|
|
|
h = s->uv_height;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
fwrite(src, s->uv_width, 1, yuv_file);
|
|
|
|
|
src += s->uv_stride;
|
|
|
|
|
}
|
|
|
|
|
while (--h);
|
|
|
|
|
|
|
|
|
|
fclose(yuv_file);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2011-12-01 01:36:46 +01:00
|
|
|
//#define WRITE_RECON_BUFFER 1
|
2011-11-16 01:16:30 +01:00
|
|
|
#if WRITE_RECON_BUFFER
|
|
|
|
|
void write_dx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
// write the frame
|
|
|
|
|
FILE *yframe;
|
|
|
|
|
int i;
|
|
|
|
|
char filename[255];
|
|
|
|
|
|
|
|
|
|
sprintf(filename, "dx\\y%04d.raw", this_frame);
|
|
|
|
|
yframe = fopen(filename, "wb");
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < frame->y_height; i++)
|
2011-12-01 01:36:46 +01:00
|
|
|
fwrite(frame->y_buffer + i * frame->y_stride,
|
|
|
|
|
frame->y_width, 1, yframe);
|
2011-11-16 01:16:30 +01:00
|
|
|
|
|
|
|
|
fclose(yframe);
|
|
|
|
|
sprintf(filename, "dx\\u%04d.raw", this_frame);
|
|
|
|
|
yframe = fopen(filename, "wb");
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < frame->uv_height; i++)
|
2011-12-01 01:36:46 +01:00
|
|
|
fwrite(frame->u_buffer + i * frame->uv_stride,
|
|
|
|
|
frame->uv_width, 1, yframe);
|
2011-11-16 01:16:30 +01:00
|
|
|
|
|
|
|
|
fclose(yframe);
|
|
|
|
|
sprintf(filename, "dx\\v%04d.raw", this_frame);
|
|
|
|
|
yframe = fopen(filename, "wb");
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < frame->uv_height; i++)
|
2011-12-01 01:36:46 +01:00
|
|
|
fwrite(frame->v_buffer + i * frame->uv_stride,
|
|
|
|
|
frame->uv_width, 1, yframe);
|
2011-11-16 01:16:30 +01:00
|
|
|
|
|
|
|
|
fclose(yframe);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
void vp8dx_initialize()
|
|
|
|
|
{
|
|
|
|
|
static int init_done = 0;
|
|
|
|
|
|
|
|
|
|
if (!init_done)
|
|
|
|
|
{
|
|
|
|
|
vp8_initialize_common();
|
2011-12-02 15:57:21 +01:00
|
|
|
vp8_init_quant_tables();
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_scale_machine_specific_config();
|
|
|
|
|
init_done = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf)
|
|
|
|
|
{
|
|
|
|
|
VP8D_COMP *pbi = vpx_memalign(32, sizeof(VP8D_COMP));
|
|
|
|
|
|
|
|
|
|
if (!pbi)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
vpx_memset(pbi, 0, sizeof(VP8D_COMP));
|
|
|
|
|
|
|
|
|
|
if (setjmp(pbi->common.error.jmp))
|
|
|
|
|
{
|
|
|
|
|
pbi->common.error.setjmp = 0;
|
|
|
|
|
vp8dx_remove_decompressor(pbi);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pbi->common.error.setjmp = 1;
|
|
|
|
|
vp8dx_initialize();
|
|
|
|
|
|
|
|
|
|
vp8_create_common(&pbi->common);
|
|
|
|
|
vp8_dmachine_specific_config(pbi);
|
|
|
|
|
|
|
|
|
|
pbi->common.current_video_frame = 0;
|
|
|
|
|
pbi->ready_for_new_data = 1;
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* vp8cx_init_de_quantizer() is first called here. Add check in frame_init_dequantizer() to avoid
|
|
|
|
|
* unnecessary calling of vp8cx_init_de_quantizer() for every frame.
|
|
|
|
|
*/
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8cx_init_de_quantizer(pbi);
|
|
|
|
|
|
2011-07-20 21:53:42 +02:00
|
|
|
vp8_loop_filter_init(&pbi->common);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
pbi->common.error.setjmp = 0;
|
2011-05-02 15:30:51 +02:00
|
|
|
|
2011-08-08 10:56:20 +02:00
|
|
|
pbi->decoded_key_frame = 0;
|
2011-05-02 15:30:51 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
return (VP8D_PTR) pbi;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void vp8dx_remove_decompressor(VP8D_PTR ptr)
|
|
|
|
|
{
|
|
|
|
|
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
|
|
|
|
|
|
|
|
|
|
if (!pbi)
|
|
|
|
|
return;
|
2011-11-15 17:15:23 +01:00
|
|
|
|
|
|
|
|
// Delete sementation map
|
2012-01-27 19:29:07 +01:00
|
|
|
if (pbi->common.last_frame_seg_map != 0)
|
|
|
|
|
vpx_free(pbi->common.last_frame_seg_map);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
vp8_remove_common(&pbi->common);
|
2011-06-14 02:29:49 +02:00
|
|
|
vpx_free(pbi->mbc);
|
2010-05-18 17:58:33 +02:00
|
|
|
vpx_free(pbi);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-06-22 18:41:17 +02:00
|
|
|
vpx_codec_err_t vp8dx_get_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
|
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
|
|
|
|
|
VP8_COMMON *cm = &pbi->common;
|
2010-07-22 14:07:32 +02:00
|
|
|
int ref_fb_idx;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
if (ref_frame_flag == VP8_LAST_FLAG)
|
2010-07-22 14:07:32 +02:00
|
|
|
ref_fb_idx = cm->lst_fb_idx;
|
2010-05-18 17:58:33 +02:00
|
|
|
else if (ref_frame_flag == VP8_GOLD_FLAG)
|
2010-07-22 14:07:32 +02:00
|
|
|
ref_fb_idx = cm->gld_fb_idx;
|
2010-05-18 17:58:33 +02:00
|
|
|
else if (ref_frame_flag == VP8_ALT_FLAG)
|
2010-07-22 14:07:32 +02:00
|
|
|
ref_fb_idx = cm->alt_fb_idx;
|
2011-06-22 18:41:17 +02:00
|
|
|
else{
|
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_ERROR,
|
|
|
|
|
"Invalid reference frame");
|
|
|
|
|
return pbi->common.error.error_code;
|
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-06-22 18:41:17 +02:00
|
|
|
if(cm->yv12_fb[ref_fb_idx].y_height != sd->y_height ||
|
|
|
|
|
cm->yv12_fb[ref_fb_idx].y_width != sd->y_width ||
|
|
|
|
|
cm->yv12_fb[ref_fb_idx].uv_height != sd->uv_height ||
|
|
|
|
|
cm->yv12_fb[ref_fb_idx].uv_width != sd->uv_width){
|
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_ERROR,
|
|
|
|
|
"Incorrect buffer dimensions");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
vp8_yv12_copy_frame_ptr(&cm->yv12_fb[ref_fb_idx], sd);
|
2010-07-22 14:07:32 +02:00
|
|
|
|
2011-06-22 18:41:17 +02:00
|
|
|
return pbi->common.error.error_code;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2011-03-17 22:07:59 +01:00
|
|
|
|
|
|
|
|
|
2011-06-22 18:41:17 +02:00
|
|
|
vpx_codec_err_t vp8dx_set_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
|
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
|
|
|
|
|
VP8_COMMON *cm = &pbi->common;
|
2011-05-23 13:47:33 +02:00
|
|
|
int *ref_fb_ptr = NULL;
|
|
|
|
|
int free_fb;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
if (ref_frame_flag == VP8_LAST_FLAG)
|
2011-06-01 21:41:12 +02:00
|
|
|
ref_fb_ptr = &cm->lst_fb_idx;
|
2010-05-18 17:58:33 +02:00
|
|
|
else if (ref_frame_flag == VP8_GOLD_FLAG)
|
2011-06-01 21:41:12 +02:00
|
|
|
ref_fb_ptr = &cm->gld_fb_idx;
|
2010-05-18 17:58:33 +02:00
|
|
|
else if (ref_frame_flag == VP8_ALT_FLAG)
|
2011-06-01 21:41:12 +02:00
|
|
|
ref_fb_ptr = &cm->alt_fb_idx;
|
2011-06-22 18:41:17 +02:00
|
|
|
else{
|
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_ERROR,
|
|
|
|
|
"Invalid reference frame");
|
|
|
|
|
return pbi->common.error.error_code;
|
|
|
|
|
}
|
2011-05-23 13:47:33 +02:00
|
|
|
|
2011-06-22 18:41:17 +02:00
|
|
|
if(cm->yv12_fb[*ref_fb_ptr].y_height != sd->y_height ||
|
|
|
|
|
cm->yv12_fb[*ref_fb_ptr].y_width != sd->y_width ||
|
|
|
|
|
cm->yv12_fb[*ref_fb_ptr].uv_height != sd->uv_height ||
|
|
|
|
|
cm->yv12_fb[*ref_fb_ptr].uv_width != sd->uv_width){
|
|
|
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_ERROR,
|
|
|
|
|
"Incorrect buffer dimensions");
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
/* Find an empty frame buffer. */
|
|
|
|
|
free_fb = get_free_fb(cm);
|
|
|
|
|
/* Decrease fb_idx_ref_cnt since it will be increased again in
|
|
|
|
|
* ref_cnt_fb() below. */
|
|
|
|
|
cm->fb_idx_ref_cnt[free_fb]--;
|
|
|
|
|
|
|
|
|
|
/* Manage the reference counters and copy image. */
|
|
|
|
|
ref_cnt_fb (cm->fb_idx_ref_cnt, ref_fb_ptr, free_fb);
|
|
|
|
|
vp8_yv12_copy_frame_ptr(sd, &cm->yv12_fb[*ref_fb_ptr]);
|
|
|
|
|
}
|
2010-07-22 14:07:32 +02:00
|
|
|
|
2011-06-22 18:41:17 +02:00
|
|
|
return pbi->common.error.error_code;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/*For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.*/
|
2010-05-18 17:58:33 +02:00
|
|
|
#if HAVE_ARMV7
|
2011-07-26 03:44:59 +02:00
|
|
|
extern void vp8_push_neon(int64_t *store);
|
|
|
|
|
extern void vp8_pop_neon(int64_t *store);
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
2010-07-22 14:07:32 +02:00
|
|
|
|
|
|
|
|
static int get_free_fb (VP8_COMMON *cm)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < NUM_YV12_BUFFERS; i++)
|
|
|
|
|
if (cm->fb_idx_ref_cnt[i] == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
2011-06-01 21:41:12 +02:00
|
|
|
assert(i < NUM_YV12_BUFFERS);
|
2010-07-22 14:07:32 +02:00
|
|
|
cm->fb_idx_ref_cnt[i] = 1;
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ref_cnt_fb (int *buf, int *idx, int new_idx)
|
|
|
|
|
{
|
|
|
|
|
if (buf[*idx] > 0)
|
|
|
|
|
buf[*idx]--;
|
|
|
|
|
|
|
|
|
|
*idx = new_idx;
|
|
|
|
|
|
|
|
|
|
buf[new_idx]++;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* If any buffer copy / swapping is signalled it should be done here. */
|
2010-07-22 14:07:32 +02:00
|
|
|
static int swap_frame_buffers (VP8_COMMON *cm)
|
|
|
|
|
{
|
fix last frame buffer copy logic regression
Commit 0ce3901 introduced a change in the frame buffer copy logic where
the NEW frame could be copied to the ARF or GF buffer through the
copy_buffer_to_{arf,gf}==1 flags, if the LAST frame was not being
refreshed. This is not correct. The intent of the
copy_buffer_to_{arf,gf}==1 flag is to copy the LAST buffer. To copy the
NEW buffer, the refresh_{alt_ref,golden}_frame flag should be used.
The original buffer copy logic is fairly convoluted. For example:
if (cm->refresh_last_frame)
{
vp8_swap_yv12_buffer(&cm->last_frame, &cm->new_frame);
cm->frame_to_show = &cm->last_frame;
}
else
{
cm->frame_to_show = &cm->new_frame;
}
...
if (cm->copy_buffer_to_arf)
{
if (cm->copy_buffer_to_arf == 1)
{
if (cm->refresh_last_frame)
vp8_yv12_copy_frame_ptr(&cm->new_frame, &cm->alt_ref_frame);
else
vp8_yv12_copy_frame_ptr(&cm->last_frame, &cm->alt_ref_frame);
}
else if (cm->copy_buffer_to_arf == 2)
vp8_yv12_copy_frame_ptr(&cm->golden_frame, &cm->alt_ref_frame);
}
Effectively, if refresh_last_frame, then new and last are swapped, so
when "new" is copied to ARF, it's equivalent to copying LAST to ARF. If
not refresh_last_frame, then LAST is copied to ARF. So LAST is copied to
ARF in both cases.
Commit 0ce3901 removed the first buffer swap but kept the
refresh_last_frame?new:last behavior, changing the sense since the first
swap wasn't done to the more readable refresh_last_frame?last:new, but
this logic is not correct when !refresh_last_frame.
This commit restores the correct behavior from v0.9.1 and prior. This
case is missing from the test vector set.
Change-Id: I8369fc13a37ae882e31a8a104da808a08bc8428f
2011-01-06 19:07:39 +01:00
|
|
|
int err = 0;
|
2010-07-22 14:07:32 +02:00
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* The alternate reference frame or golden frame can be updated
|
|
|
|
|
* using the new, last, or golden/alt ref frame. If it
|
|
|
|
|
* is updated using the newly decoded frame it is a refresh.
|
|
|
|
|
* An update using the last or golden/alt ref frame is a copy.
|
|
|
|
|
*/
|
2010-07-22 14:07:32 +02:00
|
|
|
if (cm->copy_buffer_to_arf)
|
|
|
|
|
{
|
|
|
|
|
int new_fb = 0;
|
|
|
|
|
|
|
|
|
|
if (cm->copy_buffer_to_arf == 1)
|
fix last frame buffer copy logic regression
Commit 0ce3901 introduced a change in the frame buffer copy logic where
the NEW frame could be copied to the ARF or GF buffer through the
copy_buffer_to_{arf,gf}==1 flags, if the LAST frame was not being
refreshed. This is not correct. The intent of the
copy_buffer_to_{arf,gf}==1 flag is to copy the LAST buffer. To copy the
NEW buffer, the refresh_{alt_ref,golden}_frame flag should be used.
The original buffer copy logic is fairly convoluted. For example:
if (cm->refresh_last_frame)
{
vp8_swap_yv12_buffer(&cm->last_frame, &cm->new_frame);
cm->frame_to_show = &cm->last_frame;
}
else
{
cm->frame_to_show = &cm->new_frame;
}
...
if (cm->copy_buffer_to_arf)
{
if (cm->copy_buffer_to_arf == 1)
{
if (cm->refresh_last_frame)
vp8_yv12_copy_frame_ptr(&cm->new_frame, &cm->alt_ref_frame);
else
vp8_yv12_copy_frame_ptr(&cm->last_frame, &cm->alt_ref_frame);
}
else if (cm->copy_buffer_to_arf == 2)
vp8_yv12_copy_frame_ptr(&cm->golden_frame, &cm->alt_ref_frame);
}
Effectively, if refresh_last_frame, then new and last are swapped, so
when "new" is copied to ARF, it's equivalent to copying LAST to ARF. If
not refresh_last_frame, then LAST is copied to ARF. So LAST is copied to
ARF in both cases.
Commit 0ce3901 removed the first buffer swap but kept the
refresh_last_frame?new:last behavior, changing the sense since the first
swap wasn't done to the more readable refresh_last_frame?last:new, but
this logic is not correct when !refresh_last_frame.
This commit restores the correct behavior from v0.9.1 and prior. This
case is missing from the test vector set.
Change-Id: I8369fc13a37ae882e31a8a104da808a08bc8428f
2011-01-06 19:07:39 +01:00
|
|
|
new_fb = cm->lst_fb_idx;
|
2010-07-22 14:07:32 +02:00
|
|
|
else if (cm->copy_buffer_to_arf == 2)
|
|
|
|
|
new_fb = cm->gld_fb_idx;
|
|
|
|
|
else
|
|
|
|
|
err = -1;
|
|
|
|
|
|
|
|
|
|
ref_cnt_fb (cm->fb_idx_ref_cnt, &cm->alt_fb_idx, new_fb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cm->copy_buffer_to_gf)
|
|
|
|
|
{
|
|
|
|
|
int new_fb = 0;
|
|
|
|
|
|
|
|
|
|
if (cm->copy_buffer_to_gf == 1)
|
fix last frame buffer copy logic regression
Commit 0ce3901 introduced a change in the frame buffer copy logic where
the NEW frame could be copied to the ARF or GF buffer through the
copy_buffer_to_{arf,gf}==1 flags, if the LAST frame was not being
refreshed. This is not correct. The intent of the
copy_buffer_to_{arf,gf}==1 flag is to copy the LAST buffer. To copy the
NEW buffer, the refresh_{alt_ref,golden}_frame flag should be used.
The original buffer copy logic is fairly convoluted. For example:
if (cm->refresh_last_frame)
{
vp8_swap_yv12_buffer(&cm->last_frame, &cm->new_frame);
cm->frame_to_show = &cm->last_frame;
}
else
{
cm->frame_to_show = &cm->new_frame;
}
...
if (cm->copy_buffer_to_arf)
{
if (cm->copy_buffer_to_arf == 1)
{
if (cm->refresh_last_frame)
vp8_yv12_copy_frame_ptr(&cm->new_frame, &cm->alt_ref_frame);
else
vp8_yv12_copy_frame_ptr(&cm->last_frame, &cm->alt_ref_frame);
}
else if (cm->copy_buffer_to_arf == 2)
vp8_yv12_copy_frame_ptr(&cm->golden_frame, &cm->alt_ref_frame);
}
Effectively, if refresh_last_frame, then new and last are swapped, so
when "new" is copied to ARF, it's equivalent to copying LAST to ARF. If
not refresh_last_frame, then LAST is copied to ARF. So LAST is copied to
ARF in both cases.
Commit 0ce3901 removed the first buffer swap but kept the
refresh_last_frame?new:last behavior, changing the sense since the first
swap wasn't done to the more readable refresh_last_frame?last:new, but
this logic is not correct when !refresh_last_frame.
This commit restores the correct behavior from v0.9.1 and prior. This
case is missing from the test vector set.
Change-Id: I8369fc13a37ae882e31a8a104da808a08bc8428f
2011-01-06 19:07:39 +01:00
|
|
|
new_fb = cm->lst_fb_idx;
|
2010-07-22 14:07:32 +02:00
|
|
|
else if (cm->copy_buffer_to_gf == 2)
|
|
|
|
|
new_fb = cm->alt_fb_idx;
|
|
|
|
|
else
|
|
|
|
|
err = -1;
|
|
|
|
|
|
|
|
|
|
ref_cnt_fb (cm->fb_idx_ref_cnt, &cm->gld_fb_idx, new_fb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cm->refresh_golden_frame)
|
|
|
|
|
ref_cnt_fb (cm->fb_idx_ref_cnt, &cm->gld_fb_idx, cm->new_fb_idx);
|
|
|
|
|
|
|
|
|
|
if (cm->refresh_alt_ref_frame)
|
|
|
|
|
ref_cnt_fb (cm->fb_idx_ref_cnt, &cm->alt_fb_idx, cm->new_fb_idx);
|
|
|
|
|
|
|
|
|
|
if (cm->refresh_last_frame)
|
|
|
|
|
{
|
|
|
|
|
ref_cnt_fb (cm->fb_idx_ref_cnt, &cm->lst_fb_idx, cm->new_fb_idx);
|
|
|
|
|
|
|
|
|
|
cm->frame_to_show = &cm->yv12_fb[cm->lst_fb_idx];
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
cm->frame_to_show = &cm->yv12_fb[cm->new_fb_idx];
|
|
|
|
|
|
|
|
|
|
cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-14 23:18:18 +01:00
|
|
|
/*
|
|
|
|
|
static void vp8_print_yuv_rec_mb(VP8_COMMON *cm, int mb_row, int mb_col)
|
|
|
|
|
{
|
|
|
|
|
YV12_BUFFER_CONFIG *s = cm->frame_to_show;
|
|
|
|
|
unsigned char *src = s->y_buffer;
|
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
|
|
printf("After loop filter\n");
|
|
|
|
|
for (i=0;i<16;i++) {
|
|
|
|
|
for (j=0;j<16;j++)
|
|
|
|
|
printf("%3d ", src[(mb_row*16+i)*s->y_stride + mb_col*16+j]);
|
|
|
|
|
printf("\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
2011-07-26 03:44:59 +02:00
|
|
|
int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, int64_t time_stamp)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if HAVE_ARMV7
|
2011-07-26 03:44:59 +02:00
|
|
|
int64_t dx_store_reg[8];
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
|
|
|
|
|
VP8_COMMON *cm = &pbi->common;
|
|
|
|
|
int retcode = 0;
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/*if(pbi->ready_for_new_data == 0)
|
|
|
|
|
return -1;*/
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
if (ptr == 0)
|
|
|
|
|
{
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pbi->common.error.error_code = VPX_CODEC_OK;
|
|
|
|
|
|
2012-02-27 23:23:38 +01:00
|
|
|
pbi->Source = source;
|
|
|
|
|
pbi->source_sz = size;
|
|
|
|
|
|
|
|
|
|
if (pbi->source_sz == 0)
|
2010-12-16 16:46:31 +01:00
|
|
|
{
|
2012-02-27 23:23:38 +01:00
|
|
|
/* This is used to signal that we are missing frames.
|
|
|
|
|
* We do not know if the missing frame(s) was supposed to update
|
|
|
|
|
* any of the reference buffers, but we act conservative and
|
|
|
|
|
* mark only the last buffer as corrupted.
|
|
|
|
|
*/
|
|
|
|
|
cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;
|
2010-12-16 16:46:31 +01:00
|
|
|
}
|
|
|
|
|
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if HAVE_ARMV7
|
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
2012-02-27 23:23:38 +01:00
|
|
|
if (cm->rtcd.flags & HAS_NEON)
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#endif
|
2012-02-27 23:23:38 +01:00
|
|
|
{
|
|
|
|
|
vp8_push_neon(dx_store_reg);
|
|
|
|
|
}
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#endif
|
|
|
|
|
|
2012-02-27 23:23:38 +01:00
|
|
|
cm->new_fb_idx = get_free_fb (cm);
|
2010-10-20 00:40:46 +02:00
|
|
|
|
2012-02-27 23:23:38 +01:00
|
|
|
if (setjmp(pbi->common.error.jmp))
|
|
|
|
|
{
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if HAVE_ARMV7
|
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
2012-02-27 23:23:38 +01:00
|
|
|
if (cm->rtcd.flags & HAS_NEON)
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#endif
|
2012-02-27 23:23:38 +01:00
|
|
|
{
|
|
|
|
|
vp8_pop_neon(dx_store_reg);
|
|
|
|
|
}
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#endif
|
2012-02-27 23:23:38 +01:00
|
|
|
pbi->common.error.setjmp = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-27 23:23:38 +01:00
|
|
|
/* We do not know if the missing frame(s) was supposed to update
|
|
|
|
|
* any of the reference buffers, but we act conservative and
|
|
|
|
|
* mark only the last buffer as corrupted.
|
|
|
|
|
*/
|
|
|
|
|
cm->yv12_fb[cm->lst_fb_idx].corrupted = 1;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-27 23:23:38 +01:00
|
|
|
if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
|
|
|
|
|
cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
|
|
|
|
|
return -1;
|
2011-06-13 16:42:27 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-02-27 23:23:38 +01:00
|
|
|
pbi->common.error.setjmp = 1;
|
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
retcode = vp8_decode_frame(pbi);
|
|
|
|
|
|
|
|
|
|
if (retcode < 0)
|
|
|
|
|
{
|
|
|
|
|
#if HAVE_ARMV7
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
|
|
|
if (cm->rtcd.flags & HAS_NEON)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
vp8_pop_neon(dx_store_reg);
|
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
|
|
|
|
pbi->common.error.error_code = VPX_CODEC_ERROR;
|
|
|
|
|
pbi->common.error.setjmp = 0;
|
2010-10-20 00:40:46 +02:00
|
|
|
if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
|
|
|
|
|
cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
|
2010-05-18 17:58:33 +02:00
|
|
|
return retcode;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
2010-09-16 20:08:52 +02:00
|
|
|
if (swap_frame_buffers (cm))
|
|
|
|
|
{
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if HAVE_ARMV7
|
|
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
|
|
|
if (cm->rtcd.flags & HAS_NEON)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
vp8_pop_neon(dx_store_reg);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2010-09-16 20:08:52 +02:00
|
|
|
pbi->common.error.error_code = VPX_CODEC_ERROR;
|
|
|
|
|
pbi->common.error.setjmp = 0;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-11-16 01:16:30 +01:00
|
|
|
#if WRITE_RECON_BUFFER
|
|
|
|
|
if(cm->show_frame)
|
2011-12-01 01:36:46 +01:00
|
|
|
write_dx_frame_to_file(cm->frame_to_show,
|
|
|
|
|
cm->current_video_frame);
|
|
|
|
|
else
|
|
|
|
|
write_dx_frame_to_file(cm->frame_to_show,
|
|
|
|
|
cm->current_video_frame+1000);
|
2011-11-16 01:16:30 +01:00
|
|
|
#endif
|
|
|
|
|
|
2011-07-20 21:53:42 +02:00
|
|
|
if(cm->filter_level)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
2010-10-28 01:04:02 +02:00
|
|
|
/* Apply the loop filter if appropriate. */
|
2011-07-20 21:53:42 +02:00
|
|
|
vp8_loop_filter_frame(cm, &pbi->mb);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2010-09-16 20:08:52 +02:00
|
|
|
vp8_yv12_extend_frame_borders_ptr(cm->frame_to_show);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
2011-02-14 23:18:18 +01:00
|
|
|
#if CONFIG_DEBUG
|
2010-09-01 02:43:14 +02:00
|
|
|
vp8_recon_write_yuv_frame("recon.yuv", cm->frame_to_show);
|
2011-02-14 23:18:18 +01:00
|
|
|
#endif
|
2010-09-01 02:43:14 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_clear_system_state();
|
|
|
|
|
|
2011-11-16 01:16:30 +01:00
|
|
|
if(cm->show_frame)
|
|
|
|
|
{
|
|
|
|
|
vpx_memcpy(cm->prev_mip, cm->mip,
|
|
|
|
|
(cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
vpx_memset(cm->prev_mip, 0,
|
|
|
|
|
(cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO));
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/*vp8_print_modes_and_motion_vectors( cm->mi, cm->mb_rows,cm->mb_cols, cm->current_video_frame);*/
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
if (cm->show_frame)
|
|
|
|
|
cm->current_video_frame++;
|
|
|
|
|
|
|
|
|
|
pbi->ready_for_new_data = 0;
|
|
|
|
|
pbi->last_time_stamp = time_stamp;
|
2011-06-13 16:42:27 +02:00
|
|
|
pbi->source_sz = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2011-07-26 03:44:59 +02:00
|
|
|
int64_t earliest_time = pbi->dr[0].time_stamp;
|
|
|
|
|
int64_t latest_time = pbi->dr[0].time_stamp;
|
|
|
|
|
int64_t time_diff = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
int bytes = 0;
|
|
|
|
|
|
|
|
|
|
pbi->dr[pbi->common.current_video_frame&0xf].size = pbi->bc.pos + pbi->bc2.pos + 4;;
|
|
|
|
|
pbi->dr[pbi->common.current_video_frame&0xf].time_stamp = time_stamp;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
bytes += pbi->dr[i].size;
|
|
|
|
|
|
|
|
|
|
if (pbi->dr[i].time_stamp < earliest_time)
|
|
|
|
|
earliest_time = pbi->dr[i].time_stamp;
|
|
|
|
|
|
|
|
|
|
if (pbi->dr[i].time_stamp > latest_time)
|
|
|
|
|
latest_time = pbi->dr[i].time_stamp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
time_diff = latest_time - earliest_time;
|
|
|
|
|
|
|
|
|
|
if (time_diff > 0)
|
|
|
|
|
{
|
|
|
|
|
pbi->common.bitrate = 80000.00 * bytes / time_diff ;
|
|
|
|
|
pbi->common.framerate = 160000000.00 / time_diff ;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if HAVE_ARMV7
|
Add runtime CPU detection support for ARM.
The primary goal is to allow a binary to be built which supports
NEON, but can fall back to non-NEON routines, since some Android
devices do not have NEON, even if they are otherwise ARMv7 (e.g.,
Tegra).
The configure-generated flags HAVE_ARMV7, etc., are used to decide
which versions of each function to build, and when
CONFIG_RUNTIME_CPU_DETECT is enabled, the correct version is chosen
at run time.
In order for this to work, the CFLAGS must be set to something
appropriate (e.g., without -mfpu=neon for ARMv7, and with
appropriate -march and -mcpu for even earlier configurations), or
the native C code will not be able to run.
The ASFLAGS must remain set for the most advanced instruction set
required at build time, since the ARM assembler will refuse to emit
them otherwise.
I have not attempted to make any changes to configure to do this
automatically.
Doing so will probably require the addition of new configure options.
Many of the hooks for RTCD on ARM were already there, but a lot of
the code had bit-rotted, and a good deal of the ARM-specific code
is not integrated into the RTCD structs at all.
I did not try to resolve the latter, merely to add the minimal amount
of protection around them to allow RTCD to work.
Those functions that were called based on an ifdef at the calling
site were expanded to check the RTCD flags at that site, but they
should be added to an RTCD struct somewhere in the future.
The functions invoked with global function pointers still are, but
these should be moved into an RTCD struct for thread safety (I
believe every platform currently supported has atomic pointer
stores, but this is not guaranteed).
The encoder's boolhuff functions did not even have _c and armv7
suffixes, and the correct version was resolved at link time.
The token packing functions did have appropriate suffixes, but the
version was selected with a define, with no associated RTCD struct.
However, for both of these, the only armv7 instruction they actually
used was rbit, and this was completely superfluous, so I reworked
them to avoid it.
The only non-ARMv4 instruction remaining in them is clz, which is
ARMv5 (not even ARMv5TE is required).
Considering that there are no ARM-specific configs which are not at
least ARMv5TE, I did not try to detect these at runtime, and simply
enable them for ARMv5 and above.
Finally, the NEON register saving code was completely non-reentrant,
since it saved the registers to a global, static variable.
I moved the storage for this onto the stack.
A single binary built with this code was tested on an ARM11 (ARMv6)
and a Cortex A8 (ARMv7 w/NEON), for both the encoder and decoder,
and produced identical output, while using the correct accelerated
functions on each.
I did not test on any earlier processors.
Change-Id: I45cbd63a614f4554c3b325c45d46c0806f009eaa
2010-10-21 00:39:11 +02:00
|
|
|
#if CONFIG_RUNTIME_CPU_DETECT
|
|
|
|
|
if (cm->rtcd.flags & HAS_NEON)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
vp8_pop_neon(dx_store_reg);
|
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
|
|
|
|
pbi->common.error.setjmp = 0;
|
|
|
|
|
return retcode;
|
|
|
|
|
}
|
2011-07-26 03:44:59 +02:00
|
|
|
int vp8dx_get_raw_frame(VP8D_PTR ptr, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags)
|
2010-05-18 17:58:33 +02:00
|
|
|
{
|
|
|
|
|
int ret = -1;
|
|
|
|
|
VP8D_COMP *pbi = (VP8D_COMP *) ptr;
|
|
|
|
|
|
|
|
|
|
if (pbi->ready_for_new_data == 1)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
/* ie no raw frame to show!!! */
|
2010-05-18 17:58:33 +02:00
|
|
|
if (pbi->common.show_frame == 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
pbi->ready_for_new_data = 1;
|
|
|
|
|
*time_stamp = pbi->last_time_stamp;
|
|
|
|
|
*time_end_stamp = 0;
|
|
|
|
|
|
|
|
|
|
sd->clrtype = pbi->common.clr_type;
|
|
|
|
|
#if CONFIG_POSTPROC
|
2010-11-05 00:03:36 +01:00
|
|
|
ret = vp8_post_proc_frame(&pbi->common, sd, flags);
|
2010-05-18 17:58:33 +02:00
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
if (pbi->common.frame_to_show)
|
|
|
|
|
{
|
|
|
|
|
*sd = *pbi->common.frame_to_show;
|
|
|
|
|
sd->y_width = pbi->common.Width;
|
|
|
|
|
sd->y_height = pbi->common.Height;
|
|
|
|
|
sd->uv_height = pbi->common.Height / 2;
|
|
|
|
|
ret = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ret = -1;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-28 01:04:02 +02:00
|
|
|
#endif /*!CONFIG_POSTPROC*/
|
2010-05-18 17:58:33 +02:00
|
|
|
vp8_clear_system_state();
|
|
|
|
|
return ret;
|
|
|
|
|
}
|