Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'

Browse Source 
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
  avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

Conflicts:
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/12/merge
Michael Niedermayer 12 years ago
parent fa92ee821b 1ecdf8912b
commit a9ddb62489
18 changed files with 39 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavformat/anm.c
  2. 4
      libavformat/au.c
  3. 5
      libavformat/bethsoftvid.c
  4. 2
      libavformat/filmstripdec.c
  5. 2
      libavformat/mov.c
  6. 2
      libavformat/mpegts.c
  7. 2
      libavformat/mtv.c
  8. 9
      libavformat/mxfdec.c
  9. 3
      libavformat/omadec.c
  10. 2
      libavformat/rsodec.c
  11. 4
      libavformat/rtpdec_latm.c
  12. 8
      libavformat/rtpdec_qt.c
  13. 6
      libavformat/smjpegdec.c
  14. 6
      libavformat/spdifdec.c
  15. 5
      libavformat/spdifenc.c
  16. 4
      libavformat/westwood_aud.c
  17. 2
      libavformat/xmv.c
  18. 4
      libavformat/xwma.c

4
libavformat/anm.c
Unescape View File

@ -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;
}

4
libavformat/au.c
Unescape View File

@ -96,13 +96,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;
}

5
libavformat/bethsoftvid.c
Unescape View File

@ -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;

2
libavformat/filmstripdec.c
Unescape View File

@ -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;
}

2
libavformat/mov.c
Unescape View File

@ -835,7 +835,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 */

2
libavformat/mpegts.c
Unescape View File

@ -1388,7 +1388,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) {

2
libavformat/mtv.c
Unescape View File

@ -114,7 +114,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;
}

9
libavformat/mxfdec.c
Unescape View File

@ -411,8 +411,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 > 65536) {
@ -2127,8 +2126,10 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt)
if (next_ofs >= 0 && next_klv > next_ofs) {
/* 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);
}

3
libavformat/omadec.c
Unescape View File

@ -311,8 +311,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 */

2
libavformat/rsodec.c
Unescape View File

@ -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;
}

4
libavformat/rtpdec_latm.c
Unescape View File

@ -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;

8
libavformat/rtpdec_qt.c
Unescape View File

@ -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;
}
}

6
libavformat/smjpegdec.c
Unescape View File

@ -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);

6
libavformat/spdifdec.c
Unescape View File

@ -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;
}
@ -184,7 +184,7 @@ int ff_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)

5
libavformat/spdifenc.c
Unescape View File

@ -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;
}

4
libavformat/westwood_aud.c
Unescape View File

@ -102,7 +102,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;
@ -113,7 +113,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);

2
libavformat/xmv.c
Unescape View File

@ -143,7 +143,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 */

4
libavformat/xwma.c
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save