mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-11 09:47:32 +09:00
Update aom to v1.0.0
Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0.
This commit is contained in:
parent
bb61121b44
commit
48f6d2e034
1087 changed files with 154333 additions and 265310 deletions
488
third_party/aom/av1/decoder/decoder.c
vendored
488
third_party/aom/av1/decoder/decoder.c
vendored
|
|
@ -13,9 +13,9 @@
|
|||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "./av1_rtcd.h"
|
||||
#include "./aom_dsp_rtcd.h"
|
||||
#include "./aom_scale_rtcd.h"
|
||||
#include "config/av1_rtcd.h"
|
||||
#include "config/aom_dsp_rtcd.h"
|
||||
#include "config/aom_scale_rtcd.h"
|
||||
|
||||
#include "aom_mem/aom_mem.h"
|
||||
#include "aom_ports/system_state.h"
|
||||
|
|
@ -33,12 +33,8 @@
|
|||
|
||||
#include "av1/decoder/decodeframe.h"
|
||||
#include "av1/decoder/decoder.h"
|
||||
#if CONFIG_NCOBMC_ADAPT_WEIGHT
|
||||
#include "av1/common/ncobmc_kernels.h"
|
||||
#endif // CONFIG_NCOBMC_ADAPT_WEIGHT
|
||||
#if !CONFIG_PVQ
|
||||
#include "av1/decoder/detokenize.h"
|
||||
#endif
|
||||
#include "av1/decoder/obu.h"
|
||||
|
||||
static void initialize_dec(void) {
|
||||
static volatile int init_done = 0;
|
||||
|
|
@ -53,23 +49,24 @@ static void initialize_dec(void) {
|
|||
}
|
||||
}
|
||||
|
||||
static void av1_dec_setup_mi(AV1_COMMON *cm) {
|
||||
cm->mi = cm->mip + cm->mi_stride + 1;
|
||||
cm->mi_grid_visible = cm->mi_grid_base + cm->mi_stride + 1;
|
||||
static void dec_setup_mi(AV1_COMMON *cm) {
|
||||
cm->mi = cm->mip;
|
||||
cm->mi_grid_visible = cm->mi_grid_base;
|
||||
memset(cm->mi_grid_base, 0,
|
||||
cm->mi_stride * (cm->mi_rows + 1) * sizeof(*cm->mi_grid_base));
|
||||
cm->mi_stride * cm->mi_rows * sizeof(*cm->mi_grid_base));
|
||||
}
|
||||
|
||||
static int av1_dec_alloc_mi(AV1_COMMON *cm, int mi_size) {
|
||||
cm->mip = aom_calloc(mi_size, sizeof(*cm->mip));
|
||||
if (!cm->mip) return 1;
|
||||
cm->mi_alloc_size = mi_size;
|
||||
cm->mi_grid_base = (MODE_INFO **)aom_calloc(mi_size, sizeof(MODE_INFO *));
|
||||
cm->mi_grid_base =
|
||||
(MB_MODE_INFO **)aom_calloc(mi_size, sizeof(MB_MODE_INFO *));
|
||||
if (!cm->mi_grid_base) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void av1_dec_free_mi(AV1_COMMON *cm) {
|
||||
static void dec_free_mi(AV1_COMMON *cm) {
|
||||
aom_free(cm->mip);
|
||||
cm->mip = NULL;
|
||||
aom_free(cm->mi_grid_base);
|
||||
|
|
@ -108,28 +105,20 @@ AV1Decoder *av1_decoder_create(BufferPool *const pool) {
|
|||
memset(&cm->next_ref_frame_map, -1, sizeof(cm->next_ref_frame_map));
|
||||
|
||||
cm->current_video_frame = 0;
|
||||
pbi->ready_for_new_data = 1;
|
||||
pbi->decoding_first_frame = 1;
|
||||
pbi->common.buffer_pool = pool;
|
||||
|
||||
cm->bit_depth = AOM_BITS_8;
|
||||
cm->dequant_bit_depth = AOM_BITS_8;
|
||||
|
||||
cm->alloc_mi = av1_dec_alloc_mi;
|
||||
cm->free_mi = av1_dec_free_mi;
|
||||
cm->setup_mi = av1_dec_setup_mi;
|
||||
cm->free_mi = dec_free_mi;
|
||||
cm->setup_mi = dec_setup_mi;
|
||||
|
||||
av1_loop_filter_init(cm);
|
||||
|
||||
#if CONFIG_NCOBMC_ADAPT_WEIGHT
|
||||
get_default_ncobmc_kernels(cm);
|
||||
#endif // CONFIG_NCOBMC_ADAPT_WEIGHT
|
||||
|
||||
#if CONFIG_AOM_QM
|
||||
aom_qm_init(cm);
|
||||
#endif
|
||||
#if CONFIG_LOOP_RESTORATION
|
||||
av1_qm_init(cm);
|
||||
av1_loop_restoration_precal();
|
||||
#endif // CONFIG_LOOP_RESTORATION
|
||||
#if CONFIG_ACCOUNTING
|
||||
pbi->acct_enabled = 1;
|
||||
aom_accounting_init(&pbi->accounting);
|
||||
|
|
@ -142,33 +131,83 @@ AV1Decoder *av1_decoder_create(BufferPool *const pool) {
|
|||
return pbi;
|
||||
}
|
||||
|
||||
void av1_dealloc_dec_jobs(struct AV1DecTileMTData *tile_mt_info) {
|
||||
if (tile_mt_info != NULL) {
|
||||
#if CONFIG_MULTITHREAD
|
||||
if (tile_mt_info->job_mutex != NULL) {
|
||||
pthread_mutex_destroy(tile_mt_info->job_mutex);
|
||||
aom_free(tile_mt_info->job_mutex);
|
||||
}
|
||||
#endif
|
||||
aom_free(tile_mt_info->job_queue);
|
||||
// clear the structure as the source of this call may be a resize in which
|
||||
// case this call will be followed by an _alloc() which may fail.
|
||||
av1_zero(*tile_mt_info);
|
||||
}
|
||||
}
|
||||
|
||||
void av1_decoder_remove(AV1Decoder *pbi) {
|
||||
int i;
|
||||
|
||||
if (!pbi) return;
|
||||
|
||||
// Free the tile list output buffer.
|
||||
if (pbi->tile_list_output != NULL) aom_free(pbi->tile_list_output);
|
||||
pbi->tile_list_output = NULL;
|
||||
|
||||
aom_get_worker_interface()->end(&pbi->lf_worker);
|
||||
aom_free(pbi->lf_worker.data1);
|
||||
aom_free(pbi->tile_data);
|
||||
for (i = 0; i < pbi->num_tile_workers; ++i) {
|
||||
|
||||
if (pbi->thread_data) {
|
||||
for (int worker_idx = 0; worker_idx < pbi->max_threads - 1; worker_idx++) {
|
||||
DecWorkerData *const thread_data = pbi->thread_data + worker_idx;
|
||||
const int use_highbd = pbi->common.use_highbitdepth ? 1 : 0;
|
||||
av1_free_mc_tmp_buf(thread_data->td, use_highbd);
|
||||
aom_free(thread_data->td);
|
||||
}
|
||||
aom_free(pbi->thread_data);
|
||||
}
|
||||
|
||||
for (i = 0; i < pbi->num_workers; ++i) {
|
||||
AVxWorker *const worker = &pbi->tile_workers[i];
|
||||
aom_get_worker_interface()->end(worker);
|
||||
}
|
||||
aom_free(pbi->tile_worker_data);
|
||||
aom_free(pbi->tile_worker_info);
|
||||
aom_free(pbi->tile_data);
|
||||
aom_free(pbi->tile_workers);
|
||||
|
||||
if (pbi->num_tile_workers > 0) {
|
||||
if (pbi->num_workers > 0) {
|
||||
av1_loop_filter_dealloc(&pbi->lf_row_sync);
|
||||
av1_loop_restoration_dealloc(&pbi->lr_row_sync, pbi->num_workers);
|
||||
av1_dealloc_dec_jobs(&pbi->tile_mt_info);
|
||||
}
|
||||
|
||||
#if CONFIG_ACCOUNTING
|
||||
aom_accounting_clear(&pbi->accounting);
|
||||
#endif
|
||||
const int use_highbd = pbi->common.use_highbitdepth ? 1 : 0;
|
||||
av1_free_mc_tmp_buf(&pbi->td, use_highbd);
|
||||
|
||||
aom_free(pbi);
|
||||
}
|
||||
|
||||
void av1_visit_palette(AV1Decoder *const pbi, MACROBLOCKD *const xd, int mi_row,
|
||||
int mi_col, aom_reader *r, BLOCK_SIZE bsize,
|
||||
palette_visitor_fn_t visit) {
|
||||
if (!is_inter_block(xd->mi[0])) {
|
||||
for (int plane = 0; plane < AOMMIN(2, av1_num_planes(&pbi->common));
|
||||
++plane) {
|
||||
const struct macroblockd_plane *const pd = &xd->plane[plane];
|
||||
if (is_chroma_reference(mi_row, mi_col, bsize, pd->subsampling_x,
|
||||
pd->subsampling_y)) {
|
||||
if (xd->mi[0]->palette_mode_info.palette_size[plane])
|
||||
visit(xd, plane, r);
|
||||
} else {
|
||||
assert(xd->mi[0]->palette_mode_info.palette_size[plane] == 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int equal_dimensions(const YV12_BUFFER_CONFIG *a,
|
||||
const YV12_BUFFER_CONFIG *b) {
|
||||
return a->y_height == b->y_height && a->y_width == b->y_width &&
|
||||
|
|
@ -178,6 +217,7 @@ static int equal_dimensions(const YV12_BUFFER_CONFIG *a,
|
|||
aom_codec_err_t av1_copy_reference_dec(AV1Decoder *pbi, int idx,
|
||||
YV12_BUFFER_CONFIG *sd) {
|
||||
AV1_COMMON *cm = &pbi->common;
|
||||
const int num_planes = av1_num_planes(cm);
|
||||
|
||||
const YV12_BUFFER_CONFIG *const cfg = get_ref_frame(cm, idx);
|
||||
if (cfg == NULL) {
|
||||
|
|
@ -188,13 +228,25 @@ aom_codec_err_t av1_copy_reference_dec(AV1Decoder *pbi, int idx,
|
|||
aom_internal_error(&cm->error, AOM_CODEC_ERROR,
|
||||
"Incorrect buffer dimensions");
|
||||
else
|
||||
aom_yv12_copy_frame(cfg, sd);
|
||||
aom_yv12_copy_frame(cfg, sd, num_planes);
|
||||
|
||||
return cm->error.error_code;
|
||||
}
|
||||
|
||||
static int equal_dimensions_and_border(const YV12_BUFFER_CONFIG *a,
|
||||
const YV12_BUFFER_CONFIG *b) {
|
||||
return a->y_height == b->y_height && a->y_width == b->y_width &&
|
||||
a->uv_height == b->uv_height && a->uv_width == b->uv_width &&
|
||||
a->y_stride == b->y_stride && a->uv_stride == b->uv_stride &&
|
||||
a->border == b->border &&
|
||||
(a->flags & YV12_FLAG_HIGHBITDEPTH) ==
|
||||
(b->flags & YV12_FLAG_HIGHBITDEPTH);
|
||||
}
|
||||
|
||||
aom_codec_err_t av1_set_reference_dec(AV1_COMMON *cm, int idx,
|
||||
int use_external_ref,
|
||||
YV12_BUFFER_CONFIG *sd) {
|
||||
const int num_planes = av1_num_planes(cm);
|
||||
YV12_BUFFER_CONFIG *ref_buf = NULL;
|
||||
|
||||
// Get the destination reference buffer.
|
||||
|
|
@ -205,60 +257,132 @@ aom_codec_err_t av1_set_reference_dec(AV1_COMMON *cm, int idx,
|
|||
return AOM_CODEC_ERROR;
|
||||
}
|
||||
|
||||
if (!equal_dimensions(ref_buf, sd)) {
|
||||
aom_internal_error(&cm->error, AOM_CODEC_ERROR,
|
||||
"Incorrect buffer dimensions");
|
||||
if (!use_external_ref) {
|
||||
if (!equal_dimensions(ref_buf, sd)) {
|
||||
aom_internal_error(&cm->error, AOM_CODEC_ERROR,
|
||||
"Incorrect buffer dimensions");
|
||||
} else {
|
||||
// Overwrite the reference frame buffer.
|
||||
aom_yv12_copy_frame(sd, ref_buf, num_planes);
|
||||
}
|
||||
} else {
|
||||
// Overwrite the reference frame buffer.
|
||||
aom_yv12_copy_frame(sd, ref_buf);
|
||||
if (!equal_dimensions_and_border(ref_buf, sd)) {
|
||||
aom_internal_error(&cm->error, AOM_CODEC_ERROR,
|
||||
"Incorrect buffer dimensions");
|
||||
} else {
|
||||
// Overwrite the reference frame buffer pointers.
|
||||
// Once we no longer need the external reference buffer, these pointers
|
||||
// are restored.
|
||||
ref_buf->store_buf_adr[0] = ref_buf->y_buffer;
|
||||
ref_buf->store_buf_adr[1] = ref_buf->u_buffer;
|
||||
ref_buf->store_buf_adr[2] = ref_buf->v_buffer;
|
||||
ref_buf->y_buffer = sd->y_buffer;
|
||||
ref_buf->u_buffer = sd->u_buffer;
|
||||
ref_buf->v_buffer = sd->v_buffer;
|
||||
ref_buf->use_external_refernce_buffers = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return cm->error.error_code;
|
||||
}
|
||||
|
||||
/* If any buffer updating is signaled it should be done here. */
|
||||
static void swap_frame_buffers(AV1Decoder *pbi) {
|
||||
aom_codec_err_t av1_copy_new_frame_dec(AV1_COMMON *cm,
|
||||
YV12_BUFFER_CONFIG *new_frame,
|
||||
YV12_BUFFER_CONFIG *sd) {
|
||||
const int num_planes = av1_num_planes(cm);
|
||||
|
||||
if (!equal_dimensions_and_border(new_frame, sd))
|
||||
aom_internal_error(&cm->error, AOM_CODEC_ERROR,
|
||||
"Incorrect buffer dimensions");
|
||||
else
|
||||
aom_yv12_copy_frame(new_frame, sd, num_planes);
|
||||
|
||||
return cm->error.error_code;
|
||||
}
|
||||
|
||||
/* If any buffer updating is signaled it should be done here.
|
||||
Consumes a reference to cm->new_fb_idx.
|
||||
*/
|
||||
static void swap_frame_buffers(AV1Decoder *pbi, int frame_decoded) {
|
||||
int ref_index = 0, mask;
|
||||
AV1_COMMON *const cm = &pbi->common;
|
||||
BufferPool *const pool = cm->buffer_pool;
|
||||
RefCntBuffer *const frame_bufs = cm->buffer_pool->frame_bufs;
|
||||
|
||||
lock_buffer_pool(pool);
|
||||
for (mask = pbi->refresh_frame_flags; mask; mask >>= 1) {
|
||||
const int old_idx = cm->ref_frame_map[ref_index];
|
||||
// Current thread releases the holding of reference frame.
|
||||
decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
|
||||
// Release the reference frame holding in the reference map for the decoding
|
||||
// of the next frame.
|
||||
if (mask & 1) decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
cm->ref_frame_map[ref_index] = cm->next_ref_frame_map[ref_index];
|
||||
++ref_index;
|
||||
}
|
||||
|
||||
// Current thread releases the holding of reference frame.
|
||||
for (; ref_index < REF_FRAMES && !cm->show_existing_frame; ++ref_index) {
|
||||
const int old_idx = cm->ref_frame_map[ref_index];
|
||||
decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
cm->ref_frame_map[ref_index] = cm->next_ref_frame_map[ref_index];
|
||||
}
|
||||
|
||||
unlock_buffer_pool(pool);
|
||||
pbi->hold_ref_buf = 0;
|
||||
cm->frame_to_show = get_frame_new_buffer(cm);
|
||||
|
||||
// TODO(zoeliu): To fix the ref frame buffer update for the scenario of
|
||||
// cm->frame_parellel_decode == 1
|
||||
if (!cm->frame_parallel_decode || !cm->show_frame) {
|
||||
if (frame_decoded) {
|
||||
lock_buffer_pool(pool);
|
||||
--frame_bufs[cm->new_fb_idx].ref_count;
|
||||
|
||||
// In ext-tile decoding, the camera frame header is only decoded once. So,
|
||||
// we don't release the references here.
|
||||
if (!pbi->camera_frame_header_ready) {
|
||||
for (mask = pbi->refresh_frame_flags; mask; mask >>= 1) {
|
||||
const int old_idx = cm->ref_frame_map[ref_index];
|
||||
// Current thread releases the holding of reference frame.
|
||||
decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
|
||||
// Release the reference frame holding in the reference map for the
|
||||
// decoding of the next frame.
|
||||
if (mask & 1) decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
cm->ref_frame_map[ref_index] = cm->next_ref_frame_map[ref_index];
|
||||
++ref_index;
|
||||
}
|
||||
|
||||
// Current thread releases the holding of reference frame.
|
||||
const int check_on_show_existing_frame =
|
||||
!cm->show_existing_frame || cm->reset_decoder_state;
|
||||
for (; ref_index < REF_FRAMES && check_on_show_existing_frame;
|
||||
++ref_index) {
|
||||
const int old_idx = cm->ref_frame_map[ref_index];
|
||||
decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
cm->ref_frame_map[ref_index] = cm->next_ref_frame_map[ref_index];
|
||||
}
|
||||
}
|
||||
|
||||
YV12_BUFFER_CONFIG *cur_frame = get_frame_new_buffer(cm);
|
||||
|
||||
if (cm->show_existing_frame || cm->show_frame) {
|
||||
if (pbi->output_all_layers) {
|
||||
// Append this frame to the output queue
|
||||
if (pbi->num_output_frames >= MAX_NUM_SPATIAL_LAYERS) {
|
||||
// We can't store the new frame anywhere, so drop it and return an
|
||||
// error
|
||||
decrease_ref_count(cm->new_fb_idx, frame_bufs, pool);
|
||||
cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
|
||||
} else {
|
||||
pbi->output_frames[pbi->num_output_frames] = cur_frame;
|
||||
pbi->output_frame_index[pbi->num_output_frames] = cm->new_fb_idx;
|
||||
pbi->num_output_frames++;
|
||||
}
|
||||
} else {
|
||||
// Replace any existing output frame
|
||||
assert(pbi->num_output_frames == 0 || pbi->num_output_frames == 1);
|
||||
if (pbi->num_output_frames > 0) {
|
||||
decrease_ref_count((int)pbi->output_frame_index[0], frame_bufs, pool);
|
||||
}
|
||||
pbi->output_frames[0] = cur_frame;
|
||||
pbi->output_frame_index[0] = cm->new_fb_idx;
|
||||
pbi->num_output_frames = 1;
|
||||
}
|
||||
} else {
|
||||
decrease_ref_count(cm->new_fb_idx, frame_bufs, pool);
|
||||
}
|
||||
|
||||
unlock_buffer_pool(pool);
|
||||
} else {
|
||||
// Nothing was decoded, so just drop this frame buffer
|
||||
lock_buffer_pool(pool);
|
||||
decrease_ref_count(cm->new_fb_idx, frame_bufs, pool);
|
||||
unlock_buffer_pool(pool);
|
||||
}
|
||||
|
||||
// Invalidate these references until the next frame starts.
|
||||
for (ref_index = 0; ref_index < INTER_REFS_PER_FRAME; ref_index++) {
|
||||
cm->frame_refs[ref_index].idx = INVALID_IDX;
|
||||
cm->frame_refs[ref_index].buf = NULL;
|
||||
if (!pbi->camera_frame_header_ready) {
|
||||
pbi->hold_ref_buf = 0;
|
||||
|
||||
// Invalidate these references until the next frame starts.
|
||||
for (ref_index = 0; ref_index < INTER_REFS_PER_FRAME; ref_index++) {
|
||||
cm->frame_refs[ref_index].idx = INVALID_IDX;
|
||||
cm->frame_refs[ref_index].buf = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -268,7 +392,6 @@ int av1_receive_compressed_data(AV1Decoder *pbi, size_t size,
|
|||
BufferPool *volatile const pool = cm->buffer_pool;
|
||||
RefCntBuffer *volatile const frame_bufs = cm->buffer_pool->frame_bufs;
|
||||
const uint8_t *source = *psource;
|
||||
int retcode = 0;
|
||||
cm->error.error_code = AOM_CODEC_OK;
|
||||
|
||||
if (size == 0) {
|
||||
|
|
@ -286,18 +409,9 @@ int av1_receive_compressed_data(AV1Decoder *pbi, size_t size,
|
|||
}
|
||||
}
|
||||
|
||||
pbi->ready_for_new_data = 0;
|
||||
|
||||
// Find a free buffer for the new frame, releasing the reference previously
|
||||
// held.
|
||||
|
||||
// Check if the previous frame was a frame without any references to it.
|
||||
// Release frame buffer if not decoding in frame parallel mode.
|
||||
if (!cm->frame_parallel_decode && cm->new_fb_idx >= 0 &&
|
||||
frame_bufs[cm->new_fb_idx].ref_count == 0)
|
||||
pool->release_fb_cb(pool->cb_priv,
|
||||
&frame_bufs[cm->new_fb_idx].raw_frame_buffer);
|
||||
|
||||
// Find a free frame buffer. Return error if can not find any.
|
||||
cm->new_fb_idx = get_free_fb(cm);
|
||||
if (cm->new_fb_idx == INVALID_IDX) return AOM_CODEC_MEM_ERROR;
|
||||
|
|
@ -305,31 +419,20 @@ int av1_receive_compressed_data(AV1Decoder *pbi, size_t size,
|
|||
// Assign a MV array to the frame buffer.
|
||||
cm->cur_frame = &pool->frame_bufs[cm->new_fb_idx];
|
||||
|
||||
pbi->hold_ref_buf = 0;
|
||||
if (cm->frame_parallel_decode) {
|
||||
AVxWorker *const worker = pbi->frame_worker_owner;
|
||||
av1_frameworker_lock_stats(worker);
|
||||
frame_bufs[cm->new_fb_idx].frame_worker_owner = worker;
|
||||
// Reset decoding progress.
|
||||
pbi->cur_buf = &frame_bufs[cm->new_fb_idx];
|
||||
pbi->cur_buf->row = -1;
|
||||
pbi->cur_buf->col = -1;
|
||||
av1_frameworker_unlock_stats(worker);
|
||||
} else {
|
||||
pbi->cur_buf = &frame_bufs[cm->new_fb_idx];
|
||||
}
|
||||
if (!pbi->camera_frame_header_ready) pbi->hold_ref_buf = 0;
|
||||
|
||||
pbi->cur_buf = &frame_bufs[cm->new_fb_idx];
|
||||
|
||||
if (setjmp(cm->error.jmp)) {
|
||||
const AVxWorkerInterface *const winterface = aom_get_worker_interface();
|
||||
int i;
|
||||
|
||||
cm->error.setjmp = 0;
|
||||
pbi->ready_for_new_data = 1;
|
||||
|
||||
// Synchronize all threads immediately as a subsequent decode call may
|
||||
// cause a resize invalidating some allocations.
|
||||
winterface->sync(&pbi->lf_worker);
|
||||
for (i = 0; i < pbi->num_tile_workers; ++i) {
|
||||
for (i = 0; i < pbi->num_workers; ++i) {
|
||||
winterface->sync(&pbi->tile_workers[i]);
|
||||
}
|
||||
|
||||
|
|
@ -349,7 +452,10 @@ int av1_receive_compressed_data(AV1Decoder *pbi, size_t size,
|
|||
}
|
||||
|
||||
// Current thread releases the holding of reference frame.
|
||||
for (; ref_index < REF_FRAMES && !cm->show_existing_frame; ++ref_index) {
|
||||
const int check_on_show_existing_frame =
|
||||
!cm->show_existing_frame || cm->reset_decoder_state;
|
||||
for (; ref_index < REF_FRAMES && check_on_show_existing_frame;
|
||||
++ref_index) {
|
||||
const int old_idx = cm->ref_frame_map[ref_index];
|
||||
decrease_ref_count(old_idx, frame_bufs, pool);
|
||||
}
|
||||
|
|
@ -365,160 +471,72 @@ int av1_receive_compressed_data(AV1Decoder *pbi, size_t size,
|
|||
|
||||
cm->error.setjmp = 1;
|
||||
|
||||
#if !CONFIG_OBU
|
||||
av1_decode_frame_headers_and_setup(pbi, source, source + size, psource);
|
||||
if (!cm->show_existing_frame) {
|
||||
av1_decode_tg_tiles_and_wrapup(pbi, source, source + size, psource, 0,
|
||||
cm->tile_rows * cm->tile_cols - 1, 1);
|
||||
}
|
||||
#else
|
||||
av1_decode_frame_from_obus(pbi, source, source + size, psource);
|
||||
int frame_decoded =
|
||||
aom_decode_frame_from_obus(pbi, source, source + size, psource);
|
||||
|
||||
if (cm->error.error_code != AOM_CODEC_OK) return 1;
|
||||
|
||||
#if TXCOEFF_TIMER
|
||||
cm->cum_txcoeff_timer += cm->txcoeff_timer;
|
||||
fprintf(stderr,
|
||||
"txb coeff block number: %d, frame time: %ld, cum time %ld in us\n",
|
||||
cm->txb_count, cm->txcoeff_timer, cm->cum_txcoeff_timer);
|
||||
cm->txcoeff_timer = 0;
|
||||
cm->txb_count = 0;
|
||||
#endif
|
||||
|
||||
swap_frame_buffers(pbi);
|
||||
// Note: At this point, this function holds a reference to cm->new_fb_idx
|
||||
// in the buffer pool. This reference is consumed by swap_frame_buffers().
|
||||
swap_frame_buffers(pbi, frame_decoded);
|
||||
|
||||
#if CONFIG_EXT_TILE
|
||||
// For now, we only extend the frame borders when the whole frame is decoded.
|
||||
// Later, if needed, extend the border for the decoded tile on the frame
|
||||
// border.
|
||||
if (pbi->dec_tile_row == -1 && pbi->dec_tile_col == -1)
|
||||
#endif // CONFIG_EXT_TILE
|
||||
// TODO(debargha): Fix encoder side mv range, so that we can use the
|
||||
// inner border extension. As of now use the larger extension.
|
||||
// aom_extend_frame_inner_borders(cm->frame_to_show);
|
||||
aom_extend_frame_borders(cm->frame_to_show);
|
||||
if (frame_decoded) {
|
||||
pbi->decoding_first_frame = 0;
|
||||
}
|
||||
|
||||
if (cm->error.error_code != AOM_CODEC_OK) return 1;
|
||||
|
||||
aom_clear_system_state();
|
||||
|
||||
if (!cm->show_existing_frame) {
|
||||
cm->last_show_frame = cm->show_frame;
|
||||
|
||||
#if CONFIG_EXT_REFS
|
||||
// NOTE: It is not supposed to ref to any frame not used as reference
|
||||
if (cm->is_reference_frame)
|
||||
#endif // CONFIG_EXT_REFS
|
||||
cm->prev_frame = cm->cur_frame;
|
||||
|
||||
if (cm->seg.enabled && !cm->frame_parallel_decode)
|
||||
av1_swap_current_and_last_seg_map(cm);
|
||||
if (cm->seg.enabled) {
|
||||
if (cm->prev_frame && (cm->mi_rows == cm->prev_frame->mi_rows) &&
|
||||
(cm->mi_cols == cm->prev_frame->mi_cols)) {
|
||||
cm->last_frame_seg_map = cm->prev_frame->seg_map;
|
||||
} else {
|
||||
cm->last_frame_seg_map = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update progress in frame parallel decode.
|
||||
if (cm->frame_parallel_decode) {
|
||||
// Need to lock the mutex here as another thread may
|
||||
// be accessing this buffer.
|
||||
AVxWorker *const worker = pbi->frame_worker_owner;
|
||||
FrameWorkerData *const frame_worker_data = worker->data1;
|
||||
av1_frameworker_lock_stats(worker);
|
||||
|
||||
if (cm->show_frame) {
|
||||
cm->current_video_frame++;
|
||||
}
|
||||
frame_worker_data->frame_decoded = 1;
|
||||
frame_worker_data->frame_context_ready = 1;
|
||||
av1_frameworker_signal_stats(worker);
|
||||
av1_frameworker_unlock_stats(worker);
|
||||
} else {
|
||||
cm->last_width = cm->width;
|
||||
cm->last_height = cm->height;
|
||||
cm->last_tile_cols = cm->tile_cols;
|
||||
cm->last_tile_rows = cm->tile_rows;
|
||||
if (cm->show_frame) {
|
||||
cm->current_video_frame++;
|
||||
}
|
||||
}
|
||||
|
||||
cm->last_width = cm->width;
|
||||
cm->last_height = cm->height;
|
||||
cm->last_tile_cols = cm->tile_cols;
|
||||
cm->last_tile_rows = cm->tile_rows;
|
||||
cm->error.setjmp = 0;
|
||||
return retcode;
|
||||
}
|
||||
|
||||
int av1_get_raw_frame(AV1Decoder *pbi, YV12_BUFFER_CONFIG *sd) {
|
||||
AV1_COMMON *const cm = &pbi->common;
|
||||
int ret = -1;
|
||||
if (pbi->ready_for_new_data == 1) return ret;
|
||||
|
||||
pbi->ready_for_new_data = 1;
|
||||
|
||||
/* no raw frame to show!!! */
|
||||
if (!cm->show_frame) return ret;
|
||||
|
||||
*sd = *cm->frame_to_show;
|
||||
ret = 0;
|
||||
aom_clear_system_state();
|
||||
return ret;
|
||||
}
|
||||
|
||||
int av1_get_frame_to_show(AV1Decoder *pbi, YV12_BUFFER_CONFIG *frame) {
|
||||
AV1_COMMON *const cm = &pbi->common;
|
||||
|
||||
if (!cm->show_frame || !cm->frame_to_show) return -1;
|
||||
|
||||
*frame = *cm->frame_to_show;
|
||||
return 0;
|
||||
}
|
||||
|
||||
aom_codec_err_t av1_parse_superframe_index(const uint8_t *data, size_t data_sz,
|
||||
uint32_t sizes[8], int *count,
|
||||
int *index_size,
|
||||
aom_decrypt_cb decrypt_cb,
|
||||
void *decrypt_state) {
|
||||
// A chunk ending with a byte matching 0xc0 is an invalid chunk unless
|
||||
// it is a super frame index. If the last byte of real video compression
|
||||
// data is 0xc0 the encoder must add a 0 byte. If we have the marker but
|
||||
// not the associated matching marker byte at the front of the index we have
|
||||
// an invalid bitstream and need to return an error.
|
||||
// Get the frame at a particular index in the output queue
|
||||
int av1_get_raw_frame(AV1Decoder *pbi, size_t index, YV12_BUFFER_CONFIG **sd,
|
||||
aom_film_grain_t **grain_params) {
|
||||
RefCntBuffer *const frame_bufs = pbi->common.buffer_pool->frame_bufs;
|
||||
|
||||
uint8_t marker;
|
||||
size_t frame_sz_sum = 0;
|
||||
|
||||
assert(data_sz);
|
||||
marker = read_marker(decrypt_cb, decrypt_state, data);
|
||||
*count = 0;
|
||||
|
||||
if ((marker & 0xe0) == 0xc0) {
|
||||
const uint32_t frames = (marker & 0x7) + 1;
|
||||
const uint32_t mag = ((marker >> 3) & 0x3) + 1;
|
||||
const size_t index_sz = 2 + mag * (frames - 1);
|
||||
*index_size = (int)index_sz;
|
||||
|
||||
// This chunk is marked as having a superframe index but doesn't have
|
||||
// enough data for it, thus it's an invalid superframe index.
|
||||
if (data_sz < index_sz) return AOM_CODEC_CORRUPT_FRAME;
|
||||
|
||||
{
|
||||
const uint8_t marker2 =
|
||||
read_marker(decrypt_cb, decrypt_state, data + index_sz - 1);
|
||||
|
||||
// This chunk is marked as having a superframe index but doesn't have
|
||||
// the matching marker byte at the front of the index therefore it's an
|
||||
// invalid chunk.
|
||||
if (marker != marker2) return AOM_CODEC_CORRUPT_FRAME;
|
||||
}
|
||||
|
||||
{
|
||||
// Found a valid superframe index.
|
||||
uint32_t i, j;
|
||||
const uint8_t *x = &data[1];
|
||||
|
||||
// Frames has a maximum of 8 and mag has a maximum of 4.
|
||||
uint8_t clear_buffer[28];
|
||||
assert(sizeof(clear_buffer) >= (frames - 1) * mag);
|
||||
if (decrypt_cb) {
|
||||
decrypt_cb(decrypt_state, x, clear_buffer, (frames - 1) * mag);
|
||||
x = clear_buffer;
|
||||
}
|
||||
|
||||
for (i = 0; i < frames - 1; ++i) {
|
||||
uint32_t this_sz = 0;
|
||||
|
||||
for (j = 0; j < mag; ++j) this_sz |= (*x++) << (j * 8);
|
||||
this_sz += 1;
|
||||
sizes[i] = this_sz;
|
||||
frame_sz_sum += this_sz;
|
||||
}
|
||||
sizes[i] = (uint32_t)(data_sz - index_sz - frame_sz_sum);
|
||||
*count = frames;
|
||||
}
|
||||
}
|
||||
return AOM_CODEC_OK;
|
||||
if (index >= pbi->num_output_frames) return -1;
|
||||
*sd = pbi->output_frames[index];
|
||||
*grain_params = &frame_bufs[pbi->output_frame_index[index]].film_grain_params;
|
||||
aom_clear_system_state();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Get the highest-spatial-layer output
|
||||
// TODO(david.barker): What should this do?
|
||||
int av1_get_frame_to_show(AV1Decoder *pbi, YV12_BUFFER_CONFIG *frame) {
|
||||
if (pbi->num_output_frames == 0) return -1;
|
||||
|
||||
*frame = *pbi->output_frames[pbi->num_output_frames - 1];
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue