comparison mpegts.c @ 2111:4aafc6050f39 libavformat

kill completely idiotic code which hides all but 2 streams

2110:495161f79093

    AVFormatContext *stream;
    /** raw packet size, including FEC if present            */
    int raw_packet_size;
    /** if true, all pids are analyzed to find streams       */
    int auto_guess;
    int set_service_ret;

    /** compute exact PCR for each transport stream packet   */
    int mpeg2ts_compute_pcr;

    int64_t cur_pcr;    /**< used to estimate the exact PCR  */

{
    PESContext *pes = opaque;
    MpegTSContext *ts = pes->ts;
    const uint8_t *p;
    int len, code;

    if (is_start) {
        pes->state = MPEGTS_HEADER;
        pes->data_index = 0;
    }

}

static void set_service_cb(void *opaque, int ret)
{
    MpegTSContext *ts = opaque;
    ts->set_service_ret = ret;
    ts->stop_parse = 1;
}

/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
   (-1) if not available */

    if (s->iformat == &mpegts_demuxer) {
        /* normal demux */

        if (!ts->auto_guess) {
            ts->set_service_ret = -1;

            /* first do a scaning to get all the services */
            url_fseek(pb, pos, SEEK_SET);
            mpegts_scan_sdt(ts);

            handle_packets(ts, s->probesize);

                s->ctx_flags |= AVFMTCTX_NOHEADER;
                goto do_pcr;
            }

            /* tune to first service found */
            for(i=0; i<ts->nb_services && ts->set_service_ret; i++){
                service = ts->services[i];
                sid = service->sid;
#ifdef DEBUG_SI
                av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name);
#endif

                handle_packets(ts, s->probesize);
            }
            /* if could not find service, enable auto_guess */

            if (ts->set_service_ret != 0)
                ts->auto_guess = 1;

#ifdef DEBUG_SI
            av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
#endif

2111:4aafc6050f39

    AVFormatContext *stream;
    /** raw packet size, including FEC if present            */
    int raw_packet_size;
    /** if true, all pids are analyzed to find streams       */
    int auto_guess;

    /** compute exact PCR for each transport stream packet   */
    int mpeg2ts_compute_pcr;

    int64_t cur_pcr;    /**< used to estimate the exact PCR  */

{
    PESContext *pes = opaque;
    MpegTSContext *ts = pes->ts;
    const uint8_t *p;
    int len, code;

    if(!ts->pkt)
        return;

    if (is_start) {
        pes->state = MPEGTS_HEADER;
        pes->data_index = 0;
    }

}

static void set_service_cb(void *opaque, int ret)
{
    MpegTSContext *ts = opaque;
    ts->stop_parse = 1;
}

/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
   (-1) if not available */

    if (s->iformat == &mpegts_demuxer) {
        /* normal demux */

        if (!ts->auto_guess) {
            /* first do a scaning to get all the services */
            url_fseek(pb, pos, SEEK_SET);
            mpegts_scan_sdt(ts);

            handle_packets(ts, s->probesize);

                s->ctx_flags |= AVFMTCTX_NOHEADER;
                goto do_pcr;
            }

            /* tune to first service found */
            for(i=0; i<ts->nb_services; i++){
                service = ts->services[i];
                sid = service->sid;
#ifdef DEBUG_SI
                av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name);
#endif

                handle_packets(ts, s->probesize);
            }
            /* if could not find service, enable auto_guess */

                ts->auto_guess = 1;

#ifdef DEBUG_SI
            av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
#endif