@@ -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;
@@ -992,10 +992,18 @@ 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;
+ if (!s->progress_pool) {
+ s->progress_pool = ff_refstruct_pool_alloc(sizeof(*s->curr_progress), 0);
+ if (!s->progress_pool)
+ return AVERROR(ENOMEM);
+ }
+
if (channels > INT_MAX / sizeof(*s->dsdctx))
return AVERROR(EINVAL);
@@ -1015,17 +1023,9 @@ 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(dst, &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->progress_pool, fsrc->progress_pool);
+ ff_refstruct_replace(&fdst->curr_progress, fsrc->curr_progress);
ff_refstruct_replace(&fdst->dsdctx, fsrc->dsdctx);
fdst->dsd_channels = fsrc->dsd_channels;
@@ -1041,12 +1041,6 @@ 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);
-
ff_init_dsd_data();
return 0;
@@ -1061,18 +1055,15 @@ static av_cold int wavpack_decode_end(AVCodecContext *avctx)
av_freep(&s->fdec);
s->fdec_num = 0;
- ff_thread_release_ext_buffer(avctx, &s->curr_frame);
- av_frame_free(&s->curr_frame.f);
-
- ff_thread_release_ext_buffer(avctx, &s->prev_frame);
- av_frame_free(&s->prev_frame.f);
-
ff_refstruct_unref(&s->dsdctx);
+ ff_refstruct_unref(&s->curr_progress);
+ ff_refstruct_unref(&s->prev_progress);
+ ff_refstruct_pool_uninit(&s->progress_pool);
return 0;
}
-static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
+static int wavpack_decode_block(AVCodecContext *avctx, AVFrame *frame, int block_no,
const uint8_t *buf, int buf_size)
{
WavpackContext *wc = avctx->priv_data;
@@ -1526,24 +1517,27 @@ 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(avctx, &wc->curr_frame);
}
av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout);
avctx->sample_rate = new_samplerate;
avctx->sample_fmt = sample_fmt;
avctx->bits_per_raw_sample = orig_bpp;
- ff_thread_release_ext_buffer(avctx, &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_refstruct_unref(&wc->prev_progress);
+ if (wc->dsdctx) {
+ wc->prev_progress = ff_refstruct_pool_get(wc->progress_pool);
+ if (!wc->prev_progress)
+ return AVERROR(ENOMEM);
+ ff_thread_progress_init(wc->prev_progress, avctx);
+ }
+ FFSWAP(ThreadProgress*, wc->prev_progress, wc->curr_progress);
+ av_assert1(!!wc->dsdctx == !!wc->curr_progress);
ff_thread_finish_setup(avctx);
}
@@ -1552,9 +1546,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;
@@ -1606,14 +1600,14 @@ 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;
@@ -1624,7 +1618,6 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if (avpkt->size <= WV_HEADER_SIZE)
return AVERROR_INVALIDDATA;
- s->frame = NULL;
s->block = 0;
s->ch_offset = 0;
@@ -1650,7 +1643,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);
+ if (ret < 0)
goto error;
s->block++;
buf += frame_size;
@@ -1663,26 +1657,22 @@ 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(avctx, &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_await2(s->prev_progress, INT_MAX);
+ avctx->execute2(avctx, dsd_channel, frame, NULL, avctx->ch_layout.nb_channels);
+ ff_thread_progress_report2(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(avctx, &s->prev_frame);
- ff_thread_report_progress(&s->curr_frame, INT_MAX, 0);
+ if (s->curr_progress) {
+ if (s->prev_progress)
+ ff_thread_progress_await2(s->prev_progress, INT_MAX);
+ ff_thread_progress_report2(s->curr_progress, INT_MAX);
}
return ret;
@@ -1701,6 +1691,4 @@ 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,
};
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> --- libavcodec/wavpack.c | 100 +++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 56 deletions(-)