From 12e25ed284592b32c954d471e9b7b1e5a0dbf18d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 13 Mar 2013 21:18:34 +0100 Subject: [PATCH] avcodec: av_log_missing_feature(1) ---> avpriv_request_sample() --- libavcodec/aacdec.c | 14 ++++++-------- libavcodec/aacsbr.c | 2 +- libavcodec/ac3dec.c | 2 +- libavcodec/amrnbdec.c | 2 +- libavcodec/amrwbdec.c | 2 +- libavcodec/eac3dec.c | 8 ++++---- libavcodec/flashsv.c | 6 +++--- libavcodec/h264.c | 4 ++-- libavcodec/mimic.c | 2 +- libavcodec/mpc8.c | 2 +- libavcodec/rv10.c | 2 +- libavcodec/smc.c | 2 +- libavcodec/takdec.c | 2 +- libavcodec/truemotion2.c | 2 +- libavcodec/tta.c | 2 +- libavcodec/vp8.c | 2 +- libavcodec/wmalosslessdec.c | 4 ++-- libavcodec/wmaprodec.c | 2 +- libavcodec/wmavoice.c | 2 +- 19 files changed, 31 insertions(+), 33 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index e6044d54a0..102c3d5d11 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -670,7 +670,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, int tags = 0; if (get_bits1(gb)) { // frameLengthFlag - av_log_missing_feature(avctx, "960/120 MDCT window", 1); + avpriv_request_sample(avctx, "960/120 MDCT window"); return AVERROR_PATCHWELCOME; } @@ -1660,7 +1660,7 @@ static int decode_ics(AACContext *ac, SingleChannelElement *sce, if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics)) return -1; if (get_bits1(gb)) { - av_log_missing_feature(ac->avctx, "SSR", 1); + avpriv_request_sample(ac->avctx, "SSR"); return AVERROR_PATCHWELCOME; } } @@ -2620,8 +2620,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, asclen = get_bits_left(gb); if (config_start_bit % 8) { - av_log_missing_feature(latmctx->aac_ctx.avctx, - "Non-byte-aligned audio-specific config", 1); + avpriv_request_sample(latmctx->aac_ctx.avctx, + "Non-byte-aligned audio-specific config"); return AVERROR_PATCHWELCOME; } if (asclen <= 0) @@ -2675,8 +2675,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, skip_bits(gb, 6); // numSubFrames // numPrograms if (get_bits(gb, 4)) { // numPrograms - av_log_missing_feature(latmctx->aac_ctx.avctx, - "Multiple programs", 1); + avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple programs"); return AVERROR_PATCHWELCOME; } @@ -2684,8 +2683,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // for each layer (which there is only on in DVB) if (get_bits(gb, 3)) { // numLayer - av_log_missing_feature(latmctx->aac_ctx.avctx, - "Multiple layers", 1); + avpriv_request_sample(latmctx->aac_ctx.avctx, "Multiple layers"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index de63b8025d..650f7aa7e2 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -927,7 +927,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, } break; default: - av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1); + avpriv_request_sample(ac->avctx, "Reserved SBR extensions"); skip_bits_long(gb, *num_bits_left); // bs_fill_bits *num_bits_left = 0; break; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 407940d19d..abfd380b82 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -874,7 +874,7 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) /* check for enhanced coupling */ if (s->eac3 && get_bits1(gbc)) { /* TODO: parse enhanced coupling strategy info */ - av_log_missing_feature(s->avctx, "Enhanced coupling", 1); + avpriv_request_sample(s->avctx, "Enhanced coupling"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index 36df41daf7..fcaaab386f 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -957,7 +957,7 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } if (p->cur_frame_mode == MODE_DTX) { - av_log_missing_feature(avctx, "dtx mode", 1); + avpriv_request_sample(avctx, "dtx mode"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index e057829fd7..c875d81995 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1117,7 +1117,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n"); if (ctx->fr_cur_mode == MODE_SID) { /* Comfort noise frame */ - av_log_missing_feature(avctx, "SID mode", 1); + avpriv_request_sample(avctx, "SID mode"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 3a80cb1469..baba454fd6 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -300,7 +300,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) application can select from. each independent stream can also contain dependent streams which are used to add or replace channels. */ if (s->frame_type == EAC3_FRAME_TYPE_DEPENDENT) { - av_log_missing_feature(s->avctx, "Dependent substream decoding", 1); + avpriv_request_sample(s->avctx, "Dependent substream decoding"); return AAC_AC3_PARSE_ERROR_FRAME_TYPE; } else if (s->frame_type == EAC3_FRAME_TYPE_RESERVED) { av_log(s->avctx, AV_LOG_ERROR, "Reserved frame type\n"); @@ -312,7 +312,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) associated to an independent stream have matching substream id's. */ if (s->substreamid) { /* only decode substream with id=0. skip any additional substreams. */ - av_log_missing_feature(s->avctx, "Additional substreams", 1); + avpriv_request_sample(s->avctx, "Additional substreams"); return AAC_AC3_PARSE_ERROR_FRAME_TYPE; } @@ -321,7 +321,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) rates in bit allocation. The best assumption would be that it is handled like AC-3 DolbyNet, but we cannot be sure until we have a sample which utilizes this feature. */ - av_log_missing_feature(s->avctx, "Reduced sampling rate", 1); + avpriv_request_sample(s->avctx, "Reduced sampling rate"); return AVERROR_PATCHWELCOME; } skip_bits(gbc, 5); // skip bitstream id @@ -593,7 +593,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) It is likely the offset of each block within the frame. */ int block_start_bits = (s->num_blocks-1) * (4 + av_log2(s->frame_size-2)); skip_bits_long(gbc, block_start_bits); - av_log_missing_feature(s->avctx, "Block start info", 1); + avpriv_request_sample(s->avctx, "Block start info"); } /* syntax state initialization */ diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 26b42e5442..2fbe221bfa 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -259,11 +259,11 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, if (s->ver == 2) { skip_bits(&gb, 6); if (get_bits1(&gb)) { - av_log_missing_feature(avctx, "iframe", 1); + avpriv_request_sample(avctx, "iframe"); return AVERROR_PATCHWELCOME; } if (get_bits1(&gb)) { - av_log_missing_feature(avctx, "Custom palette", 1); + avpriv_request_sample(avctx, "Custom palette"); return AVERROR_PATCHWELCOME; } } @@ -394,7 +394,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, int row = get_bits(&gb, 8); av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_curr %dx%d\n", i, j, col, row); size -= 2; - av_log_missing_feature(avctx, "zlibprime_curr", 1); + avpriv_request_sample(avctx, "zlibprime_curr"); return AVERROR_PATCHWELCOME; } if (!s->blocks && (s->zlibprime_curr || s->zlibprime_prev)) { diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2e9487cd5c..9b196c711d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2884,8 +2884,8 @@ static int h264_set_parameter_from_sps(H264Context *h) h->avctx->has_b_frames = !h->low_delay; if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) { - av_log_missing_feature(h->avctx, - "Different bit depth between chroma and luma", 1); + avpriv_request_sample(h->avctx, + "Different chroma and luma bit depth"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index ecd837088d..0fe83137bb 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -389,7 +389,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, ctx->num_hblocks[i] = width >> (3 + !!i); } } else if (width != ctx->avctx->width || height != ctx->avctx->height) { - av_log_missing_feature(avctx, "resolution changing", 1); + avpriv_request_sample(avctx, "Resolution changing"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 7f920d8b54..d14b8f14f1 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -130,7 +130,7 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) c->maxbands = get_bits(&gb, 5) + 1; channels = get_bits(&gb, 4) + 1; if (channels > 2) { - av_log_missing_feature(avctx, "Multichannel MPC SV8", 1); + avpriv_request_sample(avctx, "Multichannel MPC SV8"); return AVERROR_PATCHWELCOME; } c->MSS = get_bits1(&gb); diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 7fd4ddfa42..6ccc85d3d6 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -459,7 +459,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) break; default: av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", rv->sub_id); - av_log_missing_feature(avctx, "RV1/2 version", 1); + avpriv_request_sample(avctx, "RV1/2 version"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/smc.c b/libavcodec/smc.c index d16242bf50..2fcf61fa2d 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -402,7 +402,7 @@ static void smc_decode_stream(SmcContext *s) break; case 0xF0: - av_log_missing_feature(s->avctx, "0xF0 opcode", 1); + avpriv_request_sample(s->avctx, "0xF0 opcode"); break; } } diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index a9b8c6664c..4047513e0f 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -685,7 +685,7 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data, return ret; if (s->ti.flags & TAK_FRAME_FLAG_HAS_METADATA) { - av_log_missing_feature(avctx, "frame metadata", 1); + avpriv_request_sample(avctx, "Frame metadata"); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 342cb05e15..a4d01cb0c5 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -226,7 +226,7 @@ static inline int tm2_read_header(TM2Context *ctx, const uint8_t *buf) switch (magic) { case TM2_OLD_HEADER_MAGIC: - av_log_missing_feature(ctx->avctx, "TM2 old header", 1); + avpriv_request_sample(ctx->avctx, "Old TM2 header"); return 0; case TM2_NEW_HEADER_MAGIC: return 0; diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 05ada5972d..b496452bb4 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -222,7 +222,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) return -1; } if (s->format == FORMAT_ENCRYPTED) { - av_report_missing_feature(s->avctx, "Encrypted TTA"); + avpriv_report_missing_feature(s->avctx, "Encrypted TTA"); return AVERROR_PATCHWELCOME; } avctx->channels = s->channels = get_bits(&s->gb, 16); diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 4d4ff6ca2d..babbff4901 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -337,7 +337,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) buf_size -= 7; if (hscale || vscale) - av_log_missing_feature(s->avctx, "Upscaling", 1); + avpriv_request_sample(s->avctx, "Upscaling"); s->update_golden = s->update_altref = VP56_FRAME_CURRENT; for (i = 0; i < 4; i++) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 6b3aca8963..7c08f1ba4c 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -886,7 +886,7 @@ static int decode_subframe(WmallDecodeCtx *s) s->do_arith_coding = get_bits1(&s->gb); if (s->do_arith_coding) { - av_log_missing_feature(s->avctx, "Arithmetic coding", 1); + avpriv_request_sample(s->avctx, "Arithmetic coding"); return AVERROR_PATCHWELCOME; } s->do_ac_filter = get_bits1(&s->gb); @@ -1191,7 +1191,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, skip_bits(gb, 1); // Skip seekable_frame_in_packet, currently ununused spliced_packet = get_bits1(gb); if (spliced_packet) - av_log_missing_feature(avctx, "Bitstream splicing", 1); + avpriv_request_sample(avctx, "Bitstream splicing"); /* get number of bits that need to be added to the previous frame */ num_bits_prev_frame = get_bits(gb, s->log2_frame_size); diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index a267f5b695..6a64641c87 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -314,7 +314,7 @@ static av_cold int decode_init(AVCodecContext *avctx) /** get frame len */ bits = ff_wma_get_frame_len_bits(avctx->sample_rate, 3, s->decode_flags); if (bits > WMAPRO_BLOCK_MAX_BITS) { - av_log_missing_feature(avctx, "14-bits block sizes", 1); + avpriv_request_sample(avctx, "14-bit block sizes"); return AVERROR_PATCHWELCOME; } s->samples_per_frame = 1 << bits; diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index f33def3b87..d03c701639 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1765,7 +1765,7 @@ static int synth_superframe(AVCodecContext *ctx, AVFrame *frame, * are really WMAPro-in-WMAVoice-superframes. I've never seen those in * the wild yet. */ if (!get_bits1(gb)) { - av_log_missing_feature(ctx, "WMAPro-in-WMAVoice", 1); + avpriv_request_sample(ctx, "WMAPro-in-WMAVoice"); return AVERROR_PATCHWELCOME; }