2fd41c9067
* newdev/master:
avio: make udp_set_remote_url/get_local_port internal.
asfdec: also subtract preroll when reading simple index object
matroskaenc: remove a variable that's unused after bc17bd9.
avio: cosmetics - nicer vertical alignment.
Remove unnecessary icc version checks
Disable 'attribute "foo" ignored' warnings from icc
rtsp: Don't use a locale dependent format string
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
configure: get libavcodec version from new version.h header
lavc: move the version macros to a new installed header.
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
Do not use format string "%0.3f" for RTSP Range field.
Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
Document usage of import libraries created by dlltool
configure: Set the correct lib target for arm/wince dlltool
fate: simplify regression-funcs.sh
fate: add support for multithread testing
Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
79 lines
2.8 KiB
C
79 lines
2.8 KiB
C
/*
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#ifndef AVFORMAT_AVIO_INTERNAL_H
|
|
#define AVFORMAT_AVIO_INTERNAL_H
|
|
|
|
#include "avio.h"
|
|
|
|
int ffio_init_context(AVIOContext *s,
|
|
unsigned char *buffer,
|
|
int buffer_size,
|
|
int write_flag,
|
|
void *opaque,
|
|
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
|
|
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
|
|
int64_t (*seek)(void *opaque, int64_t offset, int whence));
|
|
|
|
|
|
/**
|
|
* 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);
|
|
|
|
static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s)
|
|
{
|
|
avio_wl32(pb, MKTAG(s[0], s[1], s[2], s[3]));
|
|
}
|
|
|
|
/**
|
|
* Rewind the AVIOContext using the specified buffer containing the first buf_size bytes of the file.
|
|
* Used after probing to avoid seeking.
|
|
* Joins buf and s->buffer, taking any overlap into consideration.
|
|
* @note s->buffer must overlap with buf or they can't be joined and the function fails
|
|
*
|
|
* @param s The read-only AVIOContext to rewind
|
|
* @param buf The probe buffer containing the first buf_size bytes of the file
|
|
* @param buf_size The size of buf
|
|
* @return 0 in case of success, a negative value corresponding to an
|
|
* AVERROR code in case of failure
|
|
*/
|
|
int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size);
|
|
|
|
uint64_t ffio_read_varlen(AVIOContext *bc);
|
|
|
|
/** @warning must be called before any I/O */
|
|
int ffio_set_buf_size(AVIOContext *s, int buf_size);
|
|
|
|
int ffio_read_pause(AVIOContext *h, int pause);
|
|
int64_t ffio_read_seek (AVIOContext *h, int stream_index,
|
|
int64_t timestamp, int flags);
|
|
|
|
/* udp.c */
|
|
int ff_udp_set_remote_url(URLContext *h, const char *uri);
|
|
int ff_udp_get_local_port(URLContext *h);
|
|
|
|
|
|
#endif // AVFORMAT_AVIO_INTERNAL_H
|