Commit 63d744e2 authored by Diego Biurrun's avatar Diego Biurrun

av_log_missing_feature() ---> avpriv_report_missing_feature()

parent f099d3d1
...@@ -61,7 +61,8 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc, ...@@ -61,7 +61,8 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
} }
if (!hdr.crc_absent && hdr.num_aac_frames > 1) { if (!hdr.crc_absent && hdr.num_aac_frames > 1) {
av_log_missing_feature(avctx, "Multiple RDBs per frame with CRC", 0); avpriv_report_missing_feature(avctx,
"Multiple RDBs per frame with CRC");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
...@@ -74,7 +75,10 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc, ...@@ -74,7 +75,10 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
if (!hdr.chan_config) { if (!hdr.chan_config) {
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
if (get_bits(&gb, 3) != 5) { if (get_bits(&gb, 3) != 5) {
av_log_missing_feature(avctx, "PCE based channel configuration, where the PCE is not the first syntax element", 0); avpriv_report_missing_feature(avctx,
"PCE-based channel configuration "
"without PCE as first syntax "
"element");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
init_put_bits(&pb, pce_data, MAX_PCE_SIZE); init_put_bits(&pb, pce_data, MAX_PCE_SIZE);
......
...@@ -2347,7 +2347,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) ...@@ -2347,7 +2347,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
size = avpriv_aac_parse_header(gb, &hdr_info); size = avpriv_aac_parse_header(gb, &hdr_info);
if (size > 0) { if (size > 0) {
if (hdr_info.num_aac_frames != 1) { if (hdr_info.num_aac_frames != 1) {
av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame", 0); avpriv_report_missing_feature(ac->avctx,
"More than one AAC RDB per ADTS frame");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
push_output_configuration(ac); push_output_configuration(ac);
......
...@@ -920,7 +920,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, ...@@ -920,7 +920,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
#if 1 #if 1
*num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left); *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left);
#else #else
av_log_missing_feature(ac->avctx, "Parametric Stereo", 0); avpriv_report_missing_feature(ac->avctx, "Parametric Stereo");
skip_bits_long(gb, *num_bits_left); // bs_fill_bits skip_bits_long(gb, *num_bits_left); // bs_fill_bits
*num_bits_left = 0; *num_bits_left = 0;
#endif #endif
......
...@@ -422,7 +422,8 @@ static int check_specific_config(ALSDecContext *ctx) ...@@ -422,7 +422,8 @@ static int check_specific_config(ALSDecContext *ctx)
#define MISSING_ERR(cond, str, errval) \ #define MISSING_ERR(cond, str, errval) \
{ \ { \
if (cond) { \ if (cond) { \
av_log_missing_feature(ctx->avctx, str, 0); \ avpriv_report_missing_feature(ctx->avctx, \
str); \
error = errval; \ error = errval; \
} \ } \
} }
......
...@@ -156,7 +156,7 @@ static av_cold int amrnb_decode_init(AVCodecContext *avctx) ...@@ -156,7 +156,7 @@ static av_cold int amrnb_decode_init(AVCodecContext *avctx)
int i; int i;
if (avctx->channels > 1) { if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0); avpriv_report_missing_feature(avctx, "multi-channel AMR");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
...@@ -92,7 +92,7 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx) ...@@ -92,7 +92,7 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx)
int i; int i;
if (avctx->channels > 1) { if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0); avpriv_report_missing_feature(avctx, "multi-channel AMR");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
...@@ -1081,7 +1081,8 @@ static int decode_seq_header(AVSContext *h) ...@@ -1081,7 +1081,8 @@ static int decode_seq_header(AVSContext *h)
width = get_bits(&h->gb, 14); width = get_bits(&h->gb, 14);
height = get_bits(&h->gb, 14); height = get_bits(&h->gb, 14);
if ((h->width || h->height) && (h->width != width || h->height != height)) { if ((h->width || h->height) && (h->width != width || h->height != height)) {
av_log_missing_feature(h->avctx, "Width/height changing in CAVS", 0); avpriv_report_missing_feature(h->avctx,
"Width/height changing in CAVS");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
h->width = width; h->width = width;
......
...@@ -371,7 +371,7 @@ static inline int decode_subframe(FLACContext *s, int channel) ...@@ -371,7 +371,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
bps -= wasted; bps -= wasted;
} }
if (bps > 32) { if (bps > 32) {
av_log_missing_feature(s->avctx, "Decorrelated bit depth > 32", 0); avpriv_report_missing_feature(s->avctx, "Decorrelated bit depth > 32");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
...@@ -34,7 +34,7 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx) ...@@ -34,7 +34,7 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx)
avctx->sample_rate = 8000 * is_amr_wb; avctx->sample_rate = 8000 * is_amr_wb;
if (avctx->channels > 1) { if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0); avpriv_report_missing_feature(avctx, "multi-channel AMR");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
...@@ -243,9 +243,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -243,9 +243,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
nb_components > MAX_COMPONENTS) nb_components > MAX_COMPONENTS)
return -1; return -1;
if (s->ls && !(s->bits <= 8 || nb_components == 1)) { if (s->ls && !(s->bits <= 8 || nb_components == 1)) {
av_log_missing_feature(s->avctx, avpriv_report_missing_feature(s->avctx,
"For JPEG-LS anything except <= 8 bits/component" "JPEG-LS that is not <= 8 "
" or 16-bit gray", 0); "bits/component or 16-bit gray");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
s->nb_components = nb_components; s->nb_components = nb_components;
...@@ -270,7 +270,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -270,7 +270,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
} }
if (s->ls && (s->h_max > 1 || s->v_max > 1)) { if (s->ls && (s->h_max > 1 || s->v_max > 1)) {
av_log_missing_feature(s->avctx, "Subsampling in JPEG-LS", 0); avpriv_report_missing_feature(s->avctx, "Subsampling in JPEG-LS");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
...@@ -170,7 +170,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, ...@@ -170,7 +170,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ctx->alpha_info = buf[17] & 0xf; ctx->alpha_info = buf[17] & 0xf;
if (ctx->alpha_info) if (ctx->alpha_info)
av_log_missing_feature(avctx, "Alpha channel", 0); avpriv_report_missing_feature(avctx, "Alpha channel");
ctx->qmat_changed = 0; ctx->qmat_changed = 0;
ptr = buf + 20; ptr = buf + 20;
......
...@@ -222,7 +222,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) ...@@ -222,7 +222,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
return -1; return -1;
} }
if (s->format == FORMAT_ENCRYPTED) { if (s->format == FORMAT_ENCRYPTED) {
av_log_missing_feature(s->avctx, "Encrypted TTA", 0); av_report_missing_feature(s->avctx, "Encrypted TTA");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
avctx->channels = s->channels = get_bits(&s->gb, 16); avctx->channels = s->channels = get_bits(&s->gb, 16);
......
...@@ -885,7 +885,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) ...@@ -885,7 +885,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
} }
} }
if (v->panscanflag) { if (v->panscanflag) {
av_log_missing_feature(v->s.avctx, "Pan-scan", 0); avpriv_report_missing_feature(v->s.avctx, "Pan-scan");
//... //...
} }
if (v->p_frame_skipped) { if (v->p_frame_skipped) {
......
...@@ -63,7 +63,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, ...@@ -63,7 +63,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
s->filter_header = buf[1] & 0x06; s->filter_header = buf[1] & 0x06;
if (buf[1] & 1) { if (buf[1] & 1) {
av_log_missing_feature(s->avctx, "Interlacing", 0); avpriv_report_missing_feature(s->avctx, "Interlacing");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (separated_coeff || !s->filter_header) { if (separated_coeff || !s->filter_header) {
......
...@@ -189,7 +189,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -189,7 +189,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_S16P; avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
else if (s->bits_per_sample == 24) { else if (s->bits_per_sample == 24) {
avctx->sample_fmt = AV_SAMPLE_FMT_S32P; avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
av_log_missing_feature(avctx, "Bit-depth higher than 16", 0); avpriv_report_missing_feature(avctx, "Bit-depth higher than 16");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} else { } else {
av_log(avctx, AV_LOG_ERROR, "Unknown bit-depth: %d\n", av_log(avctx, AV_LOG_ERROR, "Unknown bit-depth: %d\n",
......
...@@ -1091,7 +1091,7 @@ static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len) ...@@ -1091,7 +1091,7 @@ static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len)
descr->sl.au_seq_num_len = (lengths >> 7) & 0x1f; descr->sl.au_seq_num_len = (lengths >> 7) & 0x1f;
descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f; descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f;
} else { } else {
av_log_missing_feature(d->s, "Predefined SLConfigDescriptor\n", 0); avpriv_report_missing_feature(d->s, "Predefined SLConfigDescriptor");
} }
return 0; return 0;
} }
......
...@@ -75,8 +75,8 @@ static int skeleton_header(AVFormatContext *s, int idx) ...@@ -75,8 +75,8 @@ static int skeleton_header(AVFormatContext *s, int idx)
target_idx = ogg_find_stream(ogg, AV_RL32(buf+12)); target_idx = ogg_find_stream(ogg, AV_RL32(buf+12));
start_granule = AV_RL64(buf+36); start_granule = AV_RL64(buf+36);
if (os->start_granule != OGG_NOGRANULE_VALUE) { if (os->start_granule != OGG_NOGRANULE_VALUE) {
av_log_missing_feature(s, avpriv_report_missing_feature(s,
"Multiple fisbone for the same stream", 0); "Multiple fisbone for the same stream");
return 1; return 1;
} }
if (target_idx >= 0 && start_granule != OGG_NOGRANULE_VALUE) { if (target_idx >= 0 && start_granule != OGG_NOGRANULE_VALUE) {
......
...@@ -213,7 +213,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -213,7 +213,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = codec_id; st->codec->codec_id = codec_id;
} else if (codec_id != s->streams[0]->codec->codec_id) { } else if (codec_id != s->streams[0]->codec->codec_id) {
av_log_missing_feature(s, "Codec change in IEC 61937", 0); avpriv_report_missing_feature(s, "Codec change in IEC 61937");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment