x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-11 08:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/ohdec: Check mutex/conditions initialization

Browse Source 
Reviewed-by: Zhao Zhili <quinkblack@foxmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-09-25 05:29:58 +02:00
parent 748fa0a9bb
commit 371931250a
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/ohdec.c
+13 -10
View File
@@ -37,6 +37,7 @@
#include "decode.h"
#include "hwconfig.h"
#include "ohcodec.h"
#include "pthread_internal.h"
typedef struct OHCodecDecContext {
AVClass *avclass;
@@ -70,8 +71,14 @@ typedef struct OHCodecDecContext {
char *name;
int allow_sw;
unsigned mutex_cond_cnt;
} OHCodecDecContext;
#define OFFSET(x) offsetof(OHCodecDecContext, x)
DEFINE_OFFSET_ARRAY(OHCodecDecContext, mutex_cond, mutex_cond_cnt,
(OFFSET(input_mutex), OFFSET(output_mutex)),
(OFFSET(input_cond), OFFSET(output_cond)));
typedef struct OHCodecBuffer {
uint32_t index;
OH_AVBuffer *buffer;
@@ -367,12 +374,11 @@ static av_cold int oh_decode_init(AVCodecContext *avctx)
OHCodecDecContext *s = avctx->priv_data;
// Initialize these fields first, so oh_decode_close can destroy them safely
ff_mutex_init(&s->input_mutex, NULL);
ff_cond_init(&s->input_cond, NULL);
ff_mutex_init(&s->output_mutex, NULL);
ff_cond_init(&s->output_cond, NULL);
int ret = ff_pthread_init(s, mutex_cond_offsets);
if (ret < 0)
return ret;
int ret = oh_decode_create(s, avctx);
ret = oh_decode_create(s, avctx);
if (ret < 0)
return ret;
ret = oh_decode_set_format(s, avctx);
@@ -414,14 +420,12 @@ static av_cold int oh_decode_close(AVCodecContext *avctx)
av_packet_unref(&s->pkt);
ff_mutex_destroy(&s->input_mutex);
ff_cond_destroy(&s->input_cond);
av_fifo_freep2(&s->input_queue);
ff_mutex_destroy(&s->output_mutex);
ff_cond_destroy(&s->output_cond);
av_fifo_freep2(&s->output_queue);
ff_pthread_free(s, mutex_cond_offsets);
return 0;
}
@@ -718,7 +722,6 @@ static const AVCodecHWConfigInternal *const oh_hw_configs[] = {
NULL
};
#define OFFSET(x) offsetof(OHCodecDecContext, x)
#define VD (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM)
static const AVOption ohcodec_vdec_options[] = {
{"codec_name", "Select codec by name",