openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 11:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'

Browse Source 
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
  av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
	libavcodec/aacdec.c
	libavcodec/tta.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-14 12:30:19 +01:00
commit fa92ee821b
17 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aac_adtstoasc_bsf.c
View File

@ -61,7 +61,8 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
}
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;
}
@ -74,7 +75,10 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
if (!hdr.chan_config) {
init_get_bits(&gb, buf, buf_size * 8);
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;
}
init_put_bits(&pb, pce_data, MAX_PCE_SIZE);

3
libavcodec/aacdec.c
View File

@ -2430,7 +2430,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
if (!ac->warned_num_aac_frames && hdr_info.num_aac_frames != 1) {
// This is 2 for "VLB " audio in NSV files.
// See samples/nsv/vlb_audio.
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");
ac->warned_num_aac_frames = 1;
}
push_output_configuration(ac);

2
libavcodec/aacsbr.c
View File

@ -933,7 +933,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
#if 1
*num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left);
#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
*num_bits_left = 0;
#endif

3
libavcodec/alsdec.c
View File

@ -433,7 +433,8 @@ static int check_specific_config(ALSDecContext *ctx)
#define MISSING_ERR(cond, str, errval) \
{ \
if (cond) { \
av_log_missing_feature(ctx->avctx, str, 0); \
avpriv_report_missing_feature(ctx->avctx, \
str); \
error = errval; \
} \
}

2
libavcodec/amrnbdec.c
View File

@ -163,7 +163,7 @@ static av_cold int amrnb_decode_init(AVCodecContext *avctx)
int i;
if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0);
avpriv_report_missing_feature(avctx, "multi-channel AMR");
return AVERROR_PATCHWELCOME;
}

2
libavcodec/amrwbdec.c
View File

@ -99,7 +99,7 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx)
int i;
if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0);
avpriv_report_missing_feature(avctx, "multi-channel AMR");
return AVERROR_PATCHWELCOME;
}

3
libavcodec/cavsdec.c
View File

@ -1101,7 +1101,8 @@ static int decode_seq_header(AVSContext *h)
width = get_bits(&h->gb, 14);
height = get_bits(&h->gb, 14);
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;
}
if (width <= 0 || height <= 0) {

2
libavcodec/flacdec.c
View File

@ -369,7 +369,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
bps -= wasted;
}
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;
}

2
libavcodec/libopencore-amr.c
View File

@ -35,7 +35,7 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx)
avctx->sample_rate = 8000 * is_amr_wb;
if (avctx->channels > 1) {
av_log_missing_feature(avctx, "multi-channel AMR", 0);
avpriv_report_missing_feature(avctx, "multi-channel AMR");
return AVERROR_PATCHWELCOME;
}

8
libavcodec/mjpegdec.c
View File

@ -260,9 +260,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
}
}
if (s->ls && !(s->bits <= 8 || nb_components == 1)) {
av_log_missing_feature(s->avctx,
"For JPEG-LS anything except <= 8 bits/component"
" or 16-bit gray", 0);
avpriv_report_missing_feature(s->avctx,
"JPEG-LS that is not <= 8 "
"bits/component or 16-bit gray");
return AVERROR_PATCHWELCOME;
}
s->nb_components = nb_components;
@ -295,7 +295,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
}
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;
}

2
libavcodec/proresdec_lgpl.c
View File

@ -170,7 +170,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ctx->alpha_info = buf[17] & 0xf;
if (ctx->alpha_info)
av_log_missing_feature(avctx, "Alpha channel", 0);
avpriv_report_missing_feature(avctx, "Alpha channel");
ctx->qmat_changed = 0;
ptr = buf + 20;

2
libavcodec/vc1.c
View File

@ -902,7 +902,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
}
}
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) {

2
libavcodec/vp6.c
View File

@ -62,7 +62,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size)
return AVERROR_INVALIDDATA;
s->filter_header = buf[1] & 0x06;
if (buf[1] & 1) {
av_log_missing_feature(s->avctx, "Interlacing", 0);
avpriv_report_missing_feature(s->avctx, "Interlacing");
return AVERROR_PATCHWELCOME;
}
if (separated_coeff || !s->filter_header) {

2
libavcodec/wmalosslessdec.c
View File

@ -189,7 +189,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
else if (s->bits_per_sample == 24) {
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;
} else {
av_log(avctx, AV_LOG_ERROR, "Unknown bit-depth: %d\n",

2
libavformat/mpegts.c
View File

@ -1164,7 +1164,7 @@ static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len)
descr->sl.au_seq_num_len = (lengths >> 7) & 0x1f;
descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f;
} else {
av_log_missing_feature(d->s, "Predefined SLConfigDescriptor", 0);
avpriv_report_missing_feature(d->s, "Predefined SLConfigDescriptor");
}
return 0;
}

4
libavformat/oggparseskeleton.c
View File

@ -75,8 +75,8 @@ static int skeleton_header(AVFormatContext *s, int idx)
target_idx = ogg_find_stream(ogg, AV_RL32(buf+12));
start_granule = AV_RL64(buf+36);
if (os->start_granule != OGG_NOGRANULE_VALUE) {
av_log_missing_feature(s,
"Multiple fisbone for the same stream", 0);
avpriv_report_missing_feature(s,
"Multiple fisbone for the same stream");
return 1;
}
if (target_idx >= 0 && start_granule != OGG_NOGRANULE_VALUE) {

2
libavformat/spdifdec.c
View File

@ -218,7 +218,7 @@ int ff_spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = 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;
}