virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()

Browse Source 
The were wrongly being exported and used by libavdevice

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2014-08-06 20:59:56 -03:00 committed by Michael Niedermayer
parent 1c59419419
commit 5b12b4fc4b
6 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavdevice/iec61883.c
View File

@ -216,8 +216,8 @@ static int iec61883_parse_queue_hdv(struct iec61883_data *dv, AVPacket *pkt)
while (dv->queue_first) { while (dv->queue_first) {
packet = dv->queue_first; packet = dv->queue_first;
size = ff_mpegts_parse_packet(dv->mpeg_demux, pkt, packet->buf, size = avpriv_mpegts_parse_packet(dv->mpeg_demux, pkt, packet->buf,
packet->len); packet->len);
dv->queue_first = packet->next; dv->queue_first = packet->next;
av_free(packet->buf); av_free(packet->buf);
av_free(packet); av_free(packet);
@ -356,7 +356,7 @@ static int iec61883_read_header(AVFormatContext *context)
avformat_new_stream(context, NULL); avformat_new_stream(context, NULL);
dv->mpeg_demux = ff_mpegts_parse_open(context); dv->mpeg_demux = avpriv_mpegts_parse_open(context);
if (!dv->mpeg_demux) if (!dv->mpeg_demux)
goto fail; goto fail;
@ -447,7 +447,7 @@ static int iec61883_close(AVFormatContext *context)
if (dv->type == IEC61883_HDV) { if (dv->type == IEC61883_HDV) {
iec61883_mpeg2_recv_stop(dv->iec61883_mpeg2); iec61883_mpeg2_recv_stop(dv->iec61883_mpeg2);
iec61883_mpeg2_close(dv->iec61883_mpeg2); iec61883_mpeg2_close(dv->iec61883_mpeg2);
ff_mpegts_parse_close(dv->mpeg_demux); avpriv_mpegts_parse_close(dv->mpeg_demux);
} else { } else {
iec61883_dv_fb_stop(dv->iec61883_dv); iec61883_dv_fb_stop(dv->iec61883_dv);
iec61883_dv_fb_close(dv->iec61883_dv); iec61883_dv_fb_close(dv->iec61883_dv);

26
libavformat/mpegts.c
View File

@ -2625,7 +2625,7 @@ static int64_t mpegts_get_dts(AVFormatContext *s, int stream_index,
/**************************************************************/ /**************************************************************/
/* parsing functions - called from other demuxers such as RTP */ /* parsing functions - called from other demuxers such as RTP */
MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s) MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s)
{ {
MpegTSContext *ts; MpegTSContext *ts;
@ -2644,8 +2644,8 @@ MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s)
/* return the consumed length if a packet was output, or -1 if no /* return the consumed length if a packet was output, or -1 if no
* packet is output */ * packet is output */
int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len) const uint8_t *buf, int len)
{ {
int len1; int len1;
@ -2669,12 +2669,30 @@ int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
return len1 - len; return len1 - len;
} }
void ff_mpegts_parse_close(MpegTSContext *ts) void avpriv_mpegts_parse_close(MpegTSContext *ts)
{ {
mpegts_free(ts); mpegts_free(ts);
av_free(ts); av_free(ts);
} }
#if LIBAVFORMAT_VERSION_MAJOR < 56
MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s)
{
return avpriv_mpegts_parse_open(s);
}
int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len)
{
return avpriv_mpegts_parse_packet(ts, pkt, buf, len);
}
void ff_mpegts_parse_close(MpegTSContext *ts)
{
return avpriv_mpegts_parse_close(ts);
}
#endif
AVInputFormat ff_mpegts_demuxer = { AVInputFormat ff_mpegts_demuxer = {
.name = "mpegts", .name = "mpegts",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),

7
libavformat/mpegts.h
View File

@ -63,10 +63,17 @@
typedef struct MpegTSContext MpegTSContext; typedef struct MpegTSContext MpegTSContext;
MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s);
int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len);
void avpriv_mpegts_parse_close(MpegTSContext *ts);
#if LIBAVFORMAT_VERSION_MAJOR < 56
MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s); MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s);
int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
const uint8_t *buf, int len); const uint8_t *buf, int len);
void ff_mpegts_parse_close(MpegTSContext *ts); void ff_mpegts_parse_close(MpegTSContext *ts);
#endif
typedef struct SLConfigDescr { typedef struct SLConfigDescr {
int use_au_start; int use_au_start;

12
libavformat/rtpdec_mpegts.c
View File

@ -40,14 +40,14 @@ static void mpegts_free_context(PayloadContext *data)
if (!data) if (!data)
return; return;
if (data->ts) if (data->ts)
ff_mpegts_parse_close(data->ts); avpriv_mpegts_parse_close(data->ts);
av_free(data); av_free(data);
} }
static av_cold int mpegts_init(AVFormatContext *ctx, int st_index, static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
PayloadContext *data) PayloadContext *data)
{ {
data->ts = ff_mpegts_parse_open(ctx); data->ts = avpriv_mpegts_parse_open(ctx);
if (!data->ts) if (!data->ts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return 0; return 0;
@ -72,8 +72,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
if (!buf) { if (!buf) {
if (data->read_buf_index >= data->read_buf_size) if (data->read_buf_index >= data->read_buf_size)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
ret = ff_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index, ret = avpriv_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index,
data->read_buf_size - data->read_buf_index); data->read_buf_size - data->read_buf_index);
if (ret < 0) if (ret < 0)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
data->read_buf_index += ret; data->read_buf_index += ret;
@ -83,8 +83,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
return 0; return 0;
} }
ret = ff_mpegts_parse_packet(data->ts, pkt, buf, len); ret = avpriv_mpegts_parse_packet(data->ts, pkt, buf, len);
/* The only error that can be returned from ff_mpegts_parse_packet /* The only error that can be returned from avpriv_mpegts_parse_packet
* is "no more data to return from the provided buffer", so return * is "no more data to return from the provided buffer", so return
* AVERROR(EAGAIN) for all errors */ * AVERROR(EAGAIN) for all errors */
if (ret < 0) if (ret < 0)

8
libavformat/rtsp.c
View File

@ -439,7 +439,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
/* no corresponding stream */ /* no corresponding stream */
if (rt->transport == RTSP_TRANSPORT_RAW) { if (rt->transport == RTSP_TRANSPORT_RAW) {
if (!rt->ts && CONFIG_RTPDEC) if (!rt->ts && CONFIG_RTPDEC)
rt->ts = ff_mpegts_parse_open(s); rt->ts = avpriv_mpegts_parse_open(s);
} else { } else {
RTPDynamicProtocolHandler *handler; RTPDynamicProtocolHandler *handler;
handler = ff_rtp_handler_find_by_id( handler = ff_rtp_handler_find_by_id(
@ -728,7 +728,7 @@ void ff_rtsp_close_streams(AVFormatContext *s)
avformat_close_input(&rt->asf_ctx); avformat_close_input(&rt->asf_ctx);
} }
if (rt->ts && CONFIG_RTPDEC) if (rt->ts && CONFIG_RTPDEC)
ff_mpegts_parse_close(rt->ts); avpriv_mpegts_parse_close(rt->ts);
av_free(rt->p); av_free(rt->p);
av_free(rt->recvbuf); av_free(rt->recvbuf);
} }
@ -1977,7 +1977,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
} else if (rt->transport == RTSP_TRANSPORT_RTP) { } else if (rt->transport == RTSP_TRANSPORT_RTP) {
ret = ff_rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0); ret = ff_rtp_parse_packet(rt->cur_transport_priv, pkt, NULL, 0);
} else if (rt->ts && CONFIG_RTPDEC) { } else if (rt->ts && CONFIG_RTPDEC) {
ret = ff_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf + rt->recvbuf_pos, rt->recvbuf_len - rt->recvbuf_pos); ret = avpriv_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf + rt->recvbuf_pos, rt->recvbuf_len - rt->recvbuf_pos);
if (ret >= 0) { if (ret >= 0) {
rt->recvbuf_pos += ret; rt->recvbuf_pos += ret;
ret = rt->recvbuf_pos < rt->recvbuf_len; ret = rt->recvbuf_pos < rt->recvbuf_len;
@ -2116,7 +2116,7 @@ redo:
} }
} }
} else if (rt->ts && CONFIG_RTPDEC) { } else if (rt->ts && CONFIG_RTPDEC) {
ret = ff_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf, len); ret = avpriv_mpegts_parse_packet(rt->ts, pkt, rt->recvbuf, len);
if (ret >= 0) { if (ret >= 0) {
if (ret < len) { if (ret < len) {
rt->recvbuf_len = len; rt->recvbuf_len = len;

4
libavformat/version.h
View File

@ -31,8 +31,8 @@
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 51 #define LIBAVFORMAT_VERSION_MINOR 52
#define LIBAVFORMAT_VERSION_MICRO 101 #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, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \