mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
lavf: make avio_read_partial() public
Main use-case is proxying avio through a foreign I/O layer and a custom
AVIO context, without losing latency and performance characteristics.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Merged from Libav commit 173b56218f
.
This commit is contained in:
parent
877076ffa1
commit
5d76674756
@ -15,6 +15,9 @@ libavutil: 2015-08-28
|
|||||||
|
|
||||||
API changes, most recent first:
|
API changes, most recent first:
|
||||||
|
|
||||||
|
2017-09-01 - xxxxxxx - lavf 57.81.100 - avio.h
|
||||||
|
Add avio_read_partial().
|
||||||
|
|
||||||
2017-09-01 - xxxxxxx - lavf 57.80.100 / 57.11.0 - avio.h
|
2017-09-01 - xxxxxxx - lavf 57.80.100 / 57.11.0 - avio.h
|
||||||
Add avio_context_free(). From now on it must be used for freeing AVIOContext.
|
Add avio_context_free(). From now on it must be used for freeing AVIOContext.
|
||||||
|
|
||||||
|
@ -598,6 +598,15 @@ void avio_flush(AVIOContext *s);
|
|||||||
*/
|
*/
|
||||||
int avio_read(AVIOContext *s, unsigned char *buf, int size);
|
int avio_read(AVIOContext *s, unsigned char *buf, int size);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read size bytes from AVIOContext into buf. Unlike avio_read(), this is allowed
|
||||||
|
* to read fewer bytes than requested. The missing bytes can be read in the next
|
||||||
|
* call. This always tries to read at least 1 byte.
|
||||||
|
* Useful to reduce latency in certain cases.
|
||||||
|
* @return number of bytes read or AVERROR
|
||||||
|
*/
|
||||||
|
int avio_read_partial(AVIOContext *s, unsigned char *buf, int size);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name Functions for reading from AVIOContext
|
* @name Functions for reading from AVIOContext
|
||||||
* @{
|
* @{
|
||||||
|
@ -53,14 +53,6 @@ int ffio_init_context(AVIOContext *s,
|
|||||||
*/
|
*/
|
||||||
int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data);
|
int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data);
|
||||||
|
|
||||||
/**
|
|
||||||
* Read size bytes from AVIOContext into buf.
|
|
||||||
* This reads at most 1 packet. If that is not enough fewer bytes will be
|
|
||||||
* returned.
|
|
||||||
* @return number of bytes read or AVERROR
|
|
||||||
*/
|
|
||||||
int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size);
|
|
||||||
|
|
||||||
void ffio_fill(AVIOContext *s, int b, int count);
|
void ffio_fill(AVIOContext *s, int b, int count);
|
||||||
|
|
||||||
static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s)
|
static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s)
|
||||||
|
@ -703,7 +703,7 @@ int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsig
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size)
|
int avio_read_partial(AVIOContext *s, unsigned char *buf, int size)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
|
|||||||
|
|
||||||
pkt->pos= avio_tell(s->pb);
|
pkt->pos= avio_tell(s->pb);
|
||||||
pkt->stream_index = 0;
|
pkt->stream_index = 0;
|
||||||
ret = ffio_read_partial(s->pb, pkt->data, size);
|
ret = avio_read_partial(s->pb, pkt->data, size);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
av_packet_unref(pkt);
|
av_packet_unref(pkt);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -2136,7 +2136,7 @@ redo:
|
|||||||
wait_end && wait_end < av_gettime_relative())
|
wait_end && wait_end < av_gettime_relative())
|
||||||
len = AVERROR(EAGAIN);
|
len = AVERROR(EAGAIN);
|
||||||
else
|
else
|
||||||
len = ffio_read_partial(s->pb, rt->recvbuf, RECVBUF_SIZE);
|
len = avio_read_partial(s->pb, rt->recvbuf, RECVBUF_SIZE);
|
||||||
len = pick_stream(s, &rtsp_st, rt->recvbuf, len);
|
len = pick_stream(s, &rtsp_st, rt->recvbuf, len);
|
||||||
if (len > 0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP)
|
if (len > 0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP)
|
||||||
ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, NULL, s->pb, len);
|
ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, NULL, s->pb, len);
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
||||||
// Also please add any ticket numbers that you believe might be affected here
|
// Also please add any ticket numbers that you believe might be affected here
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 57
|
#define LIBAVFORMAT_VERSION_MAJOR 57
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 80
|
#define LIBAVFORMAT_VERSION_MINOR 81
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 100
|
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
|
Loading…
Reference in New Issue
Block a user