comparison mpegts.c @ 2574:9e51e62f5bdd libavformat

replaced custom tracking of programs/services with calls to with av_new_program()

2573:2842354cb9a4

typedef struct PESContext PESContext;

static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type);
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code);

enum MpegTSFilterType {
    MPEGTS_PES,
    MPEGTS_SECTION,
};

        MpegTSPESFilter pes_filter;
        MpegTSSectionFilter section_filter;
    } u;
};

typedef struct MpegTSService {
    int running:1;
    int sid;    /**< MPEG Program Number of stream */
    char *provider_name; /**< DVB Network name, "" if not DVB stream */
    char *name; /**< DVB Service name, "MPEG Program [sid]" if not DVB stream*/
} MpegTSService;

struct MpegTSContext {
    /* user data */
    AVFormatContext *stream;
    /** raw packet size, including FEC if present            */
    int raw_packet_size;

    AVPacket *pkt;

    /******************************************/
    /* private mpegts data */
    /* scan context */
    /** number of PMTs in the last PAT seen                  */
    int nb_services;
    /** list of PMTs in the last PAT seen                    */
    MpegTSService **services;


    /** filters for various streams specified by PMT + for the PAT and PMT */
    MpegTSFilter *pids[NB_PID_MAX];
};

        return -1;
    h->last_sec_num = val;
    return 0;
}

static MpegTSService *new_service(MpegTSContext *ts, int sid,
                                  char *provider_name, char *name)
{
    MpegTSService *service=NULL;
    int i;

#ifdef DEBUG_SI
    av_log(ts->stream, AV_LOG_DEBUG, "new_service: "
           "sid=0x%04x provider='%s' name='%s'\n",
           sid, provider_name, name);
#endif

    for(i=0; i<ts->nb_services; i++)
        if(ts->services[i]->sid == sid)
            service= ts->services[i];

    if(!service){
        service = av_mallocz(sizeof(MpegTSService));
        if (!service)
            return NULL;
        dynarray_add(&ts->services, &ts->nb_services, service);
    }
    service->sid = sid;
    assert((!provider_name) == (!name));
    if(name){
        av_free(service->provider_name);
        av_free(service->         name);
        service->provider_name = provider_name;
        service->         name =          name;
    }
    return service;
}

static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
    MpegTSContext *ts = filter->u.section_filter.opaque;
    SectionHeader h1, *h = &h1;

        av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
#endif
        if (sid == 0x0000) {
            /* NIT info */
        } else {
            new_service(ts, sid, NULL, NULL);
            ts->stop_parse--;
            mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
        }
    }
    /* not found */

                    break;
                provider_name = getstr8(&p, p_end);
                if (!provider_name)
                    break;
                name = getstr8(&p, p_end);
                if (!name)
                    break;
                new_service(ts, sid, provider_name, name);
                break;
            default:
                break;
            }
            p = desc_end;

    MpegTSContext *ts = s->priv_data;
    int i;
    for(i=0;i<NB_PID_MAX;i++)
        if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);

    for(i = 0; i < ts->nb_services; i++){
        av_free(ts->services[i]->provider_name);
        av_free(ts->services[i]->name);
        av_free(ts->services[i]);
    }
    av_freep(&ts->services);

    return 0;
}

static int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index,
                              int64_t *ppos, int64_t pos_limit)

2574:9e51e62f5bdd

typedef struct PESContext PESContext;

static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type);
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code);
extern void av_set_program_name(AVProgram *program, char *provider_name, char *name);

enum MpegTSFilterType {
    MPEGTS_PES,
    MPEGTS_SECTION,
};

        MpegTSPESFilter pes_filter;
        MpegTSSectionFilter section_filter;
    } u;
};

struct MpegTSContext {
    /* user data */
    AVFormatContext *stream;
    /** raw packet size, including FEC if present            */
    int raw_packet_size;

    AVPacket *pkt;

    /******************************************/
    /* private mpegts data */
    /* scan context */


    /** filters for various streams specified by PMT + for the PAT and PMT */
    MpegTSFilter *pids[NB_PID_MAX];
};

        return -1;
    h->last_sec_num = val;
    return 0;
}


static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
    MpegTSContext *ts = filter->u.section_filter.opaque;
    SectionHeader h1, *h = &h1;

        av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
#endif
        if (sid == 0x0000) {
            /* NIT info */
        } else {
            av_new_program(ts->stream, sid);
            ts->stop_parse--;
            mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
        }
    }
    /* not found */

                    break;
                provider_name = getstr8(&p, p_end);
                if (!provider_name)
                    break;
                name = getstr8(&p, p_end);
                if (name) {
                    AVProgram *program = av_new_program(ts->stream, sid);
                    if(program)
                        av_set_program_name(program, provider_name, name);
                }
                break;
            default:
                break;
            }
            p = desc_end;

    MpegTSContext *ts = s->priv_data;
    int i;
    for(i=0;i<NB_PID_MAX;i++)
        if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);

    return 0;
}

static int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index,
                              int64_t *ppos, int64_t pos_limit)