This function returns the encoded data of a frame, one slice at a time directly when that slice is encoded, instead of waiting for the full frame to be done.
The usefulness of this field is debatable, and it looks like it is mainly a convoluted way to get data at lowest possible latency, and only when transmitting over RTP (despite not being enforced by any means). Moreover when mulithreading is enabled (which is by defaul) the order of returned slices is not deterministic at all, making the use of this function not reliable at all (or at the very least, more complicated than it should be). So, for the reasons stated above, and being used by only a single encoder (mpegvideo), and theoretically available only through a single muxer (rtp), this field is deemed unnecessary, overcomplicated, and not belonging to libavcodec. Signed-off-by: Vittorio Giovara <[email protected]> --- libavcodec/avcodec.h | 6 ++++++ libavcodec/mpegvideo_enc.c | 8 ++++++++ libavcodec/version.h | 3 +++ 3 files changed, 17 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2478715..36905c1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2364,13 +2364,19 @@ typedef struct AVCodecContext { */ int64_t timecode_frame_start; +#if FF_API_RTP_CALLBACK + /** + * @deprecated unused + */ /* The RTP callback: This function is called */ /* every time the encoder has a packet to send. */ /* It depends on the encoder if the data starts */ /* with a Start Code (it should). H.263 does. */ /* mb_nb contains the number of macroblocks */ /* encoded in the RTP payload. */ + attribute_deprecated void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); +#endif int rtp_payload_size; /* The size of the RTP payload: the coder will */ /* do its best to deliver a chunk with size */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ab4fb32..eb7b9e6 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2710,10 +2710,14 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } +#if FF_API_RTP_CALLBACK +FF_DISABLE_DEPRECATION_WARNINGS if (s->avctx->rtp_callback){ int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x; s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif update_mb_info(s, 1); switch(s->codec_id){ @@ -3188,6 +3192,8 @@ static int encode_thread(AVCodecContext *c, void *arg){ write_slice_end(s); +#if FF_API_RTP_CALLBACK +FF_DISABLE_DEPRECATION_WARNINGS /* Send the last GOB if RTP */ if (s->avctx->rtp_callback) { int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x; @@ -3196,6 +3202,8 @@ static int encode_thread(AVCodecContext *c, void *arg){ emms_c(); s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif return 0; } diff --git a/libavcodec/version.h b/libavcodec/version.h index bd75525..fc6094d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -177,5 +177,8 @@ #ifndef FF_API_AVPACKET_OLD_API #define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_RTP_CALLBACK +#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ -- 1.9.5 (Apple Git-50.3) _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
