Revision dfd2a005 libavformat/mpegts.c

View differences:

libavformat/mpegts.c
289 289
    MpegTSFilter *filter;
290 290
    MpegTSSectionFilter *sec;
291 291

  
292
    dprintf(ts->stream, "Filter: pid=0x%x\n", pid);
292
    av_dlog(ts->stream, "Filter: pid=0x%x\n", pid);
293 293

  
294 294
    if (pid >= NB_PID_MAX || ts->pids[pid])
295 295
        return NULL;
......
678 678
                    pes->header[2] == 0x01) {
679 679
                    /* it must be an mpeg2 PES stream */
680 680
                    code = pes->header[3] | 0x100;
681
                    dprintf(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
681
                    av_dlog(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
682 682

  
683 683
                    if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
684 684
                        code == 0x1be) /* padding_stream */
......
714 714
                        code != 0x1f8) {                  /* ITU-T Rec. H.222.1 type E stream */
715 715
                        pes->state = MPEGTS_PESHEADER;
716 716
                        if (pes->st->codec->codec_id == CODEC_ID_NONE) {
717
                            dprintf(pes->stream, "pid=%x stream_type=%x probing\n",
717
                            av_dlog(pes->stream, "pid=%x stream_type=%x probing\n",
718 718
                                    pes->pid, pes->stream_type);
719 719
                            pes->st->codec->codec_id = CODEC_ID_PROBE;
720 720
                        }
......
878 878
        len = ff_mp4_read_descr(s, &pb, &tag);
879 879
        if (tag == MP4ESDescrTag) {
880 880
            *es_id = get_be16(&pb); /* ES_ID */
881
            dprintf(s, "ES_ID %#x\n", *es_id);
881
            av_dlog(s, "ES_ID %#x\n", *es_id);
882 882
            get_byte(&pb); /* priority */
883 883
            len = ff_mp4_read_descr(s, &pb, &tag);
884 884
            if (tag == MP4DecConfigDescrTag) {
......
912 912
    if (desc_end > desc_list_end)
913 913
        return -1;
914 914

  
915
    dprintf(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
915
    av_dlog(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
916 916

  
917 917
    if (st->codec->codec_id == CODEC_ID_NONE &&
918 918
        stream_type == STREAM_TYPE_PRIVATE_DATA)
......
967 967
        break;
968 968
    case 0x05: /* registration descriptor */
969 969
        st->codec->codec_tag = bytestream_get_le32(pp);
970
        dprintf(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
970
        av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
971 971
        if (st->codec->codec_id == CODEC_ID_NONE &&
972 972
            stream_type == STREAM_TYPE_PRIVATE_DATA)
973 973
            mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
......
994 994
    int mp4_es_id = 0;
995 995

  
996 996
#ifdef DEBUG
997
    dprintf(ts->stream, "PMT: len %i\n", section_len);
997
    av_dlog(ts->stream, "PMT: len %i\n", section_len);
998 998
    av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len);
999 999
#endif
1000 1000

  
......
1003 1003
    if (parse_section_header(h, &p, p_end) < 0)
1004 1004
        return;
1005 1005

  
1006
    dprintf(ts->stream, "sid=0x%x sec_num=%d/%d\n",
1006
    av_dlog(ts->stream, "sid=0x%x sec_num=%d/%d\n",
1007 1007
           h->id, h->sec_num, h->last_sec_num);
1008 1008

  
1009 1009
    if (h->tid != PMT_TID)
......
1015 1015
        return;
1016 1016
    add_pid_to_pmt(ts, h->id, pcr_pid);
1017 1017

  
1018
    dprintf(ts->stream, "pcr_pid=0x%x\n", pcr_pid);
1018
    av_dlog(ts->stream, "pcr_pid=0x%x\n", pcr_pid);
1019 1019

  
1020 1020
    program_info_length = get16(&p, p_end) & 0xfff;
1021 1021
    if (program_info_length < 0)
......
1025 1025
        tag = get8(&p, p_end);
1026 1026
        len = get8(&p, p_end);
1027 1027

  
1028
        dprintf(ts->stream, "program tag: 0x%02x len=%d\n", tag, len);
1028
        av_dlog(ts->stream, "program tag: 0x%02x len=%d\n", tag, len);
1029 1029

  
1030 1030
        if(len > program_info_length - 2)
1031 1031
            //something else is broken, exit the program_descriptors_loop
......
1114 1114
    int sid, pmt_pid;
1115 1115

  
1116 1116
#ifdef DEBUG
1117
    dprintf(ts->stream, "PAT:\n");
1117
    av_dlog(ts->stream, "PAT:\n");
1118 1118
    av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len);
1119 1119
#endif
1120 1120
    p_end = section + section_len - 4;
......
1133 1133
        if (pmt_pid < 0)
1134 1134
            break;
1135 1135

  
1136
        dprintf(ts->stream, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
1136
        av_dlog(ts->stream, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
1137 1137

  
1138 1138
        if (sid == 0x0000) {
1139 1139
            /* NIT info */
......
1158 1158
    char *name, *provider_name;
1159 1159

  
1160 1160
#ifdef DEBUG
1161
    dprintf(ts->stream, "SDT:\n");
1161
    av_dlog(ts->stream, "SDT:\n");
1162 1162
    av_hex_dump_log(ts->stream, AV_LOG_DEBUG, (uint8_t *)section, section_len);
1163 1163
#endif
1164 1164

  
......
1196 1196
            if (desc_end > desc_list_end)
1197 1197
                break;
1198 1198

  
1199
            dprintf(ts->stream, "tag: 0x%02x len=%d\n",
1199
            av_dlog(ts->stream, "tag: 0x%02x len=%d\n",
1200 1200
                   desc_tag, desc_len);
1201 1201

  
1202 1202
            switch(desc_tag) {
......
1484 1484

  
1485 1485
        ts->auto_guess = 1;
1486 1486

  
1487
        dprintf(ts->stream, "tuning done\n");
1487
        av_dlog(ts->stream, "tuning done\n");
1488 1488

  
1489 1489
        s->ctx_flags |= AVFMTCTX_NOHEADER;
1490 1490
    } else {

Also available in: Unified diff