From 1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 25 Feb 2013 23:54:28 +0100 Subject: [PATCH] avformat: av_log_ask_for_sample() ---> avpriv_request_sample() --- libavformat/anm.c | 4 ++-- libavformat/au.c | 4 ++-- libavformat/bethsoftvid.c | 5 +++-- libavformat/filmstripdec.c | 2 +- libavformat/mov.c | 2 +- libavformat/mpegts.c | 2 +- libavformat/mtv.c | 2 +- libavformat/mxfdec.c | 11 +++++------ libavformat/omadec.c | 3 +-- libavformat/rsodec.c | 2 +- libavformat/rtpdec_latm.c | 4 ++-- libavformat/rtpdec_qt.c | 8 ++++---- libavformat/smjpegdec.c | 6 +++--- libavformat/spdifdec.c | 6 +++--- libavformat/spdifenc.c | 5 +++-- libavformat/westwood_aud.c | 4 ++-- libavformat/xmv.c | 2 +- libavformat/xwma.c | 4 ++-- 18 files changed, 38 insertions(+), 38 deletions(-) diff --git a/libavformat/anm.c b/libavformat/anm.c index 064b15739f..f78149285b 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -85,7 +85,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 4); /* magic number */ if (avio_rl16(pb) != MAX_PAGES) { - av_log_ask_for_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES) "\n"); + avpriv_request_sample(s, "max_pages != " AV_STRINGIFY(MAX_PAGES)); return AVERROR_PATCHWELCOME; } @@ -163,7 +163,7 @@ static int read_header(AVFormatContext *s) return 0; invalid: - av_log_ask_for_sample(s, "Invalid header element encountered.\n"); + avpriv_request_sample(s, "Invalid header element"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/au.c b/libavformat/au.c index 4645eb527c..76da6e6092 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -85,13 +85,13 @@ static int au_read_header(AVFormatContext *s) codec = ff_codec_get_id(codec_au_tags, id); if (codec == AV_CODEC_ID_NONE) { - av_log_ask_for_sample(s, "unknown or unsupported codec tag: %u\n", id); + avpriv_request_sample(s, "unknown or unsupported codec tag: %u", id); return AVERROR_PATCHWELCOME; } bps = av_get_bits_per_sample(codec); if (!bps) { - av_log_ask_for_sample(s, "could not determine bits per sample\n"); + avpriv_request_sample(s, "Unknown bits per sample"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index f41ef52e78..120e145a76 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -108,8 +108,9 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, return AVERROR(ENOMEM); vid->video_index = st->index; if (vid->audio_index < 0) { - av_log_ask_for_sample(s, "No audio packet before first video " - "packet. Using default video time base.\n"); + avpriv_request_sample(s, "Using default video time base since " + "having no audio packet before the first " + "video packet"); } avpriv_set_pts_info(st, 64, 185, vid->sample_rate); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 97cecfa58a..3fa68424b7 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -55,7 +55,7 @@ static int read_header(AVFormatContext *s) st->nb_frames = avio_rb32(pb); if (avio_rb16(pb) != 0) { - av_log_ask_for_sample(s, "unsupported packing method\n"); + avpriv_request_sample(s, "Unsupported packing method"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/mov.c b/libavformat/mov.c index 45587cd9a3..edd6f8eafd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -718,7 +718,7 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); if (version > 1) { - av_log_ask_for_sample(c->fc, "unsupported version %d\n", version); + avpriv_request_sample(c->fc, "Version %d", version); return AVERROR_PATCHWELCOME; } avio_rb24(pb); /* flags */ diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 418833e35b..2582c5b0bd 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1313,7 +1313,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type } if (st->codec->extradata) { if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4)) - av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n"); + avpriv_request_sample(fc, "DVB sub with multiple IDs"); } else { st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE); if (st->codec->extradata) { diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 1566faa086..3c2ae1f56d 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -108,7 +108,7 @@ static int mtv_read_header(AVFormatContext *s) audio_subsegments = avio_rl16(pb); if (audio_subsegments == 0) { - av_log_ask_for_sample(s, "MTV files without audio are not supported\n"); + avpriv_request_sample(s, "MTV files without audio"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 18f7b26fa1..7e3a690010 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -396,8 +396,7 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb, int tag, int size, U int item_len = avio_rb32(pb); if (item_len != 18) { - av_log_ask_for_sample(pb, "unsupported primer pack item length %d\n", - item_len); + avpriv_request_sample(pb, "Primer pack item length %d", item_len); return AVERROR_PATCHWELCOME; } if (item_num > UINT_MAX / item_len) @@ -2027,10 +2026,10 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) /* if this check is hit then it's possible OPAtom was treated * as OP1a truncate the packet since it's probably very large * (>2 GiB is common) */ - av_log_ask_for_sample(s, - "KLV for edit unit %i extends into next " - "edit unit - OPAtom misinterpreted as " - "OP1a?\n", + avpriv_request_sample(s, + "OPAtom misinterpreted as OP1a?" + "KLV for edit unit %i extending into " + "next edit unit", mxf->current_edit_unit); klv.length = next_ofs - avio_tell(s->pb); } diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 2e565c1716..6d6d311a81 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -306,8 +306,7 @@ static int oma_read_header(AVFormatContext *s) case OMA_CODECID_ATRAC3: samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7]*100; if (samplerate != 44100) - av_log_ask_for_sample(s, "Unsupported sample rate: %d\n", - samplerate); + avpriv_request_sample(s, "Sample rate %d", samplerate); framesize = (codec_params & 0x3FF) * 8; jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */ diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index 2d57a964da..1e1b7d977d 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -49,7 +49,7 @@ static int rso_read_header(AVFormatContext *s) bps = av_get_bits_per_sample(codec); if (!bps) { - av_log_ask_for_sample(s, "could not determine bits per sample\n"); + avpriv_request_sample(s, "Unknown bits per sample"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c index 7d4ae1e448..050595c775 100644 --- a/libavformat/rtpdec_latm.c +++ b/libavformat/rtpdec_latm.c @@ -157,8 +157,8 @@ static int parse_fmtp(AVStream *stream, PayloadContext *data, } else if (!strcmp(attr, "cpresent")) { int cpresent = atoi(value); if (cpresent != 0) - av_log_missing_feature(NULL, "RTP MP4A-LATM with in-band " - "configuration", 1); + avpriv_request_sample(NULL, + "RTP MP4A-LATM with in-band configuration"); } return 0; diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 1222b4590d..af5a5e91f4 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -97,8 +97,8 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, is_start = get_bits1(&gb); is_finish = get_bits1(&gb); if (!is_start || !is_finish) { - av_log_missing_feature(s, "RTP-X-QT with payload description " - "split over several packets", 1); + avpriv_request_sample(s, "RTP-X-QT with payload description " + "split over several packets"); return AVERROR_PATCHWELCOME; } skip_bits(&gb, 12); // reserved @@ -161,7 +161,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, avio_seek(&pb, 4, SEEK_SET); if (has_packet_info) { - av_log_missing_feature(s, "RTP-X-QT with packet specific info", 1); + avpriv_request_sample(s, "RTP-X-QT with packet-specific info"); return AVERROR_PATCHWELCOME; } @@ -226,7 +226,7 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, return 0; default: /* unimplemented */ - av_log_missing_feature(NULL, "RTP-X-QT with packing scheme 2", 1); + avpriv_request_sample(NULL, "RTP-X-QT with packing scheme 2"); return AVERROR_PATCHWELCOME; } } diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c index 39bb1b45f5..623df71d0f 100644 --- a/libavformat/smjpegdec.c +++ b/libavformat/smjpegdec.c @@ -52,7 +52,7 @@ static int smjpeg_read_header(AVFormatContext *s) avio_skip(pb, 8); // magic version = avio_rb32(pb); if (version) - av_log_ask_for_sample(s, "unknown version %d\n", version); + avpriv_request_sample(s, "Unknown version %d", version); duration = avio_rb32(pb); // in msec @@ -77,7 +77,7 @@ static int smjpeg_read_header(AVFormatContext *s) break; case SMJPEG_SND: if (ast) { - av_log_ask_for_sample(s, "multiple audio streams not supported\n"); + avpriv_request_sample(s, "Multiple audio streams"); return AVERROR_PATCHWELCOME; } hlength = avio_rb32(pb); @@ -100,7 +100,7 @@ static int smjpeg_read_header(AVFormatContext *s) break; case SMJPEG_VID: if (vst) { - av_log_ask_for_sample(s, "multiple video streams not supported\n"); + avpriv_request_sample(s, "Multiple video streams"); return AVERROR_INVALIDDATA; } hlength = avio_rb32(pb); diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index c8d4a3f430..e5202494f5 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -91,8 +91,8 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, break; default: if (s) { /* be silent during a probe */ - av_log(s, AV_LOG_WARNING, "Data type 0x%04x", data_type); - av_log_missing_feature(s, " in IEC 61937", 1); + avpriv_request_sample(s, "Data type 0x%04x in IEC 61937", + data_type); } return AVERROR_PATCHWELCOME; } @@ -179,7 +179,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) pkt_size_bits = avio_rl16(pb); if (pkt_size_bits % 16) - av_log_ask_for_sample(s, "Packet does not end to a 16-bit boundary."); + avpriv_request_sample(s, "Packet not ending at a 16-bit boundary"); ret = av_new_packet(pkt, FFALIGN(pkt_size_bits, 16) >> 3); if (ret) diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index fbc757b797..1f37340a8b 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -307,7 +307,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt) * discs and dts-in-wav. */ ctx->use_preamble = 0; } else if (ctx->out_bytes > ctx->pkt_offset - BURST_HEADER_SIZE) { - av_log_ask_for_sample(s, "Unrecognized large DTS frame."); + avpriv_request_sample(s, "Unrecognized large DTS frame"); /* This will fail with a "bitrate too high" in the caller */ } @@ -412,7 +412,8 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt) if (pkt->size > TRUEHD_FRAME_OFFSET - mat_code_length) { /* if such frames exist, we'd need some more complex logic to * distribute the TrueHD frames in the MAT frame */ - av_log_ask_for_sample(s, "TrueHD frame too big, %d bytes\n", pkt->size); + avpriv_request_sample(s, "Too large TrueHD frame of %d bytes", + pkt->size); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index 2a06c2952b..c3f8e6e34d 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -104,7 +104,7 @@ static int wsaud_read_header(AVFormatContext *s) switch (codec) { case 1: if (channels != 1) { - av_log_ask_for_sample(s, "Stereo WS-SND1 is not supported.\n"); + avpriv_request_sample(s, "Stereo WS-SND1"); return AVERROR_PATCHWELCOME; } st->codec->codec_id = AV_CODEC_ID_WESTWOOD_SND1; @@ -115,7 +115,7 @@ static int wsaud_read_header(AVFormatContext *s) st->codec->bit_rate = channels * sample_rate * 4; break; default: - av_log_ask_for_sample(s, "Unknown codec: %d\n", codec); + avpriv_request_sample(s, "Unknown codec: %d", codec); return AVERROR_PATCHWELCOME; } avpriv_set_pts_info(st, 64, 1, sample_rate); diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 3f926eff9c..d638ad1ef4 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -145,7 +145,7 @@ static int xmv_read_header(AVFormatContext *s) file_version = avio_rl32(pb); if ((file_version != 4) && (file_version != 2)) - av_log_ask_for_sample(s, "Found uncommon version %d\n", file_version); + avpriv_request_sample(s, "Uncommon version %d", file_version); /* Video track */ diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 13ce2bb9f9..52e423cef7 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -85,7 +85,7 @@ static int xwma_read_header(AVFormatContext *s) * anyway. */ if (st->codec->codec_id != AV_CODEC_ID_WMAV2) { - av_log_ask_for_sample(s, "unexpected codec (tag 0x04%x; id %d)\n", + avpriv_request_sample(s, "Unexpected codec (tag 0x04%x; id %d)", st->codec->codec_tag, st->codec->codec_id); } else { /* In all xWMA files I have seen, there is no extradata. But the WMA @@ -100,7 +100,7 @@ static int xwma_read_header(AVFormatContext *s) * if it will work, but just go on and try it, after asking * the user for a sample. */ - av_log_ask_for_sample(s, "unexpected extradata (%d bytes)\n", + avpriv_request_sample(s, "Unexpected extradata (%d bytes)", st->codec->extradata_size); } else { st->codec->extradata_size = 6;