diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-03-17 10:16:07 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-04 00:47:05 +0400 |
commit | 6dc7d80de7236d04a6ee30f0e4cd03f055893bcf (patch) | |
tree | 77a8c7064de540bb0d7828410b727e74749a604f /libavformat | |
parent | b92c5452822f9f58d33daf933a0d2a5516866bc1 (diff) |
avio: avio_ prefix for url_close_dyn_buf
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/asfenc.c | 6 | ||||
-rw-r--r-- | libavformat/avc.c | 2 | ||||
-rw-r--r-- | libavformat/avio.h | 3 | ||||
-rw-r--r-- | libavformat/aviobuf.c | 8 | ||||
-rw-r--r-- | libavformat/matroskaenc.c | 4 | ||||
-rw-r--r-- | libavformat/movenc.c | 2 | ||||
-rw-r--r-- | libavformat/movenchint.c | 6 | ||||
-rw-r--r-- | libavformat/mp3enc.c | 2 | ||||
-rw-r--r-- | libavformat/nutenc.c | 12 | ||||
-rw-r--r-- | libavformat/oggenc.c | 2 | ||||
-rw-r--r-- | libavformat/rtpdec.c | 6 | ||||
-rw-r--r-- | libavformat/rtpdec_asf.c | 6 | ||||
-rw-r--r-- | libavformat/rtpdec_latm.c | 6 | ||||
-rw-r--r-- | libavformat/rtpdec_svq3.c | 6 | ||||
-rw-r--r-- | libavformat/rtpdec_vp8.c | 4 | ||||
-rw-r--r-- | libavformat/rtpdec_xiph.c | 4 | ||||
-rw-r--r-- | libavformat/rtpenc_chain.c | 2 | ||||
-rw-r--r-- | libavformat/rtsp.c | 2 | ||||
-rw-r--r-- | libavformat/rtspenc.c | 2 |
19 files changed, 45 insertions, 40 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 40ccc19a32..f9cc609eef 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -238,7 +238,7 @@ static void put_str16(AVIOContext *s, const char *tag) return; avio_put_str16le(dyn_buf, tag); - len = url_close_dyn_buf(dyn_buf, &pb); + len = avio_close_dyn_buf(dyn_buf, &pb); avio_wl16(s, len); avio_write(s, pb, len); av_freep(&pb); @@ -375,7 +375,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data len = tags[n] ? avio_put_str16le(dyn_buf, tags[n]->value) : 0; avio_wl16(pb, len); } - len = url_close_dyn_buf(dyn_buf, &buf); + len = avio_close_dyn_buf(dyn_buf, &buf); avio_write(pb, buf, len); av_freep(&buf); end_header(pb, hpos); @@ -501,7 +501,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data return AVERROR(ENOMEM); avio_put_str16le(dyn_buf, desc); - len = url_close_dyn_buf(dyn_buf, &buf); + len = avio_close_dyn_buf(dyn_buf, &buf); avio_wl16(pb, len / 2); // "number of characters" = length in bytes / 2 avio_write(pb, buf, len); diff --git a/libavformat/avc.c b/libavformat/avc.c index 274b490cf5..70a05ec5bc 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -96,7 +96,7 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) ff_avc_parse_nal_units(pb, buf_in, *size); av_freep(buf); - *size = url_close_dyn_buf(pb, buf); + *size = avio_close_dyn_buf(pb, buf); return 0; } diff --git a/libavformat/avio.h b/libavformat/avio.h index 9e21057b85..5bc85827d1 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -448,6 +448,7 @@ attribute_deprecated int url_fprintf(AVIOContext *s, const char *fmt, ...); #endif attribute_deprecated void put_flush_packet(AVIOContext *s); attribute_deprecated int url_open_dyn_buf(AVIOContext **s); +attribute_deprecated int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); /** * @} */ @@ -704,7 +705,7 @@ int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size); * @param pbuffer pointer to a byte buffer * @return the length of the byte buffer */ -int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); +int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); #if FF_API_UDP_GET_FILE int udp_get_file_handle(URLContext *h); diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 53fce9e724..cb5f2790f7 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -423,6 +423,10 @@ int url_open_dyn_buf(AVIOContext **s) { return avio_open_dyn_buf(s); } +int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) +{ + return avio_close_dyn_buf(s, pbuffer); +} #endif int avio_put_str(AVIOContext *s, const char *str) @@ -1027,7 +1031,7 @@ int64_t ffio_read_seek(AVIOContext *s, int stream_index, return ret; } -/* avio_open_dyn_buf and url_close_dyn_buf are used in rtp.c to send a response +/* avio_open_dyn_buf and avio_close_dyn_buf are used in rtp.c to send a response * back to the server even if CONFIG_MUXERS is false. */ #if CONFIG_MUXERS || CONFIG_NETWORK /* buffer handling */ @@ -1163,7 +1167,7 @@ int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size) return url_open_dyn_buf_internal(s, max_packet_size); } -int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) +int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) { DynBuffer *d = s->opaque; int size; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f32ab92171..e28ac42a75 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -498,7 +498,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo ff_put_wav_header(dyn_cp, codec); } - codecpriv_size = url_close_dyn_buf(dyn_cp, &codecpriv); + codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv); if (codecpriv_size) put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size); av_free(codecpriv); @@ -1003,7 +1003,7 @@ static void mkv_flush_dynbuf(AVFormatContext *s) if (!mkv->dyn_bc) return; - bufsize = url_close_dyn_buf(mkv->dyn_bc, &dyn_buf); + bufsize = avio_close_dyn_buf(mkv->dyn_bc, &dyn_buf); avio_write(s->pb, dyn_buf, bufsize); av_free(dyn_buf); mkv->dyn_bc = NULL; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6b7da183d8..0458844fc3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1691,7 +1691,7 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov, if (s->nb_chapters) mov_write_chpl_tag(pb_buf, s); - if ((size = url_close_dyn_buf(pb_buf, &buf)) > 0) { + if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) { avio_wb32(pb, size+8); ffio_wfourcc(pb, "udta"); avio_write(pb, buf, size); diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index 567197ee45..eb93ef8d7e 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -408,7 +408,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, /* Fetch the output from the RTP muxer, open a new output buffer * for next time. */ - size = url_close_dyn_buf(rtp_ctx->pb, &buf); + size = avio_close_dyn_buf(rtp_ctx->pb, &buf); if ((ret = url_open_dyn_packet_buf(&rtp_ctx->pb, RTP_MAX_PACKET_SIZE)) < 0) goto done; @@ -424,7 +424,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, av_freep(&buf); /* Write the hint data into the hint track */ - hint_pkt.size = size = url_close_dyn_buf(hintbuf, &buf); + hint_pkt.size = size = avio_close_dyn_buf(hintbuf, &buf); hint_pkt.data = buf; hint_pkt.pts = hint_pkt.dts; hint_pkt.stream_index = track_index; @@ -448,7 +448,7 @@ void ff_mov_close_hinting(MOVTrack *track) { return; if (rtp_ctx->pb) { av_write_trailer(rtp_ctx); - url_close_dyn_buf(rtp_ctx->pb, &ptr); + avio_close_dyn_buf(rtp_ctx->pb, &ptr); av_free(ptr); } avformat_free_context(rtp_ctx); diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 2cbd5e224a..d46e67b70c 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -115,7 +115,7 @@ static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2 put(dyn_buf, str1); if (str2) put(dyn_buf, str2); - len = url_close_dyn_buf(dyn_buf, &pb); + len = avio_close_dyn_buf(dyn_buf, &pb); avio_wb32(s->pb, tag); id3v2_put_size(s, len); diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 5463749a50..c17a15dbf3 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -281,7 +281,7 @@ static inline void put_s_trace(AVIOContext *bc, int64_t v, char *file, char *fun //FIXME remove calculate_checksum static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, int calculate_checksum, uint64_t startcode){ uint8_t *dyn_buf=NULL; - int dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf); + int dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf); int forw_ptr= dyn_size + 4*calculate_checksum; if(forw_ptr > 4096) @@ -450,7 +450,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc){ ff_put_v(bc, count); - dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf); avio_write(bc, dyn_buf, dyn_size); av_free(dyn_buf); return 0; @@ -470,7 +470,7 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id){ if (st->disposition & ff_nut_dispositions[i].flag) count += add_info(dyn_bc, "Disposition", ff_nut_dispositions[i].str); } - dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); if (count) { ff_put_v(bc, stream_id + 1); //stream_id_plus1 @@ -509,7 +509,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id) ff_put_v(bc, count); - dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf); + dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); avio_write(bc, dyn_buf, dyn_size); av_freep(&dyn_buf); return 0; @@ -554,7 +554,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){ put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE); else { uint8_t* buf; - url_close_dyn_buf(dyn_bc, &buf); + avio_close_dyn_buf(dyn_bc, &buf); av_free(buf); } } @@ -566,7 +566,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){ ret = write_chapter(nut, dyn_bc, i); if (ret < 0) { uint8_t *buf; - url_close_dyn_buf(dyn_bc, &buf); + avio_close_dyn_buf(dyn_bc, &buf); av_freep(&buf); return ret; } diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 8a0fffb138..92c751c07a 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -101,7 +101,7 @@ static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) ogg_update_checksum(s, pb, crc_offset); avio_flush(pb); - size = url_close_dyn_buf(pb, &buf); + size = avio_close_dyn_buf(pb, &buf); if (size < 0) return size; diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 3d03b815c2..bbd5f338ed 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -321,7 +321,7 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) } avio_flush(pb); - len = url_close_dyn_buf(pb, &buf); + len = avio_close_dyn_buf(pb, &buf); if ((len > 0) && buf) { int result; av_dlog(s->ic, "sending %d bytes of RR\n", len); @@ -349,7 +349,7 @@ void rtp_send_punch_packets(URLContext* rtp_handle) avio_wb32(pb, 0); /* SSRC */ avio_flush(pb); - len = url_close_dyn_buf(pb, &buf); + len = avio_close_dyn_buf(pb, &buf); if ((len > 0) && buf) url_write(rtp_handle, buf, len); av_free(buf); @@ -364,7 +364,7 @@ void rtp_send_punch_packets(URLContext* rtp_handle) avio_wb32(pb, 0); /* our own SSRC */ avio_flush(pb); - len = url_close_dyn_buf(pb, &buf); + len = avio_close_dyn_buf(pb, &buf); if ((len > 0) && buf) url_write(rtp_handle, buf, len); av_free(buf); diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index ae9d53c2a3..a8326cf123 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -203,7 +203,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, */ if (asf->pktbuf && len_off != avio_tell(asf->pktbuf)) { uint8_t *p; - url_close_dyn_buf(asf->pktbuf, &p); + avio_close_dyn_buf(asf->pktbuf, &p); asf->pktbuf = NULL; av_free(p); } @@ -217,7 +217,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, avio_skip(pb, len - off); if (!(flags & RTP_FLAG_MARKER)) return -1; - out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf); + out_len = avio_close_dyn_buf(asf->pktbuf, &asf->buf); asf->pktbuf = NULL; } else { /** @@ -272,7 +272,7 @@ static void asfrtp_free_context(PayloadContext *asf) { if (asf->pktbuf) { uint8_t *p = NULL; - url_close_dyn_buf(asf->pktbuf, &p); + avio_close_dyn_buf(asf->pktbuf, &p); asf->pktbuf = NULL; av_free(p); } diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c index e3f1604a54..5bf4c1964e 100644 --- a/libavformat/rtpdec_latm.c +++ b/libavformat/rtpdec_latm.c @@ -43,7 +43,7 @@ static void latm_free_context(PayloadContext *data) return; if (data->dyn_buf) { uint8_t *p; - url_close_dyn_buf(data->dyn_buf, &p); + avio_close_dyn_buf(data->dyn_buf, &p); av_free(p); } av_free(data->buf); @@ -60,7 +60,7 @@ static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data, if (!data->dyn_buf || data->timestamp != *timestamp) { av_freep(&data->buf); if (data->dyn_buf) - url_close_dyn_buf(data->dyn_buf, &data->buf); + avio_close_dyn_buf(data->dyn_buf, &data->buf); data->dyn_buf = NULL; av_freep(&data->buf); @@ -73,7 +73,7 @@ static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data, if (!(flags & RTP_FLAG_MARKER)) return AVERROR(EAGAIN); av_free(data->buf); - data->len = url_close_dyn_buf(data->dyn_buf, &data->buf); + data->len = avio_close_dyn_buf(data->dyn_buf, &data->buf); data->dyn_buf = NULL; data->pos = 0; } diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c index e93e31c0e2..8c0926212c 100644 --- a/libavformat/rtpdec_svq3.c +++ b/libavformat/rtpdec_svq3.c @@ -83,7 +83,7 @@ static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv, if (sv->pktbuf) { uint8_t *tmp; - url_close_dyn_buf(sv->pktbuf, &tmp); + avio_close_dyn_buf(sv->pktbuf, &tmp); av_free(tmp); } if ((res = avio_open_dyn_buf(&sv->pktbuf)) < 0) @@ -100,7 +100,7 @@ static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv, av_init_packet(pkt); pkt->stream_index = st->index; *timestamp = sv->timestamp; - pkt->size = url_close_dyn_buf(sv->pktbuf, &pkt->data); + pkt->size = avio_close_dyn_buf(sv->pktbuf, &pkt->data); pkt->destruct = av_destruct_packet; sv->pktbuf = NULL; return 0; @@ -118,7 +118,7 @@ static void svq3_extradata_free(PayloadContext *sv) { if (sv->pktbuf) { uint8_t *buf; - url_close_dyn_buf(sv->pktbuf, &buf); + avio_close_dyn_buf(sv->pktbuf, &buf); av_free(buf); } av_free(sv); diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index f0ebb3173a..9e50cc44e1 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -41,7 +41,7 @@ static void prepare_packet(AVPacket *pkt, PayloadContext *vp8, int stream) av_init_packet(pkt); pkt->stream_index = stream; pkt->flags = vp8->is_keyframe ? AV_PKT_FLAG_KEY : 0; - pkt->size = url_close_dyn_buf(vp8->data, &pkt->data); + pkt->size = avio_close_dyn_buf(vp8->data, &pkt->data); pkt->destruct = av_destruct_packet; vp8->data = NULL; } @@ -138,7 +138,7 @@ static void vp8_free_context(PayloadContext *vp8) { if (vp8->data) { uint8_t *tmp; - url_close_dyn_buf(vp8->data, &tmp); + avio_close_dyn_buf(vp8->data, &tmp); av_free(tmp); } av_free(vp8); diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 9eb1ec2352..4d8e834813 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -57,7 +57,7 @@ static inline void free_fragment_if_needed(PayloadContext * data) { if (data->fragment) { uint8_t* p; - url_close_dyn_buf(data->fragment, &p); + avio_close_dyn_buf(data->fragment, &p); av_free(p); data->fragment = NULL; } @@ -203,7 +203,7 @@ static int xiph_handle_packet(AVFormatContext * ctx, if (fragmented == 3) { // end of xiph data packet av_init_packet(pkt); - pkt->size = url_close_dyn_buf(data->fragment, &pkt->data); + pkt->size = avio_close_dyn_buf(data->fragment, &pkt->data); if (pkt->size < 0) { av_log(ctx, AV_LOG_ERROR, diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index a22804130f..77633ed53e 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -63,7 +63,7 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st, avio_close(rtpctx->pb); } else { uint8_t *ptr; - url_close_dyn_buf(rtpctx->pb, &ptr); + avio_close_dyn_buf(rtpctx->pb, &ptr); av_free(ptr); } avformat_free_context(rtpctx); diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5b98a2846c..90073d63a2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -495,7 +495,7 @@ void ff_rtsp_undo_setup(AVFormatContext *s) av_write_trailer(rtpctx); if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { uint8_t *ptr; - url_close_dyn_buf(rtpctx->pb, &ptr); + avio_close_dyn_buf(rtpctx->pb, &ptr); av_free(ptr); } else { avio_close(rtpctx->pb); diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index 1f1fd32fc1..e3631c4290 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -135,7 +135,7 @@ static int tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st) int size; uint8_t *interleave_header, *interleaved_packet; - size = url_close_dyn_buf(rtpctx->pb, &buf); + size = avio_close_dyn_buf(rtpctx->pb, &buf); ptr = buf; while (size > 4) { uint32_t packet_len = AV_RB32(ptr); |