MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/wavpack: Use ThreadProgress API 

It is more natural given that WavPack doesn't need the data of
the previous frame at all; it just needs the DSD context.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-08-11 12:23:48 +02:00
parent 9dc8f8839e
commit 2aac42605c
1 changed files with 75 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
libavcodec/wavpack.c
View File

@ -30,7 +30,7 @@
#include "get_bits.h"
#include "refstruct.h"
#include "thread.h"
#include "threadframe.h"
#include "threadprogress.h"
#include "unary.h"
#include "wavpack.h"
#include "dsd.h"
@ -107,11 +107,11 @@ typedef struct WavpackContext {
int samples;
int ch_offset;
AVFrame *frame;
ThreadFrame curr_frame, prev_frame;
Modulation modulation;
DSDContext *dsdctx; ///< RefStruct reference
ThreadProgress *curr_progress, *prev_progress; ///< RefStruct references
FFRefStructPool *progress_pool; ///< RefStruct reference
int dsd_channels;
} WavpackContext;
@ -994,6 +994,8 @@ static int wv_dsd_reset(WavpackContext *s, int channels)
s->dsd_channels = 0;
ff_refstruct_unref(&s->dsdctx);
ff_refstruct_unref(&s->curr_progress);
ff_refstruct_unref(&s->prev_progress);
if (!channels)
return 0;
@ -1017,22 +1019,31 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
{
WavpackContext *fsrc = src->priv_data;
WavpackContext *fdst = dst->priv_data;
int ret;
if (dst == src)
return 0;
ff_thread_release_ext_buffer(&fdst->curr_frame);
if (fsrc->curr_frame.f->data[0]) {
if ((ret = ff_thread_ref_frame(&fdst->curr_frame, &fsrc->curr_frame)) < 0)
return ret;
}
ff_refstruct_replace(&fdst->curr_progress, fsrc->curr_progress);
ff_refstruct_replace(&fdst->dsdctx, fsrc->dsdctx);
fdst->dsd_channels = fsrc->dsd_channels;
return 0;
}
static av_cold int progress_pool_init_cb(FFRefStructOpaque opaque, void *obj)
{
ThreadProgress *progress = obj;
return ff_thread_progress_init(progress, 1);
}
static void progress_pool_reset_cb(FFRefStructOpaque opaque, void *obj)
{
ThreadProgress *progress = obj;
ff_thread_progress_reset(progress);
}
static av_cold void progress_pool_free_entry_cb(FFRefStructOpaque opaque, void *obj)
{
ThreadProgress *progress = obj;
ff_thread_progress_destroy(progress);
}
#endif
static av_cold int wavpack_decode_init(AVCodecContext *avctx)
@ -1043,11 +1054,17 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
s->fdec_num = 0;
s->curr_frame.f = av_frame_alloc();
s->prev_frame.f = av_frame_alloc();
if (!s->curr_frame.f || !s->prev_frame.f)
return AVERROR(ENOMEM);
#if HAVE_THREADS
if (ff_thread_sync_ref(avctx, offsetof(WavpackContext, progress_pool)) == FF_THREAD_IS_FIRST_THREAD) {
s->progress_pool = ff_refstruct_pool_alloc_ext(sizeof(*s->curr_progress),
FF_REFSTRUCT_POOL_FLAG_FREE_ON_INIT_ERROR, NULL,
progress_pool_init_cb,
progress_pool_reset_cb,
progress_pool_free_entry_cb, NULL);
if (!s->progress_pool)
return AVERROR(ENOMEM);
}
#endif
return 0;
}
@ -1061,19 +1078,14 @@ static av_cold int wavpack_decode_end(AVCodecContext *avctx)
av_freep(&s->fdec);
s->fdec_num = 0;
ff_thread_release_ext_buffer(&s->curr_frame);
av_frame_free(&s->curr_frame.f);
ff_thread_release_ext_buffer(&s->prev_frame);
av_frame_free(&s->prev_frame.f);
ff_refstruct_unref(&s->dsdctx);
ff_refstruct_pool_uninit(&s->progress_pool);
wv_dsd_reset(s, 0);
return 0;
}
static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
const uint8_t *buf, int buf_size)
static int wavpack_decode_block(AVCodecContext *avctx, AVFrame *frame, int block_no,
const uint8_t *buf, int buf_size, int *new_progress)
{
WavpackContext *wc = avctx->priv_data;
WavpackFrameContext *s;
@ -1521,7 +1533,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
av_log(avctx, AV_LOG_ERROR, "Error reinitializing the DSD context\n");
return ret;
}
ff_thread_release_ext_buffer(&wc->curr_frame);
ff_init_dsd_data();
}
av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout);
@ -1529,18 +1540,25 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
avctx->sample_fmt = sample_fmt;
avctx->bits_per_raw_sample = orig_bpp;
ff_thread_release_ext_buffer(&wc->prev_frame);
FFSWAP(ThreadFrame, wc->curr_frame, wc->prev_frame);
/* get output buffer */
wc->curr_frame.f->nb_samples = s->samples;
ret = ff_thread_get_ext_buffer(avctx, &wc->curr_frame,
AV_GET_BUFFER_FLAG_REF);
frame->nb_samples = s->samples;
ret = ff_thread_get_buffer(avctx, frame, 0);
if (ret < 0)
return ret;
wc->frame = wc->curr_frame.f;
ff_thread_finish_setup(avctx);
av_assert1(!!wc->progress_pool == !!(avctx->active_thread_type & FF_THREAD_FRAME));
if (wc->progress_pool) {
if (wc->dsdctx) {
ff_refstruct_unref(&wc->prev_progress);
wc->prev_progress = ff_refstruct_pool_get(wc->progress_pool);
if (!wc->prev_progress)
return AVERROR(ENOMEM);
FFSWAP(ThreadProgress*, wc->prev_progress, wc->curr_progress);
*new_progress = 1;
}
av_assert1(!!wc->dsdctx == !!wc->curr_progress);
ff_thread_finish_setup(avctx);
}
}
if (wc->ch_offset + s->stereo >= avctx->ch_layout.nb_channels) {
@ -1548,9 +1566,9 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
return ((avctx->err_recognition & AV_EF_EXPLODE) || !wc->ch_offset) ? AVERROR_INVALIDDATA : 0;
}
samples_l = wc->frame->extended_data[wc->ch_offset];
samples_l = frame->extended_data[wc->ch_offset];
if (s->stereo)
samples_r = wc->frame->extended_data[wc->ch_offset + 1];
samples_r = frame->extended_data[wc->ch_offset + 1];
wc->ch_offset += 1 + s->stereo;
@ -1602,25 +1620,27 @@ static int dsd_channel(AVCodecContext *avctx, void *frmptr, int jobnr, int threa
const WavpackContext *s = avctx->priv_data;
AVFrame *frame = frmptr;
ff_dsd2pcm_translate (&s->dsdctx [jobnr], s->samples, 0,
ff_dsd2pcm_translate(&s->dsdctx[jobnr], s->samples, 0,
(uint8_t *)frame->extended_data[jobnr], 4,
(float *)frame->extended_data[jobnr], 1);
return 0;
}
static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *frame,
int *got_frame_ptr, AVPacket *avpkt)
{
WavpackContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
int frame_size, ret, frame_flags;
int new_progress = 0;
av_assert1(!s->curr_progress || s->dsdctx);
if (avpkt->size <= WV_HEADER_SIZE)
return AVERROR_INVALIDDATA;
s->frame = NULL;
s->block = 0;
s->ch_offset = 0;
@ -1646,7 +1666,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
ret = AVERROR_INVALIDDATA;
goto error;
}
if ((ret = wavpack_decode_block(avctx, s->block, buf, frame_size)) < 0)
ret = wavpack_decode_block(avctx, frame, s->block, buf, frame_size, &new_progress);
if (ret < 0)
goto error;
s->block++;
buf += frame_size;
@ -1659,26 +1680,23 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
goto error;
}
ff_thread_await_progress(&s->prev_frame, INT_MAX, 0);
ff_thread_release_ext_buffer(&s->prev_frame);
if (s->modulation == MODULATION_DSD)
avctx->execute2(avctx, dsd_channel, s->frame, NULL, avctx->ch_layout.nb_channels);
ff_thread_report_progress(&s->curr_frame, INT_MAX, 0);
if ((ret = av_frame_ref(rframe, s->frame)) < 0)
return ret;
if (s->dsdctx) {
if (s->prev_progress)
ff_thread_progress_await(s->prev_progress, INT_MAX);
avctx->execute2(avctx, dsd_channel, frame, NULL, avctx->ch_layout.nb_channels);
if (s->curr_progress)
ff_thread_progress_report(s->curr_progress, INT_MAX);
}
*got_frame_ptr = 1;
return avpkt->size;
error:
if (s->frame) {
ff_thread_await_progress(&s->prev_frame, INT_MAX, 0);
ff_thread_release_ext_buffer(&s->prev_frame);
ff_thread_report_progress(&s->curr_frame, INT_MAX, 0);
if (new_progress) {
if (s->prev_progress)
ff_thread_progress_await(s->prev_progress, INT_MAX);
ff_thread_progress_report(s->curr_progress, INT_MAX);
}
return ret;
@ -1697,6 +1715,5 @@ const FFCodec ff_wavpack_decoder = {
UPDATE_THREAD_CONTEXT(update_thread_context),
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS |
AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_CHANNEL_CONF,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_ALLOCATE_PROGRESS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};