Mercurial > libavcodec.hg
changeset 9891:7ad7d4094d1f libavcodec
Rename ff_log_missing_feature() to av_log_missing_feature().
| author | rbultje |
|---|---|
| date | Mon, 29 Jun 2009 19:07:04 +0000 |
| parents | 956adcb2b00d |
| children | b5ca6219e173 |
| files | aac.c aac_adtstoasc_bsf.c ac3dec.c eac3dec.c flacdec.c internal.h qcelpdec.c utils.c |
| diffstat | 8 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/aac.c Mon Jun 29 09:02:07 2009 +0000 +++ b/aac.c Mon Jun 29 19:07:04 2009 +0000 @@ -320,7 +320,7 @@ int extension_flag, ret; if(get_bits1(gb)) { // frameLengthFlag - ff_log_missing_feature(ac->avccontext, "960/120 MDCT window is", 1); + av_log_missing_feature(ac->avccontext, "960/120 MDCT window is", 1); return -1; } @@ -588,7 +588,7 @@ memset(ics, 0, sizeof(IndividualChannelStream)); return -1; } else { - ff_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1); + av_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1); memset(ics, 0, sizeof(IndividualChannelStream)); return -1; } @@ -1040,7 +1040,7 @@ if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics)) return -1; if (get_bits1(gb)) { - ff_log_missing_feature(ac->avccontext, "SSR", 1); + av_log_missing_feature(ac->avccontext, "SSR", 1); return -1; } } @@ -1245,7 +1245,7 @@ */ static int decode_sbr_extension(AACContext * ac, GetBitContext * gb, int crc, int cnt) { // TODO : sbr_extension implementation - ff_log_missing_feature(ac->avccontext, "SBR", 0); + av_log_missing_feature(ac->avccontext, "SBR", 0); skip_bits_long(gb, 8*cnt - 4); // -4 due to reading extension type return cnt; } @@ -1588,7 +1588,7 @@ if (!hdr_info.crc_absent) skip_bits(gb, 16); } else { - ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0); + av_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0); return -1; } }
--- a/aac_adtstoasc_bsf.c Mon Jun 29 09:02:07 2009 +0000 +++ b/aac_adtstoasc_bsf.c Mon Jun 29 19:07:04 2009 +0000 @@ -61,7 +61,7 @@ } if (!hdr.crc_absent && hdr.num_aac_frames > 1) { - ff_log_missing_feature(avctx, "Multiple RDBs per frame with CRC is", 0); + av_log_missing_feature(avctx, "Multiple RDBs per frame with CRC is", 0); return -1; } @@ -74,7 +74,7 @@ if (!hdr.chan_config) { init_get_bits(&gb, buf, buf_size); if (get_bits(&gb, 3) != 5) { - ff_log_missing_feature(avctx, "PCE based channel configuration, where the PCE is not the first syntax element is", 0); + av_log_missing_feature(avctx, "PCE based channel configuration, where the PCE is not the first syntax element is", 0); return -1; } init_put_bits(&pb, pce_data, MAX_PCE_SIZE);
--- a/ac3dec.c Mon Jun 29 09:02:07 2009 +0000 +++ b/ac3dec.c Mon Jun 29 19:07:04 2009 +0000 @@ -820,7 +820,7 @@ /* spectral extension strategy */ if (s->eac3 && (!blk || get_bits1(gbc))) { if (get_bits1(gbc)) { - ff_log_missing_feature(s->avctx, "Spectral extension", 1); + av_log_missing_feature(s->avctx, "Spectral extension", 1); return -1; } /* TODO: parse spectral extension strategy info */ @@ -845,7 +845,7 @@ /* check for enhanced coupling */ if (s->eac3 && get_bits1(gbc)) { /* TODO: parse enhanced coupling strategy info */ - ff_log_missing_feature(s->avctx, "Enhanced coupling", 1); + av_log_missing_feature(s->avctx, "Enhanced coupling", 1); return -1; }
--- a/eac3dec.c Mon Jun 29 09:02:07 2009 +0000 +++ b/eac3dec.c Mon Jun 29 19:07:04 2009 +0000 @@ -214,7 +214,7 @@ 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) { - ff_log_missing_feature(s->avctx, "Dependent substream decoding", 1); + av_log_missing_feature(s->avctx, "Dependent substream decoding", 1); 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"); @@ -226,7 +226,7 @@ associated to an independent stream have matching substream id's. */ if (s->substreamid) { /* only decode substream with id=0. skip any additional substreams. */ - ff_log_missing_feature(s->avctx, "Additional substreams", 1); + av_log_missing_feature(s->avctx, "Additional substreams", 1); return AAC_AC3_PARSE_ERROR_FRAME_TYPE; } @@ -235,7 +235,7 @@ 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. */ - ff_log_missing_feature(s->avctx, "Reduced sampling rates", 1); + av_log_missing_feature(s->avctx, "Reduced sampling rates", 1); return -1; } skip_bits(gbc, 5); // skip bitstream id @@ -492,7 +492,7 @@ /* spectral extension attenuation data */ if (parse_spx_atten_data) { - ff_log_missing_feature(s->avctx, "Spectral extension attenuation", 1); + av_log_missing_feature(s->avctx, "Spectral extension attenuation", 1); for (ch = 1; ch <= s->fbw_channels; ch++) { if (get_bits1(gbc)) { // channel has spx attenuation skip_bits(gbc, 5); // skip spx attenuation code @@ -508,7 +508,7 @@ 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); - ff_log_missing_feature(s->avctx, "Block start info", 1); + av_log_missing_feature(s->avctx, "Block start info", 1); } /* syntax state initialization */
--- a/flacdec.c Mon Jun 29 09:02:07 2009 +0000 +++ b/flacdec.c Mon Jun 29 19:07:04 2009 +0000 @@ -448,7 +448,7 @@ s->curr_bps -= wasted; } if (s->curr_bps > 32) { - ff_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); + av_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); return -1; }
--- a/internal.h Mon Jun 29 09:02:07 2009 +0000 +++ b/internal.h Mon Jun 29 19:07:04 2009 +0000 @@ -37,7 +37,7 @@ * message which tells the user how to report samples to the development * mailing list. */ -void ff_log_missing_feature(void *avc, const char *feature, int want_sample); +void av_log_missing_feature(void *avc, const char *feature, int want_sample); /** * Logs a generic warning message asking for a sample. @@ -45,7 +45,7 @@ * a pointer to an AVClass struct * @param[in] msg string containing an optional message, or NULL if no message */ -void ff_log_ask_for_sample(void *avc, const char *msg); +void av_log_ask_for_sample(void *avc, const char *msg); /** * Determines whether pix_fmt is a hardware accelerated format.
--- a/qcelpdec.c Mon Jun 29 09:02:07 2009 +0000 +++ b/qcelpdec.c Mon Jun 29 19:07:04 2009 +0000 @@ -432,7 +432,7 @@ if(scalefactor) scalefactor = sqrt(ff_dot_productf(v_ref, v_ref, len) / scalefactor); else - ff_log_missing_feature(NULL, "Zero energy for gain control", 1); + av_log_missing_feature(NULL, "Zero energy for gain control", 1); return scalefactor; } @@ -716,7 +716,7 @@ if(bitrate == SILENCE) { //FIXME: Remove experimental warning when tested with samples. - ff_log_ask_for_sample(avctx, "'Blank frame handling is experimental."); + av_log_ask_for_sample(avctx, "'Blank frame handling is experimental."); } return bitrate; }
--- a/utils.c Mon Jun 29 09:02:07 2009 +0000 +++ b/utils.c Mon Jun 29 19:07:04 2009 +0000 @@ -1191,19 +1191,19 @@ return 0; } -void ff_log_missing_feature(void *avc, const char *feature, int want_sample) +void av_log_missing_feature(void *avc, const char *feature, int want_sample) { av_log(avc, AV_LOG_WARNING, "%s not implemented. Update your FFmpeg " "version to the newest one from SVN. If the problem still " "occurs, it means that your file has a feature which has not " "been implemented.", feature); if(want_sample) - ff_log_ask_for_sample(avc, NULL); + av_log_ask_for_sample(avc, NULL); else av_log(avc, AV_LOG_WARNING, "\n"); } -void ff_log_ask_for_sample(void *avc, const char *msg) +void av_log_ask_for_sample(void *avc, const char *msg) { if (msg) av_log(avc, AV_LOG_WARNING, "%s ", msg);