virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avio: deprecate url_max_packet_size().

Browse Source 
URLContext.max_packet_size should be used directly.
This commit is contained in:
Anton Khirnov 2011-03-31 17:58:04 +02:00
parent 1869ea03b7
commit 5958df341d
6 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/avio.c
View File

@ -208,6 +208,10 @@ int url_get_file_handle(URLContext *h)
{ {
return ffurl_get_file_handle(h); return ffurl_get_file_handle(h);
} }
int url_get_max_packet_size(URLContext *h)
{
return h->max_packet_size;
}
#endif #endif
#define URL_SCHEME_CHARS \ #define URL_SCHEME_CHARS \
@ -368,11 +372,6 @@ int ffurl_get_file_handle(URLContext *h)
return h->prot->url_get_file_handle(h); return h->prot->url_get_file_handle(h);
} }
int url_get_max_packet_size(URLContext *h)
{
return h->max_packet_size;
}
void url_get_filename(URLContext *h, char *buf, int buf_size) void url_get_filename(URLContext *h, char *buf, int buf_size)
{ {
av_strlcpy(buf, h->filename, buf_size); av_strlcpy(buf, h->filename, buf_size);

11
libavformat/avio.h
View File

@ -112,6 +112,7 @@ attribute_deprecated int64_t url_seek(URLContext *h, int64_t pos, int whence);
attribute_deprecated int url_close(URLContext *h); attribute_deprecated int url_close(URLContext *h);
attribute_deprecated int64_t url_filesize(URLContext *h); attribute_deprecated int64_t url_filesize(URLContext *h);
attribute_deprecated int url_get_file_handle(URLContext *h); attribute_deprecated int url_get_file_handle(URLContext *h);
attribute_deprecated int url_get_max_packet_size(URLContext *h);
#endif #endif
/** /**
@ -120,16 +121,6 @@ attribute_deprecated int url_get_file_handle(URLContext *h);
*/ */
int url_exist(const char *url); int url_exist(const char *url);
/**
* Return the maximum packet size associated to packetized file
* handle. If the file is not packetized (stream like HTTP or file on
* disk), then 0 is returned.
*
* @param h file handle
* @return maximum packet size in bytes
*/
int url_get_max_packet_size(URLContext *h);
/** /**
* Copy the filename of the resource accessed by h to buf. * Copy the filename of the resource accessed by h to buf.
* *

2
libavformat/aviobuf.c
View File

@ -828,7 +828,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
uint8_t *buffer; uint8_t *buffer;
int buffer_size, max_packet_size; int buffer_size, max_packet_size;
max_packet_size = url_get_max_packet_size(h); max_packet_size = h->max_packet_size;
if (max_packet_size) { if (max_packet_size) {
buffer_size = max_packet_size; /* no need to bufferize more than one packet */ buffer_size = max_packet_size; /* no need to bufferize more than one packet */
} else { } else {

2
libavformat/rtmpproto.c
View File

@ -888,7 +888,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
rt->flv_off = 0; rt->flv_off = 0;
} }
s->max_packet_size = url_get_max_packet_size(rt->stream); s->max_packet_size = rt->stream->max_packet_size;
s->is_streamed = 1; s->is_streamed = 1;
return 0; return 0;

2
libavformat/rtpproto.c
View File

@ -206,7 +206,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
s->rtp_fd = ffurl_get_file_handle(s->rtp_hd); s->rtp_fd = ffurl_get_file_handle(s->rtp_hd);
s->rtcp_fd = ffurl_get_file_handle(s->rtcp_hd); s->rtcp_fd = ffurl_get_file_handle(s->rtcp_hd);
h->max_packet_size = url_get_max_packet_size(s->rtp_hd); h->max_packet_size = s->rtp_hd->max_packet_size;
h->is_streamed = 1; h->is_streamed = 1;
return 0; return 0;

2
libavformat/sapenc.c
View File

@ -218,7 +218,7 @@ static int sap_write_header(AVFormatContext *s)
pos += strlen(&sap->ann[pos]); pos += strlen(&sap->ann[pos]);
sap->ann_size = pos; sap->ann_size = pos;
if (sap->ann_size > url_get_max_packet_size(sap->ann_fd)) { if (sap->ann_size > sap->ann_fd->max_packet_size) {
av_log(s, AV_LOG_ERROR, "Announcement too large to send in one " av_log(s, AV_LOG_ERROR, "Announcement too large to send in one "
"packet\n"); "packet\n");
goto fail; goto fail;