comparison mpegts.c @ 2112:e6b06336f94b libavformat

get rid of one layer of callback obfuscation

2111:4aafc6050f39

    /** number of PMTs in the last PAT seen                  */
    int nb_services;
    /** list of PMTs in the last PAT seen                    */
    MpegTSService **services;

    /* set service context (XXX: allocated it ?) */
    SetServiceCallback *set_service_cb;
    void *set_service_opaque;
    /** filter for the PAT                                   */
    MpegTSFilter *pat_filter;
    /** filter for the PMT for the MPEG program number specified by req_sid */
    MpegTSFilter *pmt_filter;
    /** MPEG program number of stream we want to decode      */

                st->codec->sub_id = (anc_page << 16) | comp_page;
            }
        }
    }
    /* all parameters are there */
    ts->set_service_cb(ts->set_service_opaque, 0);
    mpegts_close_filter(ts, ts->pmt_filter);
    ts->pmt_filter = NULL;
}

static void pat_cb(void *opaque, const uint8_t *section, int section_len)

                goto found;
            }
        }
    }
    /* not found */
    ts->set_service_cb(ts->set_service_opaque, -1);

 found:
    mpegts_close_filter(ts, ts->pat_filter);
    ts->pat_filter = NULL;
}

    /* remove filter */
    mpegts_close_filter(ts, ts->pat_filter);
    ts->pat_filter = NULL;
}

static void mpegts_set_service(MpegTSContext *ts, int sid,
                        SetServiceCallback *set_service_cb, void *opaque)
{
    ts->set_service_cb = set_service_cb;
    ts->set_service_opaque = opaque;
    ts->req_sid = sid;
    ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID,
                                                pat_cb, ts, 1);
}

    else
        return 0;
#endif
}

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 */
static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
                     const uint8_t *packet)
{

                /* now find the info for the first service if we found any,
                otherwise try to filter all PATs */

                url_fseek(pb, pos, SEEK_SET);
                mpegts_set_service(ts, sid, set_service_cb, ts);

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

2112:e6b06336f94b

    /** number of PMTs in the last PAT seen                  */
    int nb_services;
    /** list of PMTs in the last PAT seen                    */
    MpegTSService **services;

    /** filter for the PAT                                   */
    MpegTSFilter *pat_filter;
    /** filter for the PMT for the MPEG program number specified by req_sid */
    MpegTSFilter *pmt_filter;
    /** MPEG program number of stream we want to decode      */

                st->codec->sub_id = (anc_page << 16) | comp_page;
            }
        }
    }
    /* all parameters are there */
    ts->stop_parse=1;
    mpegts_close_filter(ts, ts->pmt_filter);
    ts->pmt_filter = NULL;
}

static void pat_cb(void *opaque, const uint8_t *section, int section_len)

                goto found;
            }
        }
    }
    /* not found */
    ts->stop_parse=1;

 found:
    mpegts_close_filter(ts, ts->pat_filter);
    ts->pat_filter = NULL;
}

    /* remove filter */
    mpegts_close_filter(ts, ts->pat_filter);
    ts->pat_filter = NULL;
}

static void mpegts_set_service(MpegTSContext *ts, int sid)
{
    ts->req_sid = sid;
    ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID,
                                                pat_cb, ts, 1);
}

    else
        return 0;
#endif
}

/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
   (-1) if not available */
static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
                     const uint8_t *packet)
{

                /* now find the info for the first service if we found any,
                otherwise try to filter all PATs */

                url_fseek(pb, pos, SEEK_SET);
                mpegts_set_service(ts, sid);

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