From b7effd4e8338f6ed5bda630ad7ed0809bf458648 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 Feb 2011 16:43:01 +0100 Subject: avio: avio_ prefixes for get_* functions In the name of consistency: get_byte -> avio_r8 get_ -> avio_r get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje --- libavformat/gxf.c | 70 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'libavformat/gxf.c') diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 3859630100..5b8b33c5f2 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -39,20 +39,20 @@ struct gxf_stream_info { * \return 0 if header not found or contains invalid data, 1 otherwise */ static int parse_packet_header(AVIOContext *pb, GXFPktType *type, int *length) { - if (get_be32(pb)) + if (avio_rb32(pb)) return 0; - if (get_byte(pb) != 1) + if (avio_r8(pb) != 1) return 0; - *type = get_byte(pb); - *length = get_be32(pb); + *type = avio_r8(pb); + *length = avio_rb32(pb); if ((*length >> 24) || *length < 16) return 0; *length -= 16; - if (get_be32(pb)) + if (avio_rb32(pb)) return 0; - if (get_byte(pb) != 0xe1) + if (avio_r8(pb) != 0xe1) return 0; - if (get_byte(pb) != 0xe2) + if (avio_r8(pb) != 0xe2) return 0; return 1; } @@ -161,14 +161,14 @@ static void gxf_material_tags(AVIOContext *pb, int *len, struct gxf_stream_info si->first_field = AV_NOPTS_VALUE; si->last_field = AV_NOPTS_VALUE; while (*len >= 2) { - GXFMatTag tag = get_byte(pb); - int tlen = get_byte(pb); + GXFMatTag tag = avio_r8(pb); + int tlen = avio_r8(pb); *len -= 2; if (tlen > *len) return; *len -= tlen; if (tlen == 4) { - uint32_t value = get_be32(pb); + uint32_t value = avio_rb32(pb); if (tag == MAT_FIRST_FIELD) si->first_field = value; else if (tag == MAT_LAST_FIELD) @@ -210,14 +210,14 @@ static void gxf_track_tags(AVIOContext *pb, int *len, struct gxf_stream_info *si si->frames_per_second = (AVRational){0, 0}; si->fields_per_frame = 0; while (*len >= 2) { - GXFTrackTag tag = get_byte(pb); - int tlen = get_byte(pb); + GXFTrackTag tag = avio_r8(pb); + int tlen = avio_r8(pb); *len -= 2; if (tlen > *len) return; *len -= tlen; if (tlen == 4) { - uint32_t value = get_be32(pb); + uint32_t value = avio_rb32(pb); if (tag == TRACK_FPS) si->frames_per_second = fps_tag2avr(value); else if (tag == TRACK_FPF && (value == 1 || value == 2)) @@ -233,8 +233,8 @@ static void gxf_track_tags(AVIOContext *pb, int *len, struct gxf_stream_info *si static void gxf_read_index(AVFormatContext *s, int pkt_len) { AVIOContext *pb = s->pb; AVStream *st = s->streams[0]; - uint32_t fields_per_map = get_le32(pb); - uint32_t map_cnt = get_le32(pb); + uint32_t fields_per_map = avio_rl32(pb); + uint32_t map_cnt = avio_rl32(pb); int i; pkt_len -= 8; if (s->flags & AVFMT_FLAG_IGNIDX) { @@ -253,7 +253,7 @@ static void gxf_read_index(AVFormatContext *s, int pkt_len) { pkt_len -= 4 * map_cnt; av_add_index_entry(st, 0, 0, 0, 0, 0); for (i = 0; i < map_cnt; i++) - av_add_index_entry(st, (uint64_t)get_le32(pb) * 1024, + av_add_index_entry(st, (uint64_t)avio_rl32(pb) * 1024, i * (uint64_t)fields_per_map + 1, 0, 0, 0); url_fskip(pb, pkt_len); } @@ -271,12 +271,12 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { return 0; } map_len -= 2; - if (get_byte(pb) != 0x0e0 || get_byte(pb) != 0xff) { + if (avio_r8(pb) != 0x0e0 || avio_r8(pb) != 0xff) { av_log(s, AV_LOG_ERROR, "unknown version or invalid map preamble\n"); return 0; } map_len -= 2; - len = get_be16(pb); // length of material data section + len = avio_rb16(pb); // length of material data section if (len > map_len) { av_log(s, AV_LOG_ERROR, "material data longer than map data\n"); return 0; @@ -285,7 +285,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { gxf_material_tags(pb, &len, &si); url_fskip(pb, len); map_len -= 2; - len = get_be16(pb); // length of track description + len = avio_rb16(pb); // length of track description if (len > map_len) { av_log(s, AV_LOG_ERROR, "track description longer than map data\n"); return 0; @@ -296,9 +296,9 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { AVStream *st; int idx; len -= 4; - track_type = get_byte(pb); - track_id = get_byte(pb); - track_len = get_be16(pb); + track_type = avio_r8(pb); + track_id = avio_r8(pb); + track_len = avio_rb16(pb); len -= track_len; gxf_track_tags(pb, &track_len, &si); url_fskip(pb, track_len); @@ -344,7 +344,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { len -= 0x39; url_fskip(pb, 5); // preamble url_fskip(pb, 0x30); // payload description - fps = fps_umf2avr(get_le32(pb)); + fps = fps_umf2avr(avio_rl32(pb)); if (!main_timebase.num || !main_timebase.den) { // this may not always be correct, but simply the best we can get main_timebase.num = fps.den; @@ -370,7 +370,7 @@ static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { { \ if (!max_interval-- || url_feof(pb)) \ goto out; \ - tmp = tmp << 8 | get_byte(pb); \ + tmp = tmp << 8 | avio_r8(pb); \ } /** @@ -389,7 +389,7 @@ static int64_t gxf_resync_media(AVFormatContext *s, uint64_t max_interval, int t int len; AVIOContext *pb = s->pb; GXFPktType type; - tmp = get_be32(pb); + tmp = avio_rb32(pb); start: while (tmp) READ_ONE(); @@ -404,9 +404,9 @@ start: goto out; goto start; } - get_byte(pb); - cur_track = get_byte(pb); - cur_timestamp = get_be32(pb); + avio_r8(pb); + cur_track = avio_r8(pb); + cur_timestamp = avio_rb32(pb); last_found_pos = url_ftell(pb) - 16 - 6; if ((track >= 0 && track != cur_track) || (timestamp >= 0 && timestamp > cur_timestamp)) { if (url_fseek(pb, last_pos, SEEK_SET) >= 0) @@ -445,17 +445,17 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) { continue; } pkt_len -= 16; - track_type = get_byte(pb); - track_id = get_byte(pb); + track_type = avio_r8(pb); + track_id = avio_r8(pb); stream_index = get_sindex(s, track_id, track_type); if (stream_index < 0) return stream_index; st = s->streams[stream_index]; - field_nr = get_be32(pb); - field_info = get_be32(pb); - get_be32(pb); // "timeline" field number - get_byte(pb); // flags - get_byte(pb); // reserved + field_nr = avio_rb32(pb); + field_info = avio_rb32(pb); + avio_rb32(pb); // "timeline" field number + avio_r8(pb); // flags + avio_r8(pb); // reserved if (st->codec->codec_id == CODEC_ID_PCM_S24LE || st->codec->codec_id == CODEC_ID_PCM_S16LE) { int first = field_info >> 16; -- cgit v1.2.3