diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-10-26 14:59:15 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-12-14 11:06:44 +0300 |
commit | 061a0c14bb5767bca72e3a7227ca400de439ba09 (patch) | |
tree | 7b123da4ad30c37c9a954dc274c6208ea5311c83 /libavcodec/internal.h | |
parent | 549d0bdca53af7a6e0c612ab4b03baecf3a5878f (diff) |
decode: restructure the core decoding code
Currently, the new decoding API is pretty much just a wrapper around the
old deprecated one. This is problematic, since it interferes with making
full use of the flexibility added by the new API. The old API should
also be removed at some future point.
Reorganize the code so that the new send_packet/receive_frame functions
call the actual decoding directly and change the old deprecated
avcodec_decode_* functions into wrappers around the new API.
The new internal API for decoders is now changing as well. Before this
commit, it mirrors the public API, so the decoders need to implement
send_packet() and receive_frame() callbacks. This turns out to require
awkward constructs in both the decoders and the generic code. After this
commit, the decoders only implement the receive_frame() callback and
call a new internal function, ff_decode_get_packet() to obtain input
data, in the same manner to how the bitstream filters now work.
avcodec will now always make a reference to the input packet, which means
that non-refcounted input packets will be copied. Keeping the previous
behaviour, where this copy could sometimes be avoided, would make the
code significantly more complex and fragile for only dubious gains,
since packets are typically small and everyone who cares about
performance should use refcounted packets anyway.
Diffstat (limited to 'libavcodec/internal.h')
-rw-r--r-- | libavcodec/internal.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 2ca7a45e81..dc24e8f764 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -94,6 +94,11 @@ typedef struct FramePool { int samples; } FramePool; +typedef struct DecodeSimpleContext { + AVPacket *in_pkt; + AVFrame *out_frame; +} DecodeSimpleContext; + typedef struct AVCodecInternal { /** * Whether the parent AVCodecContext is a copy of the context which had @@ -130,6 +135,8 @@ typedef struct AVCodecInternal { void *thread_ctx; + DecodeSimpleContext ds; + /** * Properties (timestamps+side data) extracted from the last packet passed * for decoding. @@ -153,6 +160,16 @@ typedef struct AVCodecInternal { int buffer_pkt_valid; // encoding: packet without data can be valid AVFrame *buffer_frame; int draining_done; + /* set to 1 when the caller is using the old decoding API */ + int compat_decode; + int compat_decode_warned; + /* this variable is set by the decoder internals to signal to the old + * API compat wrappers the amount of data consumed from the last packet */ + size_t compat_decode_consumed; + /* when a partial packet has been consumed, this stores the remaining size + * of the packet (that should be submitted in the next decode call */ + size_t compat_decode_partial_size; + AVFrame *compat_decode_frame; } AVCodecInternal; struct AVCodecDefault { |