comparison gxf.c @ 4074:58051a1dc7ea libavformat

Use "struct gxf_stream_info" instead of "st_info_t", avoids a typedef that is not really worth it and the reserved POSIX _t namespace.

4073:ecad9e1c8e86

#include "libavutil/common.h"
#include "avformat.h"
#include "gxf.h"

typedef struct {
    int64_t first_field;
    int64_t last_field;
    AVRational frames_per_second;
    int32_t fields_per_frame;
} st_info_t;

/**
 * \brief parses a packet header, extracting type and length
 * \param pb ByteIOContext to read header from
 * \param type detected packet type is stored here

/**
 * \brief filters out interesting tags from material information.
 * \param len length of tag section, will be adjusted to contain remaining bytes
 * \param si struct to store collected information into
 */
static void gxf_material_tags(ByteIOContext *pb, int *len, st_info_t *si) {
    si->first_field = AV_NOPTS_VALUE;
    si->last_field = AV_NOPTS_VALUE;
    while (*len >= 2) {
        mat_tag_t tag = get_byte(pb);
        int tlen = get_byte(pb);

/**
 * \brief filters out interesting tags from track information.
 * \param len length of tag section, will be adjusted to contain remaining bytes
 * \param si struct to store collected information into
 */
static void gxf_track_tags(ByteIOContext *pb, int *len, st_info_t *si) {
    si->frames_per_second = (AVRational){0, 0};
    si->fields_per_frame = 0;
    while (*len >= 2) {
        track_tag_t tag = get_byte(pb);
        int tlen = get_byte(pb);

    ByteIOContext *pb = s->pb;
    pkt_type_t pkt_type;
    int map_len;
    int len;
    AVRational main_timebase = {0, 0};
    st_info_t si;
    int i;
    if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) {
        av_log(s, AV_LOG_ERROR, "map packet not found\n");
        return 0;
    }

4074:58051a1dc7ea

#include "libavutil/common.h"
#include "avformat.h"
#include "gxf.h"

struct gxf_stream_info {
    int64_t first_field;
    int64_t last_field;
    AVRational frames_per_second;
    int32_t fields_per_frame;
};

/**
 * \brief parses a packet header, extracting type and length
 * \param pb ByteIOContext to read header from
 * \param type detected packet type is stored here

/**
 * \brief filters out interesting tags from material information.
 * \param len length of tag section, will be adjusted to contain remaining bytes
 * \param si struct to store collected information into
 */
static void gxf_material_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *si) {
    si->first_field = AV_NOPTS_VALUE;
    si->last_field = AV_NOPTS_VALUE;
    while (*len >= 2) {
        mat_tag_t tag = get_byte(pb);
        int tlen = get_byte(pb);

/**
 * \brief filters out interesting tags from track information.
 * \param len length of tag section, will be adjusted to contain remaining bytes
 * \param si struct to store collected information into
 */
static void gxf_track_tags(ByteIOContext *pb, int *len, struct gxf_stream_info *si) {
    si->frames_per_second = (AVRational){0, 0};
    si->fields_per_frame = 0;
    while (*len >= 2) {
        track_tag_t tag = get_byte(pb);
        int tlen = get_byte(pb);

    ByteIOContext *pb = s->pb;
    pkt_type_t pkt_type;
    int map_len;
    int len;
    AVRational main_timebase = {0, 0};
    struct gxf_stream_info si;
    int i;
    if (!parse_packet_header(pb, &pkt_type, &map_len) || pkt_type != PKT_MAP) {
        av_log(s, AV_LOG_ERROR, "map packet not found\n");
        return 0;
    }