mirror of https://github.com/FFmpeg/FFmpeg.git
* qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>oldabi
Michael Niedermayer
14 years ago
commit
434f248723
28 changed files with 660 additions and 526 deletions
@ -0,0 +1,129 @@ |
||||
/*
|
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
/**
|
||||
* @file |
||||
* unbuffered private I/O API |
||||
*/ |
||||
|
||||
#ifndef AVFORMAT_URL_H |
||||
#define AVFORMAT_URL_H |
||||
|
||||
#include "avio.h" |
||||
|
||||
/**
|
||||
* Create a URLContext for accessing to the resource indicated by |
||||
* url, but do not initiate the connection yet. |
||||
* |
||||
* @param puc pointer to the location where, in case of success, the |
||||
* function puts the pointer to the created URLContext |
||||
* @param flags flags which control how the resource indicated by url |
||||
* is to be opened |
||||
* @return 0 in case of success, a negative value corresponding to an |
||||
* AVERROR code in case of failure |
||||
*/ |
||||
int ffurl_alloc(URLContext **h, const char *url, int flags); |
||||
|
||||
/**
|
||||
* Connect an URLContext that has been allocated by ffurl_alloc |
||||
*/ |
||||
int ffurl_connect(URLContext *h); |
||||
|
||||
/**
|
||||
* Create an URLContext for accessing to the resource indicated by |
||||
* url, and open it. |
||||
* |
||||
* @param puc pointer to the location where, in case of success, the |
||||
* function puts the pointer to the created URLContext |
||||
* @param flags flags which control how the resource indicated by url |
||||
* is to be opened |
||||
* @return 0 in case of success, a negative value corresponding to an |
||||
* AVERROR code in case of failure |
||||
*/ |
||||
int ffurl_open(URLContext **h, const char *url, int flags); |
||||
|
||||
/**
|
||||
* Read up to size bytes from the resource accessed by h, and store |
||||
* the read bytes in buf. |
||||
* |
||||
* @return The number of bytes actually read, or a negative value |
||||
* corresponding to an AVERROR code in case of error. A value of zero |
||||
* indicates that it is not possible to read more from the accessed |
||||
* resource (except if the value of the size argument is also zero). |
||||
*/ |
||||
int ffurl_read(URLContext *h, unsigned char *buf, int size); |
||||
|
||||
/**
|
||||
* Read as many bytes as possible (up to size), calling the |
||||
* read function multiple times if necessary. |
||||
* This makes special short-read handling in applications |
||||
* unnecessary, if the return value is < size then it is |
||||
* certain there was either an error or the end of file was reached. |
||||
*/ |
||||
int ffurl_read_complete(URLContext *h, unsigned char *buf, int size); |
||||
|
||||
/**
|
||||
* Write size bytes from buf to the resource accessed by h. |
||||
* |
||||
* @return the number of bytes actually written, or a negative value |
||||
* corresponding to an AVERROR code in case of failure |
||||
*/ |
||||
int ffurl_write(URLContext *h, const unsigned char *buf, int size); |
||||
|
||||
/**
|
||||
* Change the position that will be used by the next read/write |
||||
* operation on the resource accessed by h. |
||||
* |
||||
* @param pos specifies the new position to set |
||||
* @param whence specifies how pos should be interpreted, it must be |
||||
* one of SEEK_SET (seek from the beginning), SEEK_CUR (seek from the |
||||
* current position), SEEK_END (seek from the end), or AVSEEK_SIZE |
||||
* (return the filesize of the requested resource, pos is ignored). |
||||
* @return a negative value corresponding to an AVERROR code in case |
||||
* of failure, or the resulting file position, measured in bytes from |
||||
* the beginning of the file. You can use this feature together with |
||||
* SEEK_CUR to read the current file position. |
||||
*/ |
||||
int64_t ffurl_seek(URLContext *h, int64_t pos, int whence); |
||||
|
||||
/**
|
||||
* Close the resource accessed by the URLContext h, and free the |
||||
* memory used by it. |
||||
* |
||||
* @return a negative value if an error condition occurred, 0 |
||||
* otherwise |
||||
*/ |
||||
int ffurl_close(URLContext *h); |
||||
|
||||
/**
|
||||
* Return the filesize of the resource accessed by h, AVERROR(ENOSYS) |
||||
* if the operation is not supported by h, or another negative value |
||||
* corresponding to an AVERROR error code in case of failure. |
||||
*/ |
||||
int64_t ffurl_size(URLContext *h); |
||||
|
||||
/**
|
||||
* Return the file descriptor associated with this URL. For RTP, this |
||||
* will return only the RTP file descriptor, not the RTCP file descriptor. |
||||
* |
||||
* @return the file descriptor associated with this URL, or <0 on error. |
||||
*/ |
||||
int ffurl_get_file_handle(URLContext *h); |
||||
|
||||
#endif //AVFORMAT_URL_H
|
||||
@ -1,2 +1,2 @@ |
||||
408f47ee5a60866fc751f7bc2314cbd6 *./tests/data/acodec/ac3.rm |
||||
5ddb6d25dd117db29627f9d286153a7a *./tests/data/acodec/ac3.rm |
||||
98751 ./tests/data/acodec/ac3.rm |
||||
|
||||
@ -1,2 +1,2 @@ |
||||
da74fe749c2eb21bbead7de81d2f3078 *./tests/data/lavf/lavf.rm |
||||
a1c71456f21d5459d2824d75bbdcc80c *./tests/data/lavf/lavf.rm |
||||
346706 ./tests/data/lavf/lavf.rm |
||||
|
||||
Loading…
Reference in new issue