Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavc/thread: move generic-layer API to avcodec_internal.h

Browse source 
thread.h currently contains both API for decoder use and functions
internal to lavc generic layer. Move the latter to avcodec_internal.h,
which is a more appropriate place for them.
This commit is contained in:
Anton Khirnov 2024-03-08 09:06:30 +01:00
parent 8d5efc2182
commit d94cfd4900
4 changed files with 26 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libavcodec/avcodec_internal.h
View file

@ -72,4 +72,28 @@ struct AVCodecInternal *ff_encode_internal_alloc(void);
void ff_codec_close(struct AVCodecContext *avctx);
int ff_thread_init(struct AVCodecContext *s);
void ff_thread_free(struct AVCodecContext *s);
/**
* Wait for decoding threads to finish and reset internal state.
* Called by avcodec_flush_buffers().
*
* @param avctx The context.
*/
void ff_thread_flush(struct AVCodecContext *avctx);
/**
* Submit a new frame to a decoding thread.
* Returns the next available frame in picture. *got_picture_ptr
* will be 0 if none is available.
* The return value on success is the size of the consumed packet for
* compatibility with FFCodec.decode. This means the decoder
* has to consume the full packet.
*
* Parameters are the same as FFCodec.decode.
*/
int ff_thread_decode_frame(struct AVCodecContext *avctx, struct AVFrame *frame,
int *got_picture_ptr, struct AVPacket *avpkt);
#endif // AVCODEC_AVCODEC_INTERNAL_H

1
libavcodec/pthread.c
View file

@ -32,6 +32,7 @@
#include "libavutil/thread.h"
#include "avcodec.h"
#include "avcodec_internal.h"
#include "codec_internal.h"
#include "pthread_internal.h"
#include "thread.h"

25
libavcodec/thread.h
View file

@ -20,7 +20,7 @@
/**
* @file
* Multithreading support functions
* Multithreading API for decoders
* @author Alexander Strange <astrange@ithinksw.com>
*/
@ -31,27 +31,6 @@
#include "avcodec.h"
/**
* Wait for decoding threads to finish and reset internal state.
* Called by avcodec_flush_buffers().
*
* @param avctx The context.
*/
void ff_thread_flush(AVCodecContext *avctx);
/**
* Submit a new frame to a decoding thread.
* Returns the next available frame in picture. *got_picture_ptr
* will be 0 if none is available.
* The return value on success is the size of the consumed packet for
* compatibility with FFCodec.decode. This means the decoder
* has to consume the full packet.
*
* Parameters are the same as FFCodec.decode.
*/
int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr, AVPacket *avpkt);
int ff_thread_can_start_frame(AVCodecContext *avctx);
/**
@ -74,11 +53,9 @@ void ff_thread_finish_setup(AVCodecContext *avctx);
*/
int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f, int flags);
int ff_thread_init(AVCodecContext *s);
int ff_slice_thread_execute_with_mainfunc(AVCodecContext *avctx,
int (*action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr),
int (*main_func)(AVCodecContext *c), void *arg, int *ret, int job_count);
void ff_thread_free(AVCodecContext *s);
int ff_slice_thread_allocz_entries(AVCodecContext *avctx, int count);
int ff_slice_thread_init_progress(AVCodecContext *avctx);
void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n);

8
libavcodec/utils.c
View file

@ -809,14 +809,6 @@ int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes)
return FFMAX(0, duration);
}
#if !HAVE_THREADS
int ff_thread_init(AVCodecContext *s)
{
return -1;
}
#endif
unsigned int av_xiphlacing(unsigned char *s, unsigned int v)
{
unsigned int n = 0;